Changes in src/World.cpp [46ce1c:4f2895]

File:

• src/World.cpp (modified) (7 diffs)

src/World.cpp

@@ -245 +245 @@
     WorldTime::getInstance().setTime(_step);
 
-    // TODO: removed when BondGraph creates the adjacency
-    // 3. remove all of World's molecules
-    for (MoleculeIterator iter = getMoleculeIter();
-        getMoleculeIter() != moleculeEnd();
-        iter = getMoleculeIter()) {
-      getMolecules()->erase(*iter);
-      destroyMolecule(*iter);
-    }
-
     // 4. scan for connected subgraphs => molecules
     DepthFirstSearchAnalysis DFS;
@@ -304 +295 @@
 
 void World::destroyMolecule(molecule* mol){
-  OBSERVE;
   ASSERT(mol,"Molecule that was meant to be destroyed did not exist");
   destroyMolecule(mol->getId());
@@ -319 +309 @@
   }
   mol->signOff(this);
+  // TODO: removed when depcreated MoleculeListClass is gone
+  molecules_deprecated->erase(mol);
   DeleteMolecule(mol);
   if (isMoleculeSelected(id))
@@ -365 +357 @@
     NOTIFY(AtomRemoved);
   }
+  // check if it's the last atom
+  molecule *_mol = atom->getMolecule();
+  if ((_mol == NULL) || (_mol->getAtomCount() > 1))
+    _mol = NULL;
   DeleteAtom(atom);
   if (isAtomSelected(id))
@@ -370 +366 @@
   atoms.erase(id);
   atomIdPool.releaseId(id);
+  // remove molecule if empty
+  if (_mol != NULL)
+    destroyMolecule(_mol);
 }
 
@@ -555 +554 @@
   std::for_each(invertedSelection.begin(),invertedSelection.end(),
       std::bind1st(std::mem_fun(selector),this)); // func is select... see above
+}
+
+void World::popAtomSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  selectedAtoms = selectedAtoms_Stack.top();
+  selectedAtoms_Stack.pop();
+}
+
+void World::pushAtomSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  selectedAtoms_Stack.push( selectedAtoms );
+  selectedAtoms.clear();
 }
 
@@ -685 +698 @@
   std::for_each(invertedSelection.begin(),invertedSelection.end(),
       std::bind1st(std::mem_fun(selector),this)); // func is select... see above
+}
+
+void World::popMoleculeSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  selectedMolecules = selectedMolecules_Stack.top();
+  selectedMolecules_Stack.pop();
+}
+
+void World::pushMoleculeSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
+  selectedMolecules_Stack.push( selectedMolecules );
+  selectedMolecules.clear();
 }