Changeset c5bd60c for src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

Timestamp:

May 18, 2017, 8:05:20 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

ffd7cd

Parents:

d5c1c8

git-author:

Frederik Heber <frederik.heber@…> (05/18/17 19:33:25)

git-committer:

Frederik Heber <frederik.heber@…> (05/18/17 20:05:20)

Message:

tempcommit: Also SelectionAtomByOrder and unselect actions allow for multiple orders. Merge with d2a077a13.

File:

• src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp (modified) (3 diffs)

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

@@ -57 +57 @@
   const std::vector<int> &indices = params.molindices.get();
   std::vector<const molecule *> mols;
+  const World &const_world = World::getConstInstance();
+  World &world = World::getInstance();
   for( std::vector<int>::const_iterator iter = indices.begin(); 
       iter != indices.end(); ++iter) {
-    const molecule *mol = const_cast<const World &>(World::getInstance()).
-        getMolecule(MoleculeByOrder(*iter));
+    const molecule *mol = const_world.getMolecule(MoleculeByOrder(*iter));
 
     if (mol != NULL) {
-      if (!World::getInstance().isSelected(mol)) {
+      if (!const_world.isSelected(mol)) {
         //LOG(1, "Selecting molecule " << mol->name);
-        World::getInstance().selectMolecule(mol);
+        world.selectMolecule(mol);
         mols.push_back(mol);
+        ++no_selected;
       }
     } else {
@@ -85 +87 @@
   SelectionMoleculeByOrderState *state = assert_cast<SelectionMoleculeByOrderState*>(_state.get());
 
+  World &world = World::getInstance();
   for (std::vector<const molecule *>::const_iterator iter = state->mols.begin();
       iter != state->mols.end(); ++iter)
-    World::getInstance().unselectMolecule(*iter);
+    world.unselectMolecule(*iter);
+
   return ActionState::ptr(_state);
 }
@@ -94 +98 @@
   SelectionMoleculeByOrderState *state = assert_cast<SelectionMoleculeByOrderState*>(_state.get());
 
+  World &world = World::getInstance();
   for (std::vector<const molecule *>::const_iterator iter = state->mols.begin();
       iter != state->mols.end(); ++iter)
-    World::getInstance().selectMolecule(*iter);
+    world.selectMolecule(*iter);
   return ActionState::ptr(_state);
 }