Changes in src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp [26b4d62:d7cad1]

File:

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

src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp

@@ -53 +53 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionMoleculeByIdAction::performCall() {
-  const molecule *mol = World::getInstance().getMolecule(MoleculeById(params.molindex.get()));
-  if (mol != NULL) {
-    if (!World::getInstance().isSelected(mol)) {
-      LOG(1, "Selecting molecule " << mol->name);
-      World::getInstance().selectAllMolecules(MoleculeById(params.molindex.get()));
-      LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
-      return ActionState::ptr(new SelectionMoleculeByIdState(params));
+
+  enum Sucess {
+    NoStatus,
+    AllMoleculesUnselected,
+    MoleculesSelected,
+    MoleculeMissing
+  } status = NoStatus;
+
+  const molids_t molids = params.molids.get();
+  molids_t undomolids;
+  undomolids.reserve(molids.size());
+  for (molids_t::const_iterator iter = molids.begin(); iter != molids.end(); ++iter) {
+    const molecule *Walker = World::getInstance().getMolecule(MoleculeById(*iter));
+    if (Walker != NULL) {
+      if (!World::getInstance().isSelected(Walker)) {
+        LOG(1, "Selecting mol " << Walker->getName());
+        World::getInstance().selectMolecule(Walker);
+        undomolids.push_back(*iter);
+        if (status < MoleculeMissing)
+          status = MoleculesSelected;
+      } else {
+        if (status == NoStatus)
+          status = AllMoleculesUnselected;
+      }
     } else {
-      return Action::success;
+      status = MoleculeMissing;
     }
-  } else {
-    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
-    return Action::failure;
   }
+  LOG(0, World::getInstance().countSelectedMolecules() << " mols selected.");
+
+  switch (status) {
+    case MoleculeMissing:
+      STATUS("Cannot find all mols with given ids.");
+      return Action::failure;
+      break;
+    case AllMoleculesUnselected:
+    case MoleculesSelected:
+      return ActionState::ptr(new SelectionMoleculeByIdState(undomolids, params));
+      break;
+    default:
+      STATUS("No mols have been selected.");
+      return Action::failure;
+      break;
+  }
+  return Action::failure;
 }
 
@@ -72 +103 @@
   SelectionMoleculeByIdState *state = assert_cast<SelectionMoleculeByIdState*>(_state.get());
 
-  World::getInstance().unselectAllMolecules(MoleculeById(state->params.molindex.get()));
+  for (molids_t::const_iterator iter = state->undomolids.begin();
+      iter != state->undomolids.end(); ++iter) {
+    const molecule *Walker = World::getInstance().getMolecule(MoleculeById(*iter));
+    World::getInstance().unselectMolecule(Walker);
+  }
 
   return ActionState::ptr(_state);
@@ -80 +115 @@
   SelectionMoleculeByIdState *state = assert_cast<SelectionMoleculeByIdState*>(_state.get());
 
-  World::getInstance().selectAllMolecules(MoleculeById(state->params.molindex.get()));
+  for (molids_t::const_iterator iter = state->undomolids.begin();
+      iter != state->undomolids.end(); ++iter) {
+    const molecule *Walker = World::getInstance().getMolecule(MoleculeById(*iter));
+    World::getInstance().selectMolecule(Walker);
+  }
 
   return ActionState::ptr(_state);