Changeset 99db9b for src/Actions/SelectionAction

Timestamp:

Jul 24, 2015, 4:44:35 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

fac58f

Parents:

a58c16

git-author:

Frederik Heber <heber@…> (06/02/15 08:32:10)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:35)

Message:

Replaced all World::getSelected...() to const version where possible.

• also added const version of World::getSelectedAtoms().

Location:

src/Actions/SelectionAction

Files:

• Atoms/AllAtomsAction.cpp (modified) (2 diffs)
• Atoms/AllAtomsAction.def (modified) (1 diff)
• Atoms/ClearAllAtomsAction.cpp (modified) (2 diffs)
• Atoms/ClearAllAtomsAction.def (modified) (1 diff)
• Atoms/NotAllAtomsAction.cpp (modified) (2 diffs)
• Atoms/NotAllAtomsAction.def (modified) (1 diff)
• Atoms/PopAtomsAction.cpp (modified) (2 diffs)
• Atoms/PopAtomsAction.def (modified) (1 diff)
• Molecules/AllMoleculesAction.cpp (modified) (2 diffs)
• Molecules/AllMoleculesAction.def (modified) (1 diff)
• Molecules/ClearAllMoleculesAction.cpp (modified) (2 diffs)
• Molecules/ClearAllMoleculesAction.def (modified) (1 diff)
• Molecules/MoleculeOfAtomAction.cpp (modified) (2 diffs)
• Molecules/MoleculeOfAtomAction.def (modified) (1 diff)
• Molecules/NotAllMoleculesAction.cpp (modified) (2 diffs)
• Molecules/NotAllMoleculesAction.def (modified) (1 diff)
• Molecules/NotMoleculeOfAtomAction.cpp (modified) (2 diffs)
• Molecules/NotMoleculeOfAtomAction.def (modified) (1 diff)
• Molecules/PopMoleculesAction.cpp (modified) (2 diffs)
• Molecules/PopMoleculesAction.def (modified) (1 diff)

src/Actions/SelectionAction/Atoms/AllAtomsAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionAllAtomsAction::performCall() {
-  std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
+  const std::vector<const atom *> selectedAtoms =
+      const_cast<const World &>(World::getInstance()).getSelectedAtoms();
   LOG(1, "Selecting all atoms.");
   World::getInstance().selectAllAtoms(AllAtoms());
@@ -66 +67 @@
   World::getInstance().clearAtomSelection();
 
-  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/AllAtomsAction.def

@@ -21 +21 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (selectedAtoms)
 

src/Actions/SelectionAction/Atoms/ClearAllAtomsAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionClearAllAtomsAction::performCall() {
-  std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
+  const std::vector<const atom *> selectedAtoms =
+      const_cast<const World &>(World::getInstance()).getSelectedAtoms();
   LOG(1, "Clearing atoms selection.");
   World::getInstance().clearAtomSelection();
@@ -64 +65 @@
 
   World::getInstance().clearAtomSelection();
-  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/ClearAllAtomsAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (selectedAtoms)
 

src/Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionNotAllAtomsAction::performCall() {
-  std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
+  const std::vector<const atom *> selectedAtoms =
+      const_cast<const World &>(World::getInstance()).getSelectedAtoms();
   LOG(1, "Unselecting all atoms.");
   World::getInstance().clearAtomSelection();
@@ -65 +66 @@
 
   World::getInstance().clearAtomSelection();
-  BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->unselectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/NotAllAtomsAction.def

@@ -21 +21 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (unselectedAtoms)
 

src/Actions/SelectionAction/Atoms/PopAtomsAction.cpp

@@ -50 +50 @@
 ActionState::ptr SelectionPopAtomsAction::performCall() {
   // create undo state
-  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
-  std::vector<atomId_t> selected_atomids(selected_atoms.size(), (atomId_t)-1);
-  std::transform(
-      selected_atoms.begin(), selected_atoms.end(),
-      selected_atomids.begin(),
-      boost::bind(&atom::getId, _1));
+  const std::vector<const atom *> selectedAtoms =
+      const_cast<const World &>(World::getInstance()).getSelectedAtoms();
   LOG(1, "Popping atom selection.");
   World::getInstance().popAtomSelection();
-  return ActionState::ptr(new SelectionPopAtomsState(selected_atomids, params));
+  return ActionState::ptr(new SelectionPopAtomsState(selectedAtoms, params));
 }
 
@@ -67 +63 @@
 
   // and re-create present selection
-  for(std::vector<atomId_t>::const_iterator iter = state->selected_atomids.begin();
-      iter != state->selected_atomids.end(); ++iter)
-    World::getInstance().selectAtom(*iter);
+  World::getInstance().clearAtomSelection();
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
+    World::getInstance().selectAtom(_atom);
 
   return ActionState::ptr(_state);

src/Actions/SelectionAction/Atoms/PopAtomsAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atomId_t>)
-#define statereferences (selected_atomids)
+#define statetypes (std::vector<const atom *>)
+#define statereferences (selectedAtoms)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/SelectionAction/Molecules/AllMoleculesAction.cpp

@@ -55 +55 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionAllMoleculesAction::performCall() {
-  std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Selecting all molecules.");
   World::getInstance().selectAllMolecules(AllMolecules());
@@ -66 +67 @@
 
   World::getInstance().clearMoleculeSelection();
-  BOOST_FOREACH(molecule *_mol, state->selectedMolecules)
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
     World::getInstance().selectMolecule(_mol);
 

src/Actions/SelectionAction/Molecules/AllMoleculesAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<molecule*>)
+#define statetypes (std::vector<const molecule*>)
 #define statereferences (selectedMolecules)
 

src/Actions/SelectionAction/Molecules/ClearAllMoleculesAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionClearAllMoleculesAction::performCall() {
-  std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Clearing molecule selection.");
   World::getInstance().clearMoleculeSelection();
@@ -65 +66 @@
 
   World::getInstance().clearMoleculeSelection();
-  BOOST_FOREACH(molecule *_mol, state->selectedMolecules)
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
     World::getInstance().selectMolecule(_mol);
 

src/Actions/SelectionAction/Molecules/ClearAllMoleculesAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<molecule*>)
+#define statetypes (std::vector<const molecule*>)
 #define statereferences (selectedMolecules)
 

src/Actions/SelectionAction/Molecules/MoleculeOfAtomAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionMoleculeOfAtomAction::performCall() {
-  std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Selecting molecule to currently selected atoms: " << World::getInstance().countSelectedAtoms());
   World::getInstance().selectAllMolecules(MoleculesByAtomSelection());
@@ -65 +66 @@
 
   World::getInstance().clearMoleculeSelection();
-  BOOST_FOREACH(molecule *_mol, state->selectedMolecules)
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
     World::getInstance().selectMolecule(_mol);
 

src/Actions/SelectionAction/Molecules/MoleculeOfAtomAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<molecule*>)
+#define statetypes (std::vector<const molecule*>)
 #define statereferences (selectedMolecules)
 

src/Actions/SelectionAction/Molecules/NotAllMoleculesAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionNotAllMoleculesAction::performCall() {
-  std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Unselecting all molecules.");
   World::getInstance().clearMoleculeSelection();
@@ -65 +66 @@
 
   World::getInstance().clearMoleculeSelection();
-  BOOST_FOREACH(molecule *_mol, state->unselectedMolecules)
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
     World::getInstance().selectMolecule(_mol);
 

src/Actions/SelectionAction/Molecules/NotAllMoleculesAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<molecule*>)
-#define statereferences (unselectedMolecules)
+#define statetypes (std::vector<const molecule*>)
+#define statereferences (selectedMolecules)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp

@@ -54 +54 @@
 /** =========== define the function ====================== */
 ActionState::ptr SelectionNotMoleculeOfAtomAction::performCall() {
-  std::vector<molecule *> unselectedMolecules = World::getInstance().getSelectedMolecules();
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Unselecting molecule to currently selected atoms.");
   World::getInstance().unselectAllMolecules(MoleculesByAtomSelection());
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
-  return ActionState::ptr(new SelectionNotMoleculeOfAtomState(unselectedMolecules, params));
+  return ActionState::ptr(new SelectionNotMoleculeOfAtomState(selectedMolecules, params));
 }
 
@@ -65 +66 @@
 
   World::getInstance().clearMoleculeSelection();
-  BOOST_FOREACH(molecule *_mol, state->unselectedMolecules)
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
     World::getInstance().selectMolecule(_mol);
 

src/Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<molecule*>)
-#define statereferences (unselectedMolecules)
+#define statetypes (std::vector<const molecule*>)
+#define statereferences (selectedMolecules)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/SelectionAction/Molecules/PopMoleculesAction.cpp

@@ -50 +50 @@
 ActionState::ptr SelectionPopMoleculesAction::performCall() {
   // create undo state
-  const std::vector<molecule *> selected_mols = World::getInstance().getSelectedMolecules();
-  std::vector<moleculeId_t> selected_molids(selected_mols.size(), (moleculeId_t)-1);
-  std::transform(
-      selected_mols.begin(), selected_mols.end(),
-      selected_molids.begin(),
-      boost::bind(&molecule::getId, _1));
+  const std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).getSelectedMolecules();
   LOG(1, "Popping molecule selection.");
   World::getInstance().popMoleculeSelection();
-  return ActionState::ptr(new SelectionPopMoleculesState(selected_molids, params));
+  return ActionState::ptr(new SelectionPopMoleculesState(selectedMolecules, params));
 }
 
@@ -66 +62 @@
   World::getInstance().pushMoleculeSelection();
   // re-create old selection
-  for(std::vector<moleculeId_t>::const_iterator iter = state->selected_molids.begin();
-      iter != state->selected_molids.end(); ++iter)
-    World::getInstance().selectMolecule(*iter);
+  World::getInstance().clearMoleculeSelection();
+  BOOST_FOREACH(const molecule *_mol, state->selectedMolecules)
+    World::getInstance().selectMolecule(_mol);
 
   return ActionState::ptr(_state);

src/Actions/SelectionAction/Molecules/PopMoleculesAction.def

@@ -20 +20 @@
 #undef paramvalids
 
-#define statetypes (std::vector<moleculeId_t>)
-#define statereferences (selected_molids)
+#define statetypes (std::vector<const molecule *>)
+#define statereferences (selectedMolecules)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS