Changeset d2a077a for src/Actions

Timestamp:

May 9, 2017, 12:18:01 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

54293d

Parents:

e59735

git-author:

Frederik Heber <frederik.heber@…> (05/09/17 11:07:11)

git-committer:

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

Message:

SelectMoleculeByOrder now allows multiple indices.

Location:

src/Actions/SelectionAction/Molecules

Files:

• MoleculeByOrderAction.cpp (modified) (3 diffs)
• MoleculeByOrderAction.def (modified) (1 diff)

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

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

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.def

@@ -9 +9 @@
 class molecule;
 
-#include "Parameters/Validators/DummyValidator.hpp"
+#include "Parameters/Validators/STLVectorValidator.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (int)
+#define paramtypes (std::vector<int>)
 #define paramtokens ("select-molecule-by-order")
-#define paramdescriptions ("molecule order index, start at 1 or -1")
+#define paramdescriptions ("molecule order indices, starting at 1 or -1")
 #undef paramdefaults
-#define paramreferences (molindex)
+#define paramreferences (molindices)
 #define paramvalids \
-(DummyValidator< int >())
+(STLVectorValidator< std::vector< int > >(1, 99))
 
-#define statetypes (const molecule *)
-#define statereferences (mol)
+#define statetypes (std::vector<const molecule *>)
+#define statereferences (mols)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS