Changeset 0d4168 for src/UIElements

Timestamp:

May 20, 2014, 8:47:03 AM (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:

cc6e5c

Parents:

c09f94

git-author:

Frederik Heber <heber@…> (08/28/13 23:05:38)

git-committer:

Frederik Heber <heber@…> (05/20/14 08:47:03)

Message:

Allow setting of invalid values in Value class, Action::performCall() catches ParameterExceptions.

Value changes:

• Values are now checked with get().
• having the Actions fill their parameters on instantiation may lead to invalid values because actions that, e.g. add an atom and thereby make a so far invalid atomic id now valid, still have to get executed.
• hence, we allow setting of invalid values. Validity is check/enforced on get(), i.e. when the Action is actually performed and not before. This is also the very moment where the parameters are first required to be valid.
• Parameter::clone() and copy cstor must not use get() as invalid values are there still allowed.
• TESTFIX: Value behavior changed.
• TESTFIX: regression test add atom outside boundary is working again.
• TESTFIX: regression tests load/store-session would be skipped as loading non-present file fails now. We use --help --actionname instead.

Action changes:

• are turned into Action::failure.
• ActionQueue calling an Action wrapped in try/catch-block for ActionFailure.
• removed try/catch in doUI().
• as exception (will) occur in ActionQueue's queue_thread, we need to catch it there. As the only thing we do is set the exit flag of the World. We can do this in ActionQueue as well.

File:

• src/UIElements/Dialog.cpp (modified) (2 diffs)

src/UIElements/Dialog.cpp

@@ -68 +68 @@
 bool Dialog::display(){
   handleAll();
-  if(checkAll()){
-    setAll();
-    return true;
-  }
-  else{
-    return false;
-  }
+  setAll();
+  return true;
+//  if(checkAll()){
+//    setAll();
+//    return true;
+//  }
+//  else{
+//    return false;
+//  }
 }
 
@@ -107 +109 @@
   list<Query*>::iterator iter;
   for(iter=queries.begin(); iter!=queries.end(); iter++) {
-    try {
+//    try {
       (*iter)->setResult();
-    } catch (ParameterException &e) {
-      if( const std::string *name=boost::get_error_info<ParameterName>(e) )
-        ELOG(1, "The following parameter value is not valid: " << *name << ".");
-      break;
-    }
+//    } catch (ParameterException &e) {
+//      if( const std::string *name=boost::get_error_info<ParameterName>(e) )
+//        ELOG(1, "The following parameter value is not valid: " << *name << ".");
+//      break;
+//    }
   }
 }