Changeset 26b4d62 for src/Actions/SelectionAction

Timestamp:

Jun 27, 2014, 9:32:03 PM (11 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:

c73e35

Parents:

0b6b77

git-author:

Frederik Heber <heber@…> (06/19/14 13:56:27)

git-committer:

Frederik Heber <heber@…> (06/27/14 21:32:03)

Message:

All Actions now give correct failure status via STATUS() macro.

Location:

src/Actions/SelectionAction

Files:

• Atoms/AllAtomsInsideVolumeAction.cpp (modified) (3 diffs)
• Atoms/AtomByIdAction.cpp (modified) (1 diff)
• Atoms/AtomByOrderAction.cpp (modified) (1 diff)
• Atoms/NotAllAtomsInsideVolumeAction.cpp (modified) (3 diffs)
• Atoms/NotAtomByIdAction.cpp (modified) (1 diff)
• Atoms/NotAtomByOrderAction.cpp (modified) (1 diff)
• Molecules/MoleculeByIdAction.cpp (modified) (1 diff)
• Molecules/MoleculeByOrderAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByIdAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByOrderAction.cpp (modified) (1 diff)
• Shapes/NotShapeByNameAction.cpp (modified) (1 diff)
• Shapes/ShapeByNameAction.cpp (modified) (1 diff)

src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp

@@ -61 +61 @@
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
   if (selectedShapes.size() != 1){
-    ELOG(1, "SelectionAllAtomsInsideVolumeAction::performCall(): there has to be exactly 1 selected shape.");
+    STATUS("There has to be exactly 1 selected shape.");
     return Action::failure;
   }
@@ -74 +74 @@
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
-  if (selectedShapes.size() != 1)
-    return Action::failure;
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
   BOOST_FOREACH(atom *_atom, state->selectedAtoms)
@@ -87 +85 @@
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
-  if (selectedShapes.size() != 1)
-    return Action::failure;
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
 

src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

@@ -85 +85 @@
   switch (status) {
     case AtomMissing:
+      STATUS("Cannot find all atoms with given ids.");
       return Action::failure;
       break;

src/Actions/SelectionAction/Atoms/AtomByOrderAction.cpp

@@ -65 +65 @@
     }
   } else {
+    STATUS("Cannot find atom by given order of "+toString(params.order.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp

@@ -60 +60 @@
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
   if (selectedShapes.size() != 1){
-    ELOG(1, "SelectionNotAllAtomsInsideVolumeAction::performCall(): there has to be exactly 1 selected shape.");
+    STATUS("There has to be exactly 1 selected shape.");
     return Action::failure;
   }
@@ -73 +73 @@
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
-  if (selectedShapes.size() != 1)
-    return Action::failure;
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
   BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
@@ -86 +84 @@
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
-  if (selectedShapes.size() != 1)
-    return Action::failure;
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
 

src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

@@ -85 +85 @@
   switch (status) {
     case AtomMissing:
+      STATUS("Cannot find all atoms by given ids.");
       return Action::failure;
       break;

src/Actions/SelectionAction/Atoms/NotAtomByOrderAction.cpp

@@ -65 +65 @@
     }
   } else {
+    STATUS("Cannot find atom by given order of "+toString(params.order.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp

@@ -64 +64 @@
     }
   } else {
+    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

@@ -66 +66 @@
     }
   } else {
+    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp

@@ -64 +64 @@
     }
   } else {
+    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp

@@ -66 +66 @@
     }
   } else {
+    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Shapes/NotShapeByNameAction.cpp

@@ -62 +62 @@
     }
   } else {
+    STATUS("Cannot find shape by given name "+toString(params.shapeName.get())+".");
     return Action::failure;
   }

src/Actions/SelectionAction/Shapes/ShapeByNameAction.cpp

@@ -62 +62 @@
     }
   } else {
+    STATUS("Cannot find shape by given name "+toString(params.shapeName.get())+".");
     return Action::failure;
   }