Changeset 80951de for src/Actions

Timestamp:

Jul 22, 2010, 9:59:37 PM (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, 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:

30db64

Parents:

4c5aaf

Message:

Fixed all remaining Action's and derived classes that lacked createDialog().

Location:

src/Actions

Files:

• ActionHistory.cpp (modified) (2 diffs)
• ActionHistory.hpp (modified) (2 diffs)
• ActionSequence.cpp (modified) (2 diffs)
• ActionSequence.hpp (modified) (2 diffs)
• Calculation.hpp (modified) (1 diff)
• Calculation_impl.hpp (modified) (1 diff)
• ErrorAction.cpp (modified) (1 diff)
• ErrorAction.hpp (modified) (1 diff)
• MakroAction.cpp (modified) (1 diff)
• MakroAction.hpp (modified) (1 diff)
• ManipulateAtomsProcess.cpp (modified) (1 diff)
• ManipulateAtomsProcess.hpp (modified) (1 diff)
• MethodAction.cpp (modified) (1 diff)
• MethodAction.hpp (modified) (1 diff)

src/Actions/ActionHistory.cpp

@@ -86 +86 @@
 }
 
+Dialog* ActionHistory::UndoAction::createDialog(){
+
+}
+
 Action::state_ptr ActionHistory::UndoAction::performCall(){
   hist->undoLast();
@@ -120 +124 @@
 }
 
+Dialog* ActionHistory::RedoAction::createDialog(){
+
+}
+
 Action::state_ptr ActionHistory::RedoAction::performCall(){
   hist->redoLast();

src/Actions/ActionHistory.hpp

@@ -40 +40 @@
 
   private:
+    virtual Dialog * createDialog();
     virtual Action::state_ptr performCall();
     virtual Action::state_ptr performUndo(Action::state_ptr);
@@ -58 +59 @@
 
   private:
+    virtual Dialog * createDialog();
     virtual Action::state_ptr performCall();
     virtual Action::state_ptr performUndo(Action::state_ptr);

src/Actions/ActionSequence.cpp

@@ -10 +10 @@
 #include "Actions/ActionSequence.hpp"
 #include "Actions/Action.hpp"
+#include "UIElements/Dialog.hpp"
 
 #include "Helpers/Assert.hpp"
@@ -36 +37 @@
     return theAction;
   }
+}
+
+// this method is used outside the ActionModule
+// Each action registers itself with the history
+void ActionSequence::callAllDialogs(){
+  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
+    // we want to have a global bookkeeping for all actions in the sequence, so
+    // we bypass the normal call
+    (*it)->createDialog()->display();
+  }
+}
+
+// This method is used internally when MakroActions are constructed.
+// In this case only the makro Action should be registered and
+// handle the states
+ActionSequence::stateSet ActionSequence::callAllDialogs(bool){
+  stateSet states;
+  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
+    // we want to have a global bookkeeping for all actions in the sequence, so
+    // we bypass the normal call
+    (*it)->createDialog()->display();
+  }
+  return states;
 }
 

src/Actions/ActionSequence.hpp

@@ -30 +30 @@
 
   void callAll();
+  void callAllDialogs();
 
   bool canUndo();
@@ -36 +37 @@
 protected:
   stateSet callAll(bool); // Dummy parameter to allow overloading
+  stateSet callAllDialogs(bool); // Dummy parameter to allow overloading
   stateSet undoAll(stateSet);
   stateSet redoAll(stateSet);

src/Actions/Calculation.hpp

@@ -64 +64 @@
   virtual T* doCalc()=0;
 private:
+  virtual Dialog* createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);

src/Actions/Calculation_impl.hpp

@@ -27 +27 @@
 
 // methods inherited from Action
+
+template<typename T>
+Dialog* Calculation<T>::createDialog(){
+  return NULL;
+}
 
 template<typename T>

src/Actions/ErrorAction.cpp

@@ -27 +27 @@
 }
 
+Dialog* ErrorAction::createDialog() {
+}
+
 Action::state_ptr ErrorAction::performCall() {
   Log() << Verbose(0) << errorMsg << endl;

src/Actions/ErrorAction.hpp

@@ -22 +22 @@
 
 private:
-
+  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);

src/Actions/MakroAction.cpp

@@ -44 +44 @@
 }
 
+Dialog* MakroAction::createDialog() {
+  actions->callAllDialogs();
+}
 
 Action::state_ptr MakroAction::performCall(){

src/Actions/MakroAction.hpp

@@ -30 +30 @@
 
 private:
+  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);

src/Actions/ManipulateAtomsProcess.cpp

@@ -26 +26 @@
 ManipulateAtomsProcess::~ManipulateAtomsProcess()
 {}
+
+Dialog* ManipulateAtomsProcess::createDialog(){
+
+}
 
 Action::state_ptr ManipulateAtomsProcess::performCall(){

src/Actions/ManipulateAtomsProcess.hpp

@@ -29 +29 @@
 private:
 
+  virtual Dialog* createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);

src/Actions/MethodAction.cpp

@@ -26 +26 @@
 {}
 
+Dialog* MethodAction::createDialog() {
+}
+
 
 Action::state_ptr MethodAction::performCall() {

src/Actions/MethodAction.hpp

@@ -26 +26 @@
 
 private:
+  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);