Changeset c5bd60c for src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.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/NotMoleculeByOrderAction.cpp (modified) (3 diffs)

src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp

@@ -54 +54 @@
 
 ActionState::ptr SelectionNotMoleculeByOrderAction::performCall() {
-  const molecule *mol = const_cast<const World &>(World::getInstance()).
-      getMolecule(MoleculeByOrder(params.molindex.get()));
+  size_t no_unselected = 0;
+  const std::vector<int> &indices = params.molindices.get();
+  std::vector<const molecule *> mols;
+  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));
 
-  if (mol != NULL) {
-    if (World::getInstance().isSelected(mol)) {
-      LOG(1, "Unselecting molecule " << mol->name);
-      World::getInstance().unselectMolecule(mol);
-      LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-      return ActionState::ptr(new SelectionNotMoleculeByOrderState(mol, params));
+    if (mol != NULL) {
+      if (World::getInstance().isSelected(mol)) {
+        //LOG(1, "Unselecting molecule " << mol->name);
+        World::getInstance().unselectMolecule(mol);
+        mols.push_back(mol);
+        ++no_unselected;
+      }
     } else {
-      return Action::success;
+      STATUS("Cannot find molecule by given index "+toString(*iter)+".");
+      return Action::failure;
     }
+  }
+
+  LOG(0, no_unselected << " molecules additionally unselected.");
+  if (no_unselected != 0) {
+    return ActionState::ptr(new SelectionNotMoleculeByOrderState(mols, params));
   } else {
-    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
-    return Action::failure;
+    return Action::success;
   }
 }
@@ -75 +86 @@
   SelectionNotMoleculeByOrderState *state = assert_cast<SelectionNotMoleculeByOrderState*>(_state.get());
 
-  World::getInstance().selectMolecule(state->mol);
+  World &world = World::getInstance();
+  for (std::vector<const molecule *>::const_iterator iter = state->mols.begin();
+      iter != state->mols.end(); ++iter)
+    world.selectMolecule(*iter);
+
   return ActionState::ptr(_state);
 }
@@ -82 +97 @@
   SelectionNotMoleculeByOrderState *state = assert_cast<SelectionNotMoleculeByOrderState*>(_state.get());
 
-  World::getInstance().unselectMolecule(state->mol);
+  World &world = World::getInstance();
+  for (std::vector<const molecule *>::const_iterator iter = state->mols.begin();
+      iter != state->mols.end(); ++iter)
+    world.unselectMolecule(*iter);
+
   return ActionState::ptr(_state);
 }