Changes in src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp [be21fa:f10b0c]

File:

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

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp

@@ -40 +40 @@
 /** =========== define the function ====================== */
 Action::state_ptr SelectionMoleculeByFormulaAction::performCall() {
-  LOG(1, "Selecting molecules with chemical formula " << params.formula << ":");
-//  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula));
+  LOG(1, "Selecting molecules with chemical formula " << params.formula.get() << ":");
+//  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula.get()));
   std::vector<molecule *> selectedMolecules =
-      World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByFormula(params.formula));
+      World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByFormula(params.formula.get()));
 //  BOOST_FOREACH(molecule *mol, matchingMolecules)
 //    LOG(1, "\t" << mol->getId() << ", " << mol->getName() << ".");
-  World::getInstance().selectAllMolecules(MoleculeByFormula(params.formula));
+  World::getInstance().selectAllMolecules(MoleculeByFormula(params.formula.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
   return Action::state_ptr(new SelectionMoleculeByFormulaState(selectedMolecules,params));
@@ -54 +54 @@
   SelectionMoleculeByFormulaState *state = assert_cast<SelectionMoleculeByFormulaState*>(_state.get());
 
-  World::getInstance().unselectAllMolecules(MoleculeByFormula(state->params.formula));
+  World::getInstance().unselectAllMolecules(MoleculeByFormula(state->params.formula.get()));
   BOOST_FOREACH( molecule *mol, state->selectedMolecules)
     World::getInstance().selectMolecule(mol);
@@ -64 +64 @@
   SelectionMoleculeByFormulaState *state = assert_cast<SelectionMoleculeByFormulaState*>(_state.get());
 
-  World::getInstance().selectAllMolecules(MoleculeByFormula(state->params.formula));
+  World::getInstance().selectAllMolecules(MoleculeByFormula(state->params.formula.get()));
 
   return Action::state_ptr(_state);