Changeset 95f965

Timestamp:

Jun 11, 2012, 9:53:19 AM (13 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:

c70fb4

Parents:

f10b0c

git-author:

Michael Ankele <ankele@…> (04/25/12 13:05:29)

git-committer:

Frederik Heber <heber@…> (06/11/12 09:53:19)

Message:

QtQueries only set default values if not already set

• added Value.isSet() function

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Parameters/Value.hpp (modified) (1 diff)
• Parameters/ValueInterface.hpp (modified) (1 diff)
• Parameters/Value_impl.hpp (modified) (1 diff)
• UIElements/Qt4/Query/BooleanQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/DoubleQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/IntQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/StringQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/UnsignedIntQtQuery.cpp (modified) (1 diff)
• UIElements/Qt4/Query/VectorQtQuery.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -174 +174 @@
     Dialog* dialog = createDialog();
     if (dialog->hasQueries()) {
-      dialog->display();
+      if (!dialog->display())
+        // dialog error or aborted -> throw exception
+        throw ActionFailureException() << ActionNameString(getName());
     }
     delete(dialog);

src/Parameters/Value.hpp

@@ -51 +51 @@
   const T & get() const;
   void set(const T & _value);
+  bool isSet() const;
 
   // string functions for ValueInterface

src/Parameters/ValueInterface.hpp

@@ -31 +31 @@
   virtual const T & get() const=0;
   virtual void set(const T & _value)=0;
+  virtual bool isSet() const=0;
 };
 

src/Parameters/Value_impl.hpp

@@ -140 +140 @@
     ValueSet = true;
   value = _value;
+}
+
+
+/** Tests, if a value has been set
+ *
+ * @return true, if a value has been set
+ */
+template <class T>
+bool Value<T>::isSet() const
+{
+  return ValueSet;
 }
 

src/UIElements/Qt4/Query/BooleanQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
+  if (!param.isSet())
+    param.set(false);
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()),_dialog);

src/UIElements/Qt4/Query/DoubleQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
+  if (!param.isSet())
+    param.set(0.0);
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));

src/UIElements/Qt4/Query/IntQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
+  if (!param.isSet())
+    param.set(0);
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));

src/UIElements/Qt4/Query/StringQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
+  if (!param.isSet())
+    param.set("");
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));

src/UIElements/Qt4/Query/UnsignedIntQtQuery.cpp

@@ -32 +32 @@
     parent(_parent)
 {
+  if (!param.isSet())
+    param.set(0);
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));

src/UIElements/Qt4/Query/VectorQtQuery.cpp

@@ -33 +33 @@
     parent(_parent)
 {
-  param.set(Vector(0,0,0));
+  if (!param.isSet())
+    param.set(Vector(0,0,0));
   mainLayout= new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));