Changeset 1fd675 for src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp

Timestamp:

Aug 28, 2010, 12:57:56 AM (15 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, Candidate_v1.7.0, Candidate_v1.7.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:

966e12

Parents:

53d01c

git-author:

Frederik Heber <heber@…> (08/26/10 21:05:34)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:57:56)

Message:

All Actions are converted to the new macro framework.

• included all three values that have been used to create or convert the files
  • createdef.sh
  • createCpp.sh
  • createHeader.sh

File:

• src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp (modified) (5 diffs)

src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Actions/AtomAction/RotateAroundOriginByAngleAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
@@ -36 +34 @@
 using namespace std;
 
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "Actions/AtomAction/RotateAroundOriginByAngleAction.hpp"
 
-/****** AtomRotateAroundOriginByAngleAction *****/
-
-// memento to remember the state when undoing
-
-class AtomRotateAroundOriginByAngleState : public ActionState {
-public:
-  AtomRotateAroundOriginByAngleState(std::vector<atom*> _selectedAtoms, const Vector &_Axis, const double _alpha) :
-    selectedAtoms(_selectedAtoms),
-    Axis(_Axis),
-    alpha(_alpha)
-  {}
-  std::vector<atom*> selectedAtoms;
-  Vector Axis;
-  double alpha;
-};
-
-const char AtomRotateAroundOriginByAngleAction::NAME[] = "rotate-origin";
-
-AtomRotateAroundOriginByAngleAction::AtomRotateAroundOriginByAngleAction() :
-  Action(NAME)
-{}
-
-AtomRotateAroundOriginByAngleAction::~AtomRotateAroundOriginByAngleAction()
-{}
-
-void AtomRotateAroundOriginByAngle(const Vector &Axis, double angle) {
-  ValueStorage::getInstance().setCurrentValue(AtomRotateAroundOriginByAngleAction::NAME, angle);
-  ValueStorage::getInstance().setCurrentValue("position", Axis);
-  ActionRegistry::getInstance().getActionByName(AtomRotateAroundOriginByAngleAction::NAME)->call(Action::NonInteractive);
-};
-
-void AtomRotateAroundOriginByAngleAction::getParametersfromValueStorage()
-{};
-
-Dialog* AtomRotateAroundOriginByAngleAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-
-  dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
-  dialog->queryVector("position", false, ValueStorage::getInstance().getDescription("position"));
-
-  return dialog;
-}
-
+// and construct the stuff
+#include "RotateAroundOriginByAngleAction.def"
+#include "Action_impl_pre.hpp"
+/** =========== define the function ====================== */
 Action::state_ptr AtomRotateAroundOriginByAngleAction::performCall() {
-  double alpha = 0.;
-  Vector Axis;
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
 
-  // obtain axis to rotate to
-  ValueStorage::getInstance().queryCurrentValue(NAME, alpha);
-  ValueStorage::getInstance().queryCurrentValue("position", Axis);
+  // obtain information
+  getParametersfromValueStorage();
 
   // check whether Axis is valid
-  if (Axis.IsZero())
+  if (params.Axis.IsZero())
     return Action::failure;
 
   // convert from degrees to radian
-  alpha *= M_PI/180.;
+  params.angle *= M_PI/180.;
 
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), Axis);
+  Line RotationAxis(Vector(0.,0.,0.), params.Axis);
 
-  DoLog(0) && (Log() << Verbose(0) << "Rotate around origin by " << alpha << " radian, axis from origin to " << Axis << "." << endl);
+  DoLog(0) && (Log() << Verbose(0) << "Rotate around origin by " << params.angle << " radian, axis from origin to " << params.Axis << "." << endl);
   // TODO: use AtomSet::rotate?
   for (std::vector<atom *>::iterator iter = selectedAtoms.begin(); iter != selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), alpha));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle));
   }
   DoLog(0) && (Log() << Verbose(0) << "done." << endl);
-  return Action::state_ptr(new AtomRotateAroundOriginByAngleState(World::getInstance().getSelectedAtoms(), Axis, alpha));
+  return Action::state_ptr(new AtomRotateAroundOriginByAngleState(World::getInstance().getSelectedAtoms(), params));
 }
 
@@ -115 +69 @@
 
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), state->Axis);
+  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis);
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->alpha));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->params.angle));
   }
 
@@ -128 +82 @@
 
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), state->Axis);
+  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis);
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->alpha));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->params.angle));
   }
 
@@ -148 +102 @@
   return NAME;
 }
+/** =========== end of function ====================== */