Changeset bf87c2 for src/UIElements/Dialog.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/Dialog.hpp (modified) (5 diffs)

src/UIElements/Dialog.hpp

@@ -242 +242 @@
     Query(const std::string _title, const std::string _description = "");
     virtual ~Query();
-    virtual bool handle()=0;
+    virtual void handle()=0;
     virtual bool isValid()=0;
     virtual void setResult()=0;
@@ -257 +257 @@
   public:
     TQuery(Parameter<T> &_param, const std::string title, const std::string _description = "") :
-      Query(title, _description), param(_param) {}
+      Query(title, _description), handleSuccess(false), param(_param) {}
     virtual ~TQuery(){}
-    virtual bool handle()=0;
+    virtual void handle()=0;
     virtual bool isValid(){ return param.isValid(temp);  }
-    virtual void setResult(){ param.set(temp);  }
+    virtual void setResult(){ if (handleSuccess) param.set(temp);  }
   protected:
     T temp;
+    bool handleSuccess;
     Parameter<T> &param;
   };
@@ -272 +273 @@
     EmptyQuery(const std::string title, const std::string _description = "");
     virtual ~EmptyQuery();
-    virtual bool handle()=0;
+    virtual void handle()=0;
     virtual bool isValid(){ return true;  }
     virtual void setResult();
@@ -301 +302 @@
 public:
   TQuery(Parameter<Vector> &_param, const std::string title, const std::string _description = "") :
-    Query(title, _description), param(_param) {}
+    Query(title, _description), handleSuccess(false), param(_param) {}
   virtual ~TQuery(){}
-  virtual bool handle()=0;
+  virtual void handle()=0;
   virtual bool isValid(){ return param.isValidAsString(temp);  }
-  virtual void setResult(){ param.setAsString(temp);  }
+  virtual void setResult(){ if (handleSuccess) param.setAsString(temp);  }
 protected:
   std::string temp;
+  bool handleSuccess;
   Parameter<Vector> &param;
 };
@@ -315 +317 @@
 public:
   TQuery(Parameter< std::vector<Vector> > &_param, const std::string title, const std::string _description = "") :
-    Query(title, _description), param(_param) {}
+    Query(title, _description), handleSuccess(false), param(_param) {}
   virtual ~TQuery(){}
-  virtual bool handle()=0;
+  virtual void handle()=0;
   virtual bool isValid();
   virtual void setResult();
 protected:
   std::vector<std::string> temp;
+  bool handleSuccess;
   Parameter< std::vector<Vector> > &param;
 };