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

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"
@@ -228 +226 @@
     const atom * const Walker = (*bonditer)->leftatom;
     const atom * const OtherWalker = (*bonditer)->rightatom;
-    bond::ptr const _bond =
-        const_cast<atom *>(Walker)->addBond(_deststep, const_cast<atom *>(OtherWalker));
-    _bond->setDegree((*bonditer)->getDegree());
+    const_cast<atom *>(Walker)->addBond(_deststep, const_cast<atom *>(OtherWalker));
   }
 }
@@ -563 +559 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  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 = selectedAtoms_Stack.top();
   selectedAtoms_Stack.pop();
 }
@@ -574 +566 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  atomIdsVector_t atomids(countSelectedAtoms(), (atomId_t)-1);
-  std::copy(
-      MapKeyIterator<AtomSelectionConstIterator>(beginAtomSelection()),
-      MapKeyIterator<AtomSelectionConstIterator>(endAtomSelection()),
-      atomids.begin());
-  selectedAtoms_Stack.push( atomids );
+  selectedAtoms_Stack.push( selectedAtoms );
   selectedAtoms.clear();
 }
@@ -716 +703 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  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 = selectedMolecules_Stack.top();
   selectedMolecules_Stack.pop();
 }
@@ -727 +710 @@
   OBSERVE;
   NOTIFY(SelectionChanged);
-  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_Stack.push( selectedMolecules );
   selectedMolecules.clear();
 }