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

File:

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

src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp

@@ -53 +53 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionNotMoleculeByIdAction::performCall() {
-  enum Sucess {
-    NoStatus,
-    AllMoleculesSelected,
-    MoleculesUnselected,
-    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, "Unselecting mol " << Walker->getName());
-        World::getInstance().unselectMolecule(Walker);
-        undomolids.push_back(*iter);
-        if (status < MoleculeMissing)
-          status = MoleculesUnselected;
-      } else {
-        if (status == NoStatus)
-          status = AllMoleculesSelected;
-      }
+  const molecule *mol = World::getInstance().getMolecule(MoleculeById(params.molindex.get()));
+  if (mol != NULL) {
+    if (World::getInstance().isSelected(mol)) {
+      LOG(1, "Unselecting molecule " << mol->name);
+      World::getInstance().unselectAllMolecules(MoleculeById(params.molindex.get()));
+      LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
+      return ActionState::ptr(new SelectionNotMoleculeByIdState(params));
     } else {
-      status = MoleculeMissing;
+      return Action::success;
     }
+  } else {
+    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
+    return Action::failure;
   }
-  LOG(0, World::getInstance().countSelectedMolecules() << " mols remain selected.");
-
-  switch (status) {
-    case MoleculeMissing:
-      STATUS("Cannot find all mols by given ids.");
-      return Action::failure;
-      break;
-    case AllMoleculesSelected:
-    case MoleculesUnselected:
-      return ActionState::ptr(new SelectionNotMoleculeByIdState(undomolids, params));
-      break;
-    default:
-      STATUS("No mols have been selected.");
-      return Action::failure;
-      break;
-  }
-  return Action::failure;
 }
 
@@ -102 +72 @@
   SelectionNotMoleculeByIdState *state = assert_cast<SelectionNotMoleculeByIdState*>(_state.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);
-  }
+  World::getInstance().selectAllMolecules(MoleculeById(state->params.molindex.get()));
 
   return ActionState::ptr(_state);
@@ -114 +80 @@
   SelectionNotMoleculeByIdState *state = assert_cast<SelectionNotMoleculeByIdState*>(_state.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);
-  }
+  World::getInstance().unselectAllMolecules(MoleculeById(state->params.molindex.get()));
 
   return ActionState::ptr(_state);