Changeset 842aac for src/Actions/ShapeAction

Timestamp:

Nov 16, 2012, 11:10:27 AM (12 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

d893672

Parents:

060c7d

git-author:

Michael Ankele <ankele@…> (10/01/12 14:05:07)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:27)

Message:

Refactoring: FillSurfaceAction uses ShapeRegistry

Location:

src/Actions/ShapeAction

Files:

• CreateShapeAction.cpp (modified) (2 diffs)
• CreateShapeAction.def (modified) (2 diffs)
• SetShapeAction.cpp (deleted)
• SetShapeAction.def (deleted)
• SetShapeAction.hpp (deleted)

src/Actions/ShapeAction/CreateShapeAction.cpp

@@ -54 +54 @@
   LOG(1, "Adding shape into ShapeRegistry.");
 
-  Shape s = ShapeFactory::getInstance().produce();
+  Shape s = ShapeFactory::getInstance().produce(ShapeFactory::getInstance().getShapeByName(params.shape_type.get()),
+      params.translation.get(), params.stretch.get(),
+      params.angle_x.get(), params.angle_y.get(), params.angle_z.get());
   if (params.shape_name.get() != "")
     s.setName(params.shape_name.get());
@@ -80 +82 @@
   ShapeCreateShapeState *state = assert_cast<ShapeCreateShapeState*>(_state.get());
 
-  Shape s = ShapeFactory::getInstance().produce();
+  /*Shape s = ShapeFactory::getInstance().produce();
   s.setName(state->old_name);
-  ShapeRegistry::getInstance().addShape(s);
+  ShapeRegistry::getInstance().addShape(s);*/
 
   return Action::state_ptr(_state);

src/Actions/ShapeAction/CreateShapeAction.def

@@ -10 +10 @@
 
 #include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/Specific/ShapeTypeValidator.hpp"
+#include "Parameters/Validators/Specific/VectorPositiveComponentsValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (std::string)
-#define paramtokens ("shape-name")
-#define paramdescriptions ("name shape to create")
-#define paramdefaults (PARAM_DEFAULT(std::string("")))
-#define paramreferences (shape_name)
+#define paramtypes (std::string)(std::string)(Vector)(Vector)(double)(double)(double)
+#define paramtokens ("shape-name")("shape-type")("translation")("stretch")("angle-x")("angle-y")("angle-z")
+#define paramdescriptions ("name shape to create")("type of shape to create")("translation distance")("scaling factors")("rotation x")("rotation y")("rotation z")
+#define paramdefaults (PARAM_DEFAULT(std::string("")))(NOPARAM_DEFAULT)(PARAM_DEFAULT(Vector(0.,0.,0.)))(PARAM_DEFAULT(Vector(1.,1.,1.)))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))
+#define paramreferences (shape_name)(shape_type)(translation)(stretch)(angle_x)(angle_y)(angle_z)
 #define paramvalids \
-(DummyValidator<std::string>())
+(DummyValidator<std::string>()) \
+(ShapeTypeValidator()) \
+(DummyValidator<Vector>()) \
+(VectorPositiveComponentsValidator()) \
+(DummyValidator<double>()) \
+(DummyValidator<double>()) \
+(DummyValidator<double>())
 
 #define statetypes (std::string)
@@ -35 +43 @@
 
 // finally the information stored in the ActionTrait specialization
-#define DESCRIPTION "sets the properties for the next shape to be created by the shape factory"
+#define DESCRIPTION "creates a new shape and puts it into the ShapeRegistry"
 #undef SHORTFORM