Changeset f79d65 for src/UIElements/TextUI/Query

Timestamp:

Jun 19, 2017, 8:24:16 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

1ba51c

Parents:

2eded3e

git-author:

Frederik Heber <heber@…> (03/30/17 21:59:00)

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:24:16)

Message:

Vector(s) are now stored as strings in Querys intermediately.

• they get evaluated first after being stored in a Parameter/Value on request via get().
• Needed to change all Vector(s)..Query's of all UIs and also the general base classes inside Dialog.
• QtQueryList need to be specialized in order to allow a QtQueryList<Vector> to actually store a vector of strings.
• we may use setAsString() in order to set the Parameter thankfully.
• TESTS: All regression tests on Geometry Actions are now working. Removed XFAIL from Options/Session test that use Python, i.e. the ones we marked four commits ago.

File:

• src/UIElements/TextUI/Query/VectorsTextQuery.cpp (modified) (2 diffs)

src/UIElements/TextUI/Query/VectorsTextQuery.cpp

@@ -41 +41 @@
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Verbose.hpp"
+#include "Geometry/GeometryRegistry.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
@@ -54 +55 @@
 
 bool TextDialog::VectorsTextQuery::handle() {
+  std::stringstream output;
   std::cout << getDescription() << std::endl;
   char coords[3] = {'x', 'y', 'z'};
   const RealSpaceMatrix &M = World::getInstance().getDomain().getM();
-  for (int i=0;i<3;i++)
-    std::cout << coords[i] << "[0.." << M.at(i,i) << ( (i!=2) ? "], " : "]: ");
+  std::cout << "Enter three comma-separated coordinates, vector name, ? for list or empty for end." << std::endl;
+  while (true) {
+    for (int i=0;i<3;i++)
+      std::cout << coords[i] << "[0.." << M.at(i,i) << ( (i!=2) ? "], " : "]: ");
 
-  std::string line;
-  getline(std::cin,line);
+    std::string line;
+    getline(std::cin,line);
 
-  // dissect by ","
-  double coord = 0.;
-  std::string::iterator olditerspace = line.begin();
-  std::string::iterator olditercomma = line.begin();
-  int counter = 0;
-  Vector temp_element;
-  for(std::string::iterator vectoriter = line.begin(); vectoriter != line.end(); ++vectoriter) {
-    if (*vectoriter == ',')
-      counter++;
-    if ((*vectoriter == ' ') && (counter == 2)) {
-      counter = 0;
-      for(std::string::iterator componentiter = olditerspace; (componentiter != vectoriter) && (counter !=3); ++componentiter) {
-        if (*componentiter == ',') {
-          std::istringstream stream(std::string(componentiter, olditercomma));
-          stream >> coord;
-          temp_element[counter++] = coord;
-          olditercomma = componentiter;
-        }
+    if (line == "?") {
+      GeometryRegistry &reg = GeometryRegistry::getInstance();
+
+      GeometryRegistry::const_iterator iter;
+      for (iter = reg.getBeginIter(); iter != reg.getEndIter(); iter ++){
+        GeometryObject *v = iter->second;
+        std::cout << "\t" << *v << std::endl;
       }
-      if ((olditercomma != line.begin()) && (counter != 3)) { // insert last part also
-        std::istringstream stream(std::string(olditercomma, vectoriter));
-        stream >> coord;
-        temp_element[counter++] = coord;
-      }
-      temp.push_back(temp_element);
-      olditerspace = vectoriter;
+    } else if (line.empty()) {
+      break;
+    } else {
+      // simply append with white-space delimiter
+      temp.push_back(line);
     }
   }