Changeset 8d9984 for molecuilder/src/Actions

Timestamp:

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

Author:

Tillmann Crueger <crueger@…>

Children:

c3294f, fe3540

Parents:

521e29

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:

molecuilder/src/Actions

Files:

• Action.cpp (modified) (2 diffs)
• ActionHistory.cpp (added)
• ActionHistory.hpp (added)
• ActionRegistry.cpp (modified) (3 diffs)
• small_actions.cpp (modified) (1 diff)
• small_actions.hpp (modified) (1 diff)

molecuilder/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) {

molecuilder/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");
 }
 

molecuilder/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) :

molecuilder/src/Actions/small_actions.hpp

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