Changeset 4e10f5 for src/UIElements/TextUI

Timestamp:

Jul 7, 2010, 4:08:32 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

77a570

Parents:

5630bd (diff), 192f6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'stable' into StructureRefactoring

Conflicts:

src/Actions/WorldAction/CenterOnEdgeAction.cpp
src/Actions/WorldAction/ChangeBoxAction.cpp
src/Actions/WorldAction/RepeatBoxAction.cpp
src/Actions/WorldAction/ScaleBoxAction.cpp
src/World.cpp
src/boundary.cpp

Location:

src/UIElements/TextUI

Files:

• TextDialog.cpp (modified) (2 diffs)
• TextDialog.hpp (modified) (2 diffs)
• TextWindow.cpp (modified) (3 diffs)

src/UIElements/TextUI/TextDialog.cpp

@@ -58 +58 @@
 void TextDialog::queryString(const char* title, string* target, string description){
   registerQuery(new StringTextQuery(title,target,description));
+}
+
+void TextDialog::queryStrings(const char* title, vector<string>* target, string description){
+  registerQuery(new StringsTextQuery(title,target,description));
 }
 
@@ -155 +159 @@
   Log() << Verbose(0) << getTitle();
   getline(cin,tmp);
+  return true;
+}
+
+TextDialog::StringsTextQuery::StringsTextQuery(string title,vector<string> *_target, std::string _description) :
+    Dialog::StringsQuery(title,_target,_description)
+{}
+
+TextDialog::StringsTextQuery::~StringsTextQuery() {}
+
+bool TextDialog::StringsTextQuery::handle() {
+  Log() << Verbose(0) << getTitle();
+  getline(cin,temp);
+  // dissect by ","
+  string::iterator olditer = temp.begin();
+  for(string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
+    if (*iter == ' ') {
+      tmp.push_back(string(iter, olditer));
+      olditer = iter;
+    }
+  }
+  if (olditer != temp.begin())  // insert last part also
+    tmp.push_back(string(olditer, temp.end()));
+
   return true;
 }

src/UIElements/TextUI/TextDialog.hpp

@@ -28 +28 @@
   virtual void queryInt(const char *, int *, std::string = "");
   virtual void queryString(const char*, std::string *, std::string = "");
+  virtual void queryStrings(const char*, std::vector<std::string> *, std::string = "");
   virtual void queryDouble(const char*, double*, std::string = "");
   virtual void queryAtom(const char*,atom**,std::string = "");
@@ -72 +73 @@
   };
 
+  class StringsTextQuery : public Dialog::StringsQuery {
+  public:
+    StringsTextQuery(std::string title, std::vector<std::string> *_target, std::string _description = NULL);
+    virtual ~StringsTextQuery();
+    virtual bool handle();
+  };
+
   class AtomTextQuery : public Dialog::AtomQuery {
   public:

src/UIElements/TextUI/TextWindow.cpp

@@ -22 +22 @@
 #include "Actions/ErrorAction.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Parser/ChangeTracker.hpp"
 #include "Views/StreamStringView.hpp"
 #include "Views/MethodStringView.hpp"
@@ -43 +44 @@
 TextWindow::TextWindow()
 {
-  char ConfigFileName[MAXSTRINGSIZE];
   map <std::string, TextMenu *> NametoTextMenuMap;
 
@@ -78 +78 @@
   new SeperatorItem(main_menu);
 
-  Action *saveConfigAction = new MethodAction("saveConfigAction",boost::bind(&config::SaveAll,World::getInstance().getConfig(), ConfigFileName, World::getInstance().getPeriode(), World::getInstance().getMolecules()));
-  new ActionMenuItem('s',"save current setup to config file",main_menu,saveConfigAction);
+  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
+  new ActionMenuItem('s',"save current setup to config files",main_menu,saveConfigAction);
 
   quitAction = new MethodAction("quitAction",boost::bind(&TextMenu::doQuit,main_menu),false);