Changes in src/World.cpp [4f2895:0763ce]

File:

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

src/World.cpp

@@ -48 +48 @@
 #include "Descriptors/AtomDescriptor.hpp"
 #include "Descriptors/AtomDescriptor_impl.hpp"
+#include "Descriptors/AtomIdDescriptor.hpp"
 #include "Descriptors/AtomSelectionDescriptor.hpp"
 #include "Descriptors/MoleculeDescriptor.hpp"
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
+#include "Descriptors/MoleculeIdDescriptor.hpp"
 #include "Descriptors/MoleculeSelectionDescriptor.hpp"
 #include "Descriptors/SelectiveConstIterator_impl.hpp"
@@ -226 +228 @@
     const atom * const Walker = (*bonditer)->leftatom;
     const atom * const OtherWalker = (*bonditer)->rightatom;
-    const_cast<atom *>(Walker)->addBond(_deststep, const_cast<atom *>(OtherWalker));
+    bond::ptr const _bond =
+        const_cast<atom *>(Walker)->addBond(_deststep, const_cast<atom *>(OtherWalker));
+    _bond->setDegree((*bonditer)->getDegree());
   }
 }
@@ -559 +563 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  selectedAtoms = selectedAtoms_Stack.top();
+  const atomIdsVector_t atomids = selectedAtoms_Stack.top();
+  boost::function<void (const atomId_t)> IdSelector =
+      boost::bind(static_cast<void (World::*)(const atomId_t)>(&World::selectAtom), this, _1);
+  selectedAtoms.clear();
+  std::for_each(atomids.begin(),atomids.end(), IdSelector);
   selectedAtoms_Stack.pop();
 }
@@ -566 +574 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  selectedAtoms_Stack.push( selectedAtoms );
+  atomIdsVector_t atomids(countSelectedAtoms(), (atomId_t)-1);
+  std::copy(
+      MapKeyIterator<AtomSelectionConstIterator>(beginAtomSelection()),
+      MapKeyIterator<AtomSelectionConstIterator>(endAtomSelection()),
+      atomids.begin());
+  selectedAtoms_Stack.push( atomids );
   selectedAtoms.clear();
 }
@@ -703 +716 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  selectedMolecules = selectedMolecules_Stack.top();
+  const moleculeIdsVector_t moleculeids = selectedMolecules_Stack.top();
+  boost::function<void (const moleculeId_t)> IdSelector =
+      boost::bind(static_cast<void (World::*)(const moleculeId_t)>(&World::selectMolecule), this, _1);
+  selectedMolecules.clear();
+  std::for_each(moleculeids.begin(),moleculeids.end(), IdSelector);
   selectedMolecules_Stack.pop();
 }
@@ -710 +727 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  selectedMolecules_Stack.push( selectedMolecules );
+  moleculeIdsVector_t moleculeids(countSelectedMolecules(), (moleculeId_t)-1);
+  boost::function<moleculeId_t (const molecule*)> IdRetriever =
+      boost::bind(&molecule::getId, _1);
+  std::copy(
+      MapKeyIterator<MoleculeSelectionConstIterator>(beginMoleculeSelection()),
+      MapKeyIterator<MoleculeSelectionConstIterator>(endMoleculeSelection()),
+      moleculeids.begin());
+  selectedMolecules_Stack.push( moleculeids );
   selectedMolecules.clear();
 }