Changeset f4b6bc9 for src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

Timestamp:

Apr 4, 2018, 4:59:24 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision, stable

Children:

0aae02

Parents:

775f3f

git-author:

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

git-committer:

Frederik Heber <frederik.heber@…> (04/04/18 16:59:24)

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/CommandLineUI/Query/ElementCommandLineQuery.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

@@ -53 +53 @@
 {}
 
-bool CommandLineDialog::ElementCommandLineQuery::handle() {
+void CommandLineDialog::ElementCommandLineQuery::handle() {
   // TODO: vector of ints and removing first is not correctly implemented yet. How to remove from a vector?
   periodentafel *periode = World::getInstance().getPeriode();
@@ -68 +68 @@
       }
     } catch(boost::bad_any_cast &e) {
-      return false;
+      return;
     }
     ASSERT(temp != NULL, "Invalid element specified in ElementCommandLineQuery");
-    return true;
+    handleSuccess = true; return;
   }
-  return false;
 }