Changeset 09eaac for src/Actions/FillAction

Timestamp:

Nov 15, 2012, 5:31:07 PM (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:

eff536

Parents:

98d03b

git-author:

Michael Ankele <ankele@…> (09/07/12 13:31:23)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:07)

Message:

FillSphericalSurfaceAction > FillSurfaceAction (using shape factory)

Location:

src/Actions/FillAction

Files:

• FillSurfaceAction.cpp (moved) (moved from src/Actions/FillAction/FillSphericalSurfaceAction.cpp ) (9 diffs)
• FillSurfaceAction.def (moved) (moved from src/Actions/FillAction/FillSphericalSurfaceAction.def ) (3 diffs)
• FillSurfaceAction.hpp (moved) (moved from src/Actions/FillAction/FillSphericalSurfaceAction.hpp ) (3 diffs)

src/Actions/FillAction/FillSurfaceAction.cpp

@@ -22 +22 @@
 
 /*
- * FillSphericalSurfaceAction.cpp
+ * FillSurfaceAction.cpp
  *
  *  Created on: Mar 29, 2012
@@ -48 +48 @@
 #include "molecule.hpp"
 #include "Shapes/BaseShapes.hpp"
+#include "Shapes/ShapeFactory.hpp"
 #include "World.hpp"
 
@@ -58 +59 @@
 #include <vector>
 
-#include "Actions/FillAction/FillSphericalSurfaceAction.hpp"
+#include "Actions/FillAction/FillSurfaceAction.hpp"
 
 using namespace MoleCuilder;
 
 // and construct the stuff
-#include "FillSphericalSurfaceAction.def"
+#include "FillSurfaceAction.def"
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FillSphericalSurfaceAction::performCall() {
+Action::state_ptr FillSurfaceAction::performCall() {
   // get the filler molecule
   const std::vector< molecule *> molecules = World::getInstance().getSelectedMolecules();
@@ -99 +100 @@
 
   // create predicate, mesh, and filler
-  FillSphericalSurfaceState *UndoState = NULL;
+  FillSurfaceState *UndoState = NULL;
   bool successflag = false;
   {
@@ -107 +108 @@
             )
         );
-    Shape s = Sphere(params.center.get(), params.radius.get());
+
+    Shape s = ShapeFactory::getInstance().produce();
+
     boost::function<const NodeSet ()> func = 
         boost::bind(&Shape::getHomogeneousPointsOnSurface, boost::ref(s), params.N.get());
@@ -150 +153 @@
         std::transform(filler->begin(), filler->end(), MovedToVector.begin(),
             boost::bind(&AtomInfo::getPosition, _1) );
-        UndoState = new FillSphericalSurfaceState(clonedatominfos,clonedbonds,movedatoms,MovedToVector,params);
+        UndoState = new FillSurfaceState(clonedatominfos,clonedbonds,movedatoms,MovedToVector,params);
       }
     }
@@ -166 +169 @@
 }
 
-Action::state_ptr FillSphericalSurfaceAction::performUndo(Action::state_ptr _state) {
-  FillSphericalSurfaceState *state = assert_cast<FillSphericalSurfaceState*>(_state.get());
+Action::state_ptr FillSurfaceAction::performUndo(Action::state_ptr _state) {
+  FillSurfaceState *state = assert_cast<FillSurfaceState*>(_state.get());
 
   // remove all created atoms
@@ -177 +180 @@
 }
 
-Action::state_ptr FillSphericalSurfaceAction::performRedo(Action::state_ptr _state){
-  FillSphericalSurfaceState *state = assert_cast<FillSphericalSurfaceState*>(_state.get());
+Action::state_ptr FillSurfaceAction::performRedo(Action::state_ptr _state){
+  FillSurfaceState *state = assert_cast<FillSurfaceState*>(_state.get());
 
   // place filler cluster again at new spot
@@ -194 +197 @@
 }
 
-bool FillSphericalSurfaceAction::canUndo() {
+bool FillSurfaceAction::canUndo() {
   return true;
 }
 
-bool FillSphericalSurfaceAction::shouldUndo() {
+bool FillSurfaceAction::shouldUndo() {
   return true;
 }

src/Actions/FillAction/FillSurfaceAction.def

@@ -1 +1 @@
 /*
- * FillRegularGridAction.def
+ * FillSurfaceAction.def
  *
  *  Created on: Mar 29, 2012
@@ -20 +20 @@
 // 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 (Vector)(double)(unsigned int)(double)(Vector)
-#define paramtokens ("center")("radius")("count")("min-distance")("Alignment-Axis")
-#define paramdescriptions ("center of the sphere")("sphere size")("number of instances to be added, changed according to geometric needs")("minimum distance between added instances")("The filler molecule is rotated relative to this alignment axis")
-#define paramdefaults (PARAM_DEFAULT(Vector(0.,0.,0.)))(NOPARAM_DEFAULT)(PARAM_DEFAULT(12))(PARAM_DEFAULT(1.))(NOPARAM_DEFAULT)
-#define paramreferences (center)(radius)(N)(mindistance)(AlignedAxis)
+#define paramtypes (unsigned int)(double)(Vector)
+#define paramtokens ("count")("min-distance")("Alignment-Axis")
+#define paramdescriptions ("number of instances to be added, changed according to geometric needs")("minimum distance between added instances")("The filler molecule is rotated relative to this alignment axis")
+#define paramdefaults (PARAM_DEFAULT(12))(PARAM_DEFAULT(1.))(NOPARAM_DEFAULT)
+#define paramreferences (N)(mindistance)(AlignedAxis)
 #define paramvalids \
-(BoxVectorValidator()) \
-(BoxLengthValidator()) \
 (DummyValidator< unsigned int >()) \
 (BoxLengthValidator()) \
@@ -39 +37 @@
 #define MENUNAME "fill"
 #define MENUPOSITION 1
-#define ACTIONNAME SphericalSurface
-#define TOKEN "fill-spherical-surface"
+#define ACTIONNAME Surface
+#define TOKEN "fill-surface"
 
 
 // finally the information stored in the ActionTrait specialization
 #define DESCRIPTION "\
-fill homogenous points on a sphere surface with instances of the selected molecule."
+fill homogenous points on a shape's surface with instances of the selected molecule."
 #undef SHORTFORM

src/Actions/FillAction/FillSurfaceAction.hpp

@@ -1 +1 @@
 /*
- * FillSphericalSurfaceAction.hpp
+ * FillSurfaceAction.hpp
  *
  *  Created on: Mar 29, 2012
@@ -6 +6 @@
  */
 
-#ifndef FILLSPHERICALSURFACEACTION_HPP
-#define FILLSPHERICALSURFACEACTION_HPP
+#ifndef FILLSURFACEACTION_HPP
+#define FILLSURFACEACTION_HPP
 
 // include config.h
@@ -17 +17 @@
 #include "Actions/Action.hpp"
 
-#include "FillSphericalSurfaceAction.def"
+#include "FillSurfaceAction.def"
 #include "Action_impl_header.hpp"
 
-#endif // FILLSPHERICALSURFACEACTION_HPP
+#endif // FILLSURFACEACTION_HPP