Changes in src/Actions/AtomAction/RemoveAction.cpp [e41c48:bf3817]

File:

• src/Actions/AtomAction/RemoveAction.cpp (modified) (4 diffs)

src/Actions/AtomAction/RemoveAction.cpp ¶

@@ -6 +6 @@
  */
 
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Helpers/MemDebug.hpp"
 
@@ -11 +16 @@
 #include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
-#include "AtomicInfo.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
 #include "Helpers/Log.hpp"
@@ -26 +30 @@
 #include "UIElements/Dialog.hpp"
 #include "Actions/ValueStorage.hpp"
-
-// memento to remember the state when undoing
-
-class AtomRemoveState : public ActionState {
-public:
-  AtomRemoveState(std::vector<AtomicInfo> _Walkers) :
-    Walkers(_Walkers)
-  {}
-  std::vector<AtomicInfo> Walkers;
-};
 
 const char AtomRemoveAction::NAME[] = "remove-atom";
@@ -61 +55 @@
   atom *first = NULL;
 
-  // create undo state
-  std::vector<AtomicInfo> Walkers;
-  for (World::AtomSelectionIterator iter = World::getInstance().beginAtomSelection(); iter != World::getInstance().endAtomSelection(); ++iter) {
-    Walkers.push_back(AtomicInfo(*(iter->second)));
-  }
-  AtomRemoveState *UndoState = new AtomRemoveState(Walkers);
-
-  // remove all selected atoms
-//  std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
+  std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
   for (World::AtomSelectionIterator iter = World::getInstance().beginAtomSelection(); iter != World::getInstance().endAtomSelection(); ++iter) {
     first = iter->second;
     DoLog(1) && (Log() << Verbose(1) << "Removing atom " << first->getId() << "." << endl);
-//    // TODO: this is not necessary when atoms and their storing to file are handled by the World
-//    // simply try to erase in every molecule found
-//    for (std::vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end(); ++iter) {
-//      (*iter)->erase(first);
-//    }
+    // TODO: this is not necessary when atoms and their storing to file are handled by the World
+    // simply try to erase in every molecule found
+    for (std::vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end(); ++iter) {
+      (*iter)->erase(first);
+    }
     World::getInstance().destroyAtom(first);
   }
-  return Action::state_ptr(UndoState);
+  return Action::success;
 }
 
 Action::state_ptr AtomRemoveAction::performUndo(Action::state_ptr _state) {
-  AtomRemoveState *state = assert_cast<AtomRemoveState*>(_state.get());
+//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
 
-  size_t i=0;
-  for (; i<state->Walkers.size(); ++i) {
-    // re-create the atom
-    DoLog(1) && (Log() << Verbose(1) << "Re-adding atom " << state->Walkers[i].getId() << "." << endl);
-    atom *Walker = World::getInstance().createAtom();
-    if (!state->Walkers[i].setAtom(*Walker)) {
-      DoeLog(1) && (eLog() << Verbose(1) << "Failed to set id." << endl);
-      World::getInstance().destroyAtom(Walker);
-      break;
-    }
-  }
-  if (i<state->Walkers.size()) {
-    // remove all previous ones, too
-    for (size_t j=0;j<i;++j)
-      World::getInstance().destroyAtom(state->Walkers[j].getId());
-    // and announce the failure of the undo
-    return Action::failure;
-  }
-  return Action::state_ptr(_state);
+  return Action::failure;
+//  string newName = state->mol->getName();
+//  state->mol->setName(state->lastName);
+//
+//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
 }
 
 Action::state_ptr AtomRemoveAction::performRedo(Action::state_ptr _state){
-  AtomRemoveState *state = assert_cast<AtomRemoveState*>(_state.get());
-
-  // simple remove again all previously added atoms
-  for (size_t i=0; i<state->Walkers.size(); ++i) {
-    DoLog(1) && (Log() << Verbose(1) << "Re-removing atom " << state->Walkers[i].getId() << "." << endl);
-    World::getInstance().destroyAtom(state->Walkers[i].getId());
-  }
-
-  return Action::state_ptr(_state);
+  return Action::failure;
 }
 
 bool AtomRemoveAction::canUndo() {
-  return true;
+  return false;
 }
 
 bool AtomRemoveAction::shouldUndo() {
-  return true;
+  return false;
 }