Changes in src/Actions/UndoRedoHelpers.cpp [8cc22f:596cfa]

File:

• src/Actions/UndoRedoHelpers.cpp (modified) (3 diffs)

src/Actions/UndoRedoHelpers.cpp

@@ -52 +52 @@
 #include "WorldTime.hpp"
 
-bool MoleCuilder::AddAtomsFromAtomicInfo(std::vector<AtomicInfo> &atoms)
+bool MoleCuilder::AddAtomsFromAtomicInfo(const std::vector<AtomicInfo> &atoms)
 {
   size_t i=0;
@@ -69 +69 @@
     for (size_t j=0;j<i;++j)
       World::getInstance().destroyAtom(atoms[j].getId());
+    // and announce the failure
+    return false;
+  }
+  return true;
+}
+
+bool MoleCuilder::AddMoleculesFromAtomicInfo(std::map< moleculeId_t, std::vector<AtomicInfo> > &mol_atoms)
+{
+  bool status = true;
+  for (std::map< moleculeId_t, std::vector<AtomicInfo> >::const_iterator iter = mol_atoms.begin();
+      iter != mol_atoms.end(); ++iter) {
+    // re-create the atom
+    LOG(3, "DEBUG: Re-adding molecule " << iter->first << ".");
+    molecule *mol_Walker = World::getInstance().createMolecule();
+
+    // reset the mol id
+    bool status = true;
+    if (mol_Walker->getId() != iter->first)
+      status &= mol_Walker->changeId(iter->first);
+
+    // add all its atoms
+    status &= AddAtomsFromAtomicInfo(iter->second);
+  }
+  if (!status) {
+    // remove all molecules again
+    for (std::map< moleculeId_t, std::vector<AtomicInfo> >::const_iterator iter = mol_atoms.begin();
+        iter != mol_atoms.end(); ++iter) {
+      molecule * mol = World::getInstance().getMolecule(MoleculeById(iter->first));
+      if (mol != NULL)
+        removeAtomsinMolecule(mol);
+    }
     // and announce the failure
     return false;
@@ -173 +204 @@
   for (std::vector<moleculeId_t>::const_iterator iter = ids.begin();
       iter != ids.end(); ++iter) {
-    molecule * const mol = World::getInstance().getMolecule(MoleculeById(*iter));
+    molecule * mol = World::getInstance().getMolecule(MoleculeById(*iter));
     if (mol != NULL) {
-      mol->removeAtomsinMolecule();
-      World::getInstance().destroyMolecule(mol);
+      removeAtomsinMolecule(mol);
+      // molecules are automatically removed when empty
     }
   }