Changeset 399c69

Timestamp:

Mar 3, 2024, 10:10:53 AM (20 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

02f14d

Parents:

0427d1

git-author:

Frederik Heber <frederik.heber@…> (03/02/24 20:37:07)

git-committer:

Frederik Heber <frederik.heber@…> (03/03/24 10:10:53)

Message:

Rewrote AddAction to use UndoRedoHelpers.

Location:

src/Actions/AtomAction

Files:

• AddAction.cpp (modified) (4 diffs)
• AddAction.def (modified) (2 diffs)

src/Actions/AtomAction/AddAction.cpp

@@ -35 +35 @@
 //#include "CodePatterns/MemDebug.hpp"
 
+#include "Actions/UndoRedoHelpers.hpp"
 #include "Descriptors/AtomIdDescriptor.hpp"
 #include "Atom/atom.hpp"
@@ -55 +56 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-
 atom * getNewAtom(const AtomAddAction::AtomAddParameters &_params)
 {
@@ -65 +65 @@
 }
 
-atom * regetNewAtom(const AtomAddAction::AtomAddParameters &_params, const atomId_t _id)
-{
-  atom * first = World::getInstance().recreateAtom(_id);
-  first->setType(_params.elemental.get());
-  first->setPosition(_params.position.get());
+ActionState::ptr AtomAddAction::performCall() {
+  // execute action
+  std::vector<molecule *> molecules = World::getInstance().getSelectedMolecules();
 
-  return first;
-}
-
-std::vector<atomId_t> createAtoms(
-    const AtomAddAction::AtomAddParameters &_params,
-    std::vector<molecule *> &_molecules)
-{
-  std::vector<atomId_t> ids;
-  if (!_molecules.empty()) {
-    if (_molecules.size() == 1) {
-        atom *first = getNewAtom(_params);
-        molecule *mol = *_molecules.begin();
+  std::vector<AtomicInfo> Walkers;
+  moleculeId_t molId = -1;
+  if (!molecules.empty()) {
+    if (molecules.size() == 1) {
+        atom *first = getNewAtom(params);
+        molecule *mol = *molecules.begin();
         LOG(1, "Adding new atom with element " << first->getType()->getName()
             << " at " << (first->getPosition()) << " to selected molecule "
             << mol->getName()+".");
         mol->AddAtom(first);
-      ids.push_back(first->getId());
+        molId = mol->getId();
+        Walkers.push_back(AtomicInfo(*first));
+    } else {
+      ELOG(1, "Multiple molecules selected. Cannot add atom to multiple molecules.");
     }
   } else {
-    atom *first = getNewAtom(_params);
+    atom * first = getNewAtom(params);
     molecule *mol = World::getInstance().createMolecule();
     mol->setName("none");
@@ -96 +91 @@
     LOG(1, "Adding new atom with element " << first->getType()->getName()
         << " at " << (first->getPosition()) << " to new molecule.");
-    ids.push_back(first->getId());
+    molId = mol->getId();
+    Walkers.push_back(AtomicInfo(*first));
   }
+  WalkersInMolecule_t WalkersInMolecule = { { molId, Walkers } };
 
-  return ids;
+
+  // create undo state
+  AtomAddState *UndoState = new AtomAddState(WalkersInMolecule, params);
+
+  if ((molecules.size() > 1) || (Walkers.empty()))
+     return Action::failure;
+  else
+    return ActionState::ptr(UndoState);
 }
 
-std::vector<atomId_t> recreateAtoms(
-    const AtomAddAction::AtomAddParameters &_params,
-    const std::vector<atomId_t> &_ids,
-    std::vector<molecule *> &_molecules)
-{
-  molecule *mol = NULL;
-  if (!_molecules.empty()) {
-    ASSERT (_molecules.size() == 1,
-        "recreateAtoms() - more than one molecules given.");
-    mol = *_molecules.begin();
-  } else {
-    mol = World::getInstance().createMolecule();
-    mol->setName("none");
-  }
-  std::vector<atomId_t> newids;
-  for (std::vector<atomId_t>::const_iterator iter = _ids.begin();
-      iter != _ids.end(); ++iter) {
-    atom *first = regetNewAtom(_params, *iter);
-    if (first != NULL) {
-      newids.push_back(first->getId());
-      mol->AddAtom(first);
-      LOG(1, "Adding new atom with element " << first->getType()->getName()
-          << " at " << (first->getPosition()) << " to new molecule.");
-    } else {
-      ELOG(1, "Could not recreate atom with id " << *iter);
-      break;
-    }
-  }
-
-  return newids;
-}
-
-ActionState::ptr AtomAddAction::performCall() {
-  // execute action
-  std::vector<molecule *> molecules = World::getInstance().getSelectedMolecules();
-  std::vector<atomId_t> ids = createAtoms(params, molecules);
-
-  if (molecules.size() > 1)
-     return Action::failure;
-  else
-    return ActionState::ptr(new AtomAddState(ids, params));
-}
-
-ActionState::ptr AtomAddAction::performUndo(ActionState::ptr _state) {
+ActionState::ptr AtomAddAction::performUndo(ActionState::ptr _state){
   AtomAddState *state = assert_cast<AtomAddState*>(_state.get());
 
-  for (std::vector<atomId_t>::const_iterator iter = state->ids.begin();
-      iter != state->ids.end(); ++iter) {
-    LOG(1, "Removing atom with id " << *iter << ".");
-    World::getInstance().destroyAtom(*iter);
-  }
+  // simple remove again all previously added atoms
+  RemoveAtomsFromAtomicInfo(state->WalkersInMolecule.begin()->second);
 
   return ActionState::ptr(_state);
 }
 
-ActionState::ptr AtomAddAction::performRedo(ActionState::ptr _state){
+ActionState::ptr AtomAddAction::performRedo(ActionState::ptr _state) {
   AtomAddState *state = assert_cast<AtomAddState*>(_state.get());
 
-  std::vector<molecule *> molecules = World::getInstance().getSelectedMolecules();
-  std::vector<atomId_t> newids = recreateAtoms(state->params, state->ids, molecules);
-  if (newids.size() != state->ids.size()) {
-    STATUS("Could not recreate all atoms after undo.");
-    for (std::vector<atomId_t>::const_iterator iter = newids.begin(); iter != newids.end();++iter)
-      World::getInstance().destroyAtom(*iter);
+  // add all removed atoms again
+  if (AddMoleculesFromAtomicInfo(state->WalkersInMolecule))
+    return ActionState::ptr(_state);
+  else {
+    STATUS("Failed to re-add removed atoms.");
     return Action::failure;
   }
-  return ActionState::ptr(_state);
 }
 

src/Actions/AtomAction/AddAction.def

@@ -10 +10 @@
 #include "World.hpp"
 class element;
+#include <map>
+#include <vector>
+typedef std::map< moleculeId_t, std::vector<AtomicInfo> > WalkersInMolecule_t;
 
 #include "Parameters/Validators/Specific/BoxVectorValidator.hpp"
@@ -27 +30 @@
 (BoxVectorValidator())
 
-#define statetypes (std::vector<atomId_t>)
-#define statereferences (ids)
+#define statetypes (WalkersInMolecule_t)
+#define statereferences (WalkersInMolecule)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS