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

src/Actions/SelectionAction/Atoms/AtomByOrderAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionAtomByOrderAction::performCall() {
-  const atom *Walker = const_cast<const World &>(World::getInstance()).
-      getAtom(AtomByOrder(params.order.get()));
-  if (Walker != NULL) {
-    if (!World::getInstance().isSelected(Walker)) {
-      LOG(1, "Selecting atom " << *Walker);
-      World::getInstance().selectAtom(Walker);
-      LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
-      return ActionState::ptr(new SelectionAtomByOrderState(Walker->getId(), params));
+  size_t no_selected = 0;
+  const std::vector<int> &indices = params.orders.get();
+  std::vector<atomId_t> atomids;
+  const World &const_world = World::getConstInstance();
+  World &world = World::getInstance();
+  for( std::vector<int>::const_iterator iter = indices.begin();
+      iter != indices.end(); ++iter) {
+    const atom * const walker = const_world.getAtom(AtomByOrder(*iter));
+
+    if (walker != NULL) {
+      if (!const_world.isSelected(walker)) {
+        //LOG(1, "Selecting atom " << *walker);
+        world.selectAtom(walker);
+        atomids.push_back(walker->getId());
+        ++no_selected;
+      }
     } else {
-      return Action::success;
+      STATUS("Cannot find atom by given index "+toString(*iter)+".");
+      return Action::failure;
     }
+  }
+
+  LOG(0, no_selected << " atoms additionally selected.");
+  if (no_selected != 0) {
+    return ActionState::ptr(new SelectionAtomByOrderState(atomids, params));
   } else {
-    STATUS("Cannot find atom by given order of "+toString(params.order.get())+".");
-    return Action::failure;
+    return Action::success;
   }
 }
@@ -74 +87 @@
   SelectionAtomByOrderState *state = assert_cast<SelectionAtomByOrderState*>(_state.get());
 
-  World::getInstance().unselectAllAtoms(AtomById(state->WalkerId));
+  World &world = World::getInstance();
+  for (std::vector<atomId_t>::const_iterator iter = state->WalkerIds.begin();
+      iter != state->WalkerIds.end(); ++iter)
+    world.unselectAllAtoms(AtomById(*iter));
 
   return ActionState::ptr(_state);
@@ -82 +98 @@
   SelectionAtomByOrderState *state = assert_cast<SelectionAtomByOrderState*>(_state.get());
 
-  World::getInstance().selectAllAtoms(AtomById(state->WalkerId));
+  World &world = World::getInstance();
+  for (std::vector<atomId_t>::const_iterator iter = state->WalkerIds.begin();
+      iter != state->WalkerIds.end(); ++iter)
+    world.selectAllAtoms(AtomById(*iter));
 
   return ActionState::ptr(_state);