Changeset d56640 for src

Timestamp:

Mar 25, 2010, 12:01:27 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

975a11, b31bc4

Parents:

5b0b98

git-author:

Tillmann Crueger <crueger@…> (03/25/10 11:59:56)

git-committer:

Tillmann Crueger <crueger@…> (03/25/10 12:01:27)

Message:

Added full undo functioniality

Location:

src

Files:

• Actions/Action.cpp (modified) (2 diffs)
• Actions/ActionHistory.cpp (added)
• Actions/ActionHistory.hpp (added)
• Actions/ActionRegistry.cpp (modified) (3 diffs)
• Actions/small_actions.cpp (modified) (1 diff)
• Actions/small_actions.hpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Menu/TextMenu.cpp (modified) (2 diffs)
• Menu/TextMenu.hpp (modified) (3 diffs)
• UIElements/TextDialog.cpp (modified) (1 diff)
• UIElements/TextWindow.cpp (modified) (2 diffs)
• UIElements/TextWindow.hpp (modified) (1 diff)
• builder.cpp (modified) (2 diffs)

src/Actions/Action.cpp

@@ -10 +10 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionHistory.hpp"
 
 using namespace std;
@@ -34 +35 @@
 void Action::call(){
   // forward to private virtual
-  performCall();
+  state_ptr state = performCall();
+  if(shouldUndo() && state != failure){
+    if(canUndo()){
+      ActionHistory::getInstance().addElement(this,state);
+    }
+    else{
+      ActionHistory::getInstance().clear();
+    }
+  }
 }
 Action::state_ptr Action::undo(state_ptr _state) {

src/Actions/ActionRegistry.cpp

@@ -12 +12 @@
 
 #include <string>
-#include <cassert>
+#include "Helpers/Assert.hpp"
 #include <iostream>
 
@@ -33 +33 @@
   map<const string,Action*>::iterator iter;
   iter = actionMap.find(name);
-  assert(iter!=actionMap.end() && "Query for an action not stored in registry");
+  ASSERT(iter!=actionMap.end(),"Query for an action not stored in registry");
   return iter->second;
 }
@@ -40 +40 @@
   pair<map<const string,Action*>::iterator,bool> ret;
   ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
-  assert(ret.second && "Two actions with the same name added to registry");
+  ASSERT(ret.second,"Two actions with the same name added to registry");
 }
 

src/Actions/small_actions.cpp

@@ -26 +26 @@
 };
 
-char ChangeMoleculeNameAction::NAME[] = "Change filename of Molecule";
+const char ChangeMoleculeNameAction::NAME[] = "Change filename of Molecule";
 
 ChangeMoleculeNameAction::ChangeMoleculeNameAction(MoleculeListClass *_molecules) :

src/Actions/small_actions.hpp

@@ -24 +24 @@
 
   MoleculeListClass *molecules;
-  static char NAME[];
+  static const char NAME[];
 };
 

src/Makefile.am

@@ -8 +8 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp Actions/Process.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ManipulateAtomsProcess.cpp Actions/ActionRegistry.cpp 
-ACTIONSHEADER = Actions/Action.hpp Actions/Process.hpp Actions/Calculation.hpp Actions/Calculation_impl.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ManipulateAtomsProcess.hpp Actions/ActionRegistry.hpp
+ACTIONSSOURCE = Actions/Action.cpp \
+                                Actions/ActionHistory.cpp \
+                                Actions/ActionRegistry.cpp \
+                                Actions/ActionSequence.cpp \
+                                Actions/ErrorAction.cpp \
+                                Actions/MakroAction.cpp \
+                                Actions/ManipulateAtomsProcess.cpp \
+                                Actions/MethodAction.cpp \
+                Actions/Process.cpp \
+                Actions/small_actions.cpp
+                
+                 
+ACTIONSHEADER = Actions/Action.hpp \
+                                Actions/ActionHistory.hpp \
+                                Actions/ActionRegistry.hpp \
+                                Actions/ActionSequence.hpp \
+                            Actions/Calculation.hpp \
+                            Actions/Calculation_impl.hpp \
+                            Actions/ErrorAction.hpp \
+                            Actions/MakroAction.hpp \
+                            Actions/ManipulateAtomsProcess.hpp \
+                            Actions/MethodAction.hpp \
+                            Actions/Process.hpp \
+                            Actions/small_actions.hpp
+                            
+                            
 
 PATTERNSOURCE = Patterns/Observer.cpp

src/Menu/TextMenu.cpp

@@ -11 +11 @@
 #include "Menu/TextMenu.hpp"
 #include "Menu/MenuItem.hpp"
+#include "Helpers/Assert.hpp"
 
 
@@ -88 +89 @@
 }
 
+string TextMenu::getTitle(){
+  return title;
+}
+
 void TextMenu::addDefault(MenuItem* _defaultItem) {
   defaultItem = _defaultItem;
 }
+
+/****************************** Contained Actions ****************/
+
+const string TextMenu::LeaveAction::nameBase = "Leave menu: ";
+
+TextMenu::LeaveAction::LeaveAction(TextMenu* _menu) :
+Action(nameBase+_menu->getTitle()),
+menu(_menu)
+{}
+
+TextMenu::LeaveAction::~LeaveAction(){}
+
+bool TextMenu::LeaveAction::canUndo(){
+  return false;
+}
+
+bool TextMenu::LeaveAction::shouldUndo(){
+  return false;
+}
+
+Action::state_ptr TextMenu::LeaveAction::performCall(){
+  menu->doQuit();
+  return Action::success;
+}
+
+
+Action::state_ptr TextMenu::LeaveAction::performUndo(Action::state_ptr){
+  ASSERT(0,"Cannot undo leaving a menu");
+  return Action::success;
+}
+
+Action::state_ptr TextMenu::LeaveAction::performRedo(Action::state_ptr){
+  ASSERT(0,"Cannot redo leaving a menu");
+  return Action::success;
+}

src/Menu/TextMenu.hpp

@@ -14 +14 @@
 
 #include "Menu/Menu.hpp"
+#include "Actions/Action.hpp"
 #include "defs.hpp"
 
@@ -26 +27 @@
 {
 public:
+  class LeaveAction : public Action {
+  public:
+    LeaveAction(TextMenu*);
+    virtual ~LeaveAction();
+
+    bool canUndo();
+    bool shouldUndo();
+
+  private:
+    virtual Action::state_ptr performCall();
+    virtual Action::state_ptr performUndo(Action::state_ptr);
+    virtual Action::state_ptr performRedo(Action::state_ptr);
+
+    TextMenu* menu;
+
+    static const string nameBase;
+  };
+
   TextMenu(ostream& _outputter, string _title, char _spacer=STD_MENU_TITLE_SPACER,int _length=STD_MENU_LENGTH);
   virtual ~TextMenu();
@@ -32 +51 @@
   virtual void removeItem(MenuItem*);
   virtual void display();
+  virtual string getTitle();
 
   /**

src/UIElements/TextDialog.cpp

@@ -68 +68 @@
 
 bool TextDialog::StringTextQuery::handle() {
-  //Log() << Verbose(0) << getTitle();
+  Log() << Verbose(0) << getTitle();
   cin >> tmp;
   return true;

src/UIElements/TextWindow.cpp

@@ -94 +94 @@
   populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
 
-  returnFromEditMoleculeAction = new MethodAction("returnAction",boost::bind(&TextMenu::doQuit,editMoleculesMenu),false);
+  Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);
   MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",editMoleculesMenu,returnFromEditMoleculeAction);
 
@@ -108 +108 @@
   delete old_menu;
   delete quitAction;
-  delete returnFromEditMoleculeAction;
   delete moleculeView;
   delete statusIndicator;

src/UIElements/TextWindow.hpp

@@ -29 +29 @@
   // some actions only needed in textMenus
   Action *quitAction;
-  Action *returnFromEditMoleculeAction;
   // all views that are contained in the main Menu
   StringView *moleculeView;

src/builder.cpp

@@ -74 +74 @@
 #include "Menu/ActionMenuItem.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionHistory.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/small_actions.hpp"
@@ -2192 +2193 @@
 
     setVerbosity(0);
+    // need to init the history before any action is created
+    ActionHistory::init();
     /* structure of ParseCommandLineOptions will be refactored later */
     j = ParseCommandLineOptions(argc, argv,  World::getInstance().getMolecules(), World::getInstance().getPeriode(), *configuration, ConfigFileName);