Changeset 26b4d62 for src/Actions/FillAction

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/FillAction

Files:

• FillRegularGridAction.cpp (modified) (5 diffs)
• FillSurfaceAction.cpp (modified) (4 diffs)

src/Actions/FillAction/FillRegularGridAction.cpp

@@ -84 +84 @@
   const std::vector< molecule *> molecules = World::getInstance().getSelectedMolecules();
   if (molecules.size() != 1) {
-    ELOG(1, "No exactly one molecule selected, aborting,");
+    STATUS("No exactly one molecule selected, aborting,");
     return Action::failure;
   }
@@ -99 +99 @@
   if (params.SphereRadius.get() != 0.) {
     if ( atoms.size() == 0) {
-      ELOG(1, "You have given a sphere radius " << params.SphereRadius.get()
-          << " != 0, but have not select any atoms.");
+      STATUS("You have given a sphere radius "+toString(params.SphereRadius.get())
+          +" != 0, but have not select any atoms.");
       return Action::failure;
     }
@@ -168 +168 @@
 
       if (!successflag) {
-        ELOG(1, "Insertion failed, removing inserted clusters, translating original one back");
+        STATUS("Insertion failed, removing inserted clusters, translating original one back");
         RemoveAtomsFromAtomicInfo(clonedatominfos);
         clonedatoms.clear();
@@ -191 +191 @@
   if (successflag)
     return ActionState::ptr(UndoState);
-  else
+  else {
     return Action::failure;
+  }
 }
 
@@ -220 +221 @@
   if (statusflag)
     return ActionState::ptr(_state);
-  else
+  else {
+    STATUS("Failed re-adding filled in atoms.");
     return Action::failure;
+  }
 }
 

src/Actions/FillAction/FillSurfaceAction.cpp

@@ -72 +72 @@
   std::vector<AtomicInfo> movedatoms;
   if (molecules.size() != 1) {
-    ELOG(1, "No exactly one molecule selected, aborting,");
+    STATUS("No exactly one molecule selected, aborting,");
     return Action::failure;
   }
@@ -112 +112 @@
     std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
     if (selectedShapes.size() != 1){
-      ELOG(1, "FillSurfaceAction::performCall(): there has to be exactly 1 selected shape.");
+      STATUS("There has to be exactly 1 selected shape.");
       return Action::failure;
     }
@@ -150 +150 @@
 
       if (!successflag) {
-        ELOG(1, "Insertion failed, removing inserted clusters, translating original one back");
+        STATUS("Insertion failed, removing inserted clusters, translating original one back");
         RemoveAtomsFromAtomicInfo(clonedatominfos);
         clonedatoms.clear();
@@ -198 +198 @@
   if (statusflag)
     return ActionState::ptr(_state);
-  else
+  else {
+    STATUS("Failed to re-added filled in atoms.");
     return Action::failure;
+  }
 }