Changeset bf87c2 for src/UIElements/Qt4/Query/QtQuery.hpp

Timestamp:

Jul 17, 2017, 12:28:51 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults

Children:

3bd4a66

Parents:

9346af

git-author:

Frederik Heber <frederik.heber@…> (07/06/17 22:18:13)

git-committer:

Frederik Heber <frederik.heber@…> (07/17/17 12:28:51)

Message:

Query::handle() no longer returns bool but has internal result flag.

• we use this flag conditionally in setResult(), i.e. if the handle() has failed, then we should not set its result which might overwrite a present default value in the parameter.
• this fixes the problem with StepWorldTime which has a default value of 1 but which was overwritten with 0 because of the non-conditionally calling of setResult().
• this required change of "output-types" default parameter to an empty vector. So far, we were just lucky that this actually worked.
• also StoreSaturatedFragmentAction needed the same change as default values have to be consistent over the specific token.

File:

• src/UIElements/Qt4/Query/QtQuery.hpp (modified) (2 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -43 +43 @@
     Dialog::TQuery<T>(_param, _title, _description) {}
   // QtQueries are interactive - no need for handle().
-  virtual bool handle(){  return true;  }
+  virtual ~QtQuery() {}
+  virtual void handle(){ Dialog::TQuery<T>::handleSuccess = true; }
 };
 
@@ -186 +187 @@
   EmptyQtQuery(const std::string &_title, const std::string &description, QBoxLayout *_parent, Dialog *_dialog);
   virtual ~EmptyQtQuery();
-  virtual bool handle();
+  virtual void handle();
 private:
   QBoxLayout *parent;