Changeset 1a8fbf6 for src/Actions/AtomAction

Timestamp:

Jul 26, 2010, 4:41:03 PM (14 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:

ecbc9a

Parents:

4e4c4d

Message:

All AtomActions contain now a ActionCall.hpp function.

• to have the Action's NAME, the action call function has to be friend of the Action.

Location:

src/Actions/AtomAction

Files:

• AddAction.cpp (modified) (2 diffs)
• AddAction.hpp (modified) (1 diff)
• ChangeElementAction.cpp (modified) (2 diffs)
• ChangeElementAction.hpp (modified) (1 diff)
• RemoveAction.cpp (modified) (2 diffs)
• RemoveAction.hpp (modified) (1 diff)

src/Actions/AtomAction/AddAction.cpp

@@ -9 +9 @@
 
 #include "Actions/AtomAction/AddAction.hpp"
+#include "Actions/ActionCalls.hpp"
 #include "atom.hpp"
 #include "element.hpp"
@@ -34 +35 @@
 AtomAddAction::~AtomAddAction()
 {}
+
+void AtomAdd(element *elemental, Vector &position) {
+  ValueStorage::getInstance().setCurrentValue(AtomAddAction::NAME, elemental);
+  ValueStorage::getInstance().setCurrentValue("position", elemental);
+  ActionRegistry::getInstance().getActionByName(AtomAddAction::NAME)->call(Action::NonInteractive);
+};
 
 Dialog * AtomAddAction::createDialog() {

src/Actions/AtomAction/AddAction.hpp

@@ -10 +10 @@
 
 #include "Actions/Action.hpp"
+#include "vector.hpp"
+
+class element;
 
 class AtomAddAction : public Action {
+  friend void AtomAdd(element *elemental, Vector &position);
+
 public:
   AtomAddAction();

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -9 +9 @@
 
 #include "Actions/AtomAction/ChangeElementAction.hpp"
+#include "Actions/ActionCalls.hpp"
 #include "atom.hpp"
 #include "element.hpp"
@@ -33 +34 @@
 AtomChangeElementAction::~AtomChangeElementAction()
 {}
+
+void AtomChangeElement(element *elemental) {
+  ValueStorage::getInstance().setCurrentValue(AtomChangeElementAction::NAME, elemental);
+  ActionRegistry::getInstance().getActionByName(AtomChangeElementAction::NAME)->call(Action::NonInteractive);
+};
 
 Dialog* AtomChangeElementAction::createDialog() {

src/Actions/AtomAction/ChangeElementAction.hpp

@@ -11 +11 @@
 #include "Actions/Action.hpp"
 
+class element;
+
 class AtomChangeElementAction : public Action {
+  friend void AtomChangeElement(element *elemental);
+
 public:
   AtomChangeElementAction();

src/Actions/AtomAction/RemoveAction.cpp

@@ -9 +9 @@
 
 #include "Actions/AtomAction/RemoveAction.hpp"
+#include "Actions/ActionCalls.hpp"
 #include "atom.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
@@ -33 +34 @@
 AtomRemoveAction::~AtomRemoveAction()
 {}
+
+void AtomRemove() {
+  ActionRegistry::getInstance().getActionByName(AtomRemoveAction::NAME)->call(Action::NonInteractive);
+};
 
 Dialog* AtomRemoveAction::createDialog() {

src/Actions/AtomAction/RemoveAction.hpp

@@ -12 +12 @@
 
 class AtomRemoveAction : public Action {
+  friend void AtomRemove();
+
 public:
   AtomRemoveAction();