Changeset 4e10f5 for src/UIElements

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

Files:

• CommandLineUI/CommandLineDialog.cpp (modified) (2 diffs)
• CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (2 diffs)
• QT4/QTDialog.cpp (modified) (2 diffs)
• QT4/QTDialog.hpp (modified) (2 diffs)
• TextUI/TextDialog.cpp (modified) (2 diffs)
• TextUI/TextDialog.hpp (modified) (2 diffs)
• TextUI/TextWindow.cpp (modified) (3 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -66 +66 @@
 }
 
+void CommandLineDialog::queryStrings(const char* title, vector<string> * target, string _description){
+  registerQuery(new StringsCommandLineQuery(title,target, _description));
+}
+
 void CommandLineDialog::queryAtom(const char* title, atom **target, string _description) {
   registerQuery(new AtomCommandLineQuery(title,target, _description));
@@ -140 +144 @@
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
+    return true;
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing string for " << getTitle() << "." << endl);
+    return false;
+  }
+}
+
+CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title,vector<string> *_target, string _description) :
+    Dialog::StringsQuery(title,_target, _description)
+{}
+
+CommandLineDialog::StringsCommandLineQuery::~StringsCommandLineQuery() {}
+
+bool CommandLineDialog::StringsCommandLineQuery::handle() {
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    tmp = CommandLineParser::getInstance().vm[getTitle()].as< vector<string> >();
     return true;
   } else {

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -31 +31 @@
   virtual void queryBoolean(const char *, bool *, 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 = "");
@@ -75 +76 @@
   };
 
+  class StringsCommandLineQuery : public Dialog::StringsQuery {
+  public:
+    StringsCommandLineQuery(std::string title, std::vector<std::string> *_target, std::string _description = "");
+    virtual ~StringsCommandLineQuery();
+    virtual bool handle();
+  };
+
   class AtomCommandLineQuery : public Dialog::AtomQuery {
   public:

src/UIElements/Dialog.cpp

@@ -131 +131 @@
 }
 
+// Strings Queries
+
+Dialog::StringsQuery::StringsQuery(string title,vector<string> *_target, std::string _description) :
+    Query(title, _description), target(_target)
+{}
+
+Dialog::StringsQuery::~StringsQuery() {};
+
+void Dialog::StringsQuery::setResult() {
+  *target = tmp;
+}
+
 // Double Queries
 

src/UIElements/Dialog.hpp

@@ -41 +41 @@
   virtual void queryDouble(const char*,double *, std::string = "")=0;
   virtual void queryString(const char*, std::string *, std::string = "")=0;
+  virtual void queryStrings(const char*, std::vector<std::string> *, std::string = "")=0;
   virtual void queryAtom(const char*,atom**,std::string = "")=0;
   virtual void queryMolecule(const char*,molecule**, std::string = "")=0;
@@ -135 +136 @@
   private:
     std::string *target;
+  };
+
+  class StringsQuery : public Query {
+  public:
+    StringsQuery(std::string title,std::vector<std::string> *_target, std::string _description = "");
+    virtual ~StringsQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    std::string temp;
+    std::vector<std::string> tmp;
+  private:
+    std::vector<std::string> *target;
   };
 

src/UIElements/QT4/QTDialog.cpp

@@ -115 +115 @@
 }
 
+void QTDialog::queryStrings(const char* title, std::vector<std::string> *target,string)
+{
+  registerQuery(new StringsQTQuery(title,target,inputLayout,this));
+}
+
 void QTDialog::queryMolecule(const char *title,molecule **target,string)
 {
@@ -212 +217 @@
 {
   return tmp!="";
+}
+
+QTDialog::StringsQTQuery::StringsQTQuery(string _title,vector<string> *_target,QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::StringsQuery(_title,_target),
+    parent(_parent)
+{
+  thisLayout = new QHBoxLayout();
+  titleLabel = new QLabel(QString(getTitle().c_str()));
+  inputBox = new QLineEdit();
+  parent->addLayout(thisLayout);
+  thisLayout->addWidget(titleLabel);
+  thisLayout->addWidget(inputBox);
+
+  pipe = new StringQTQueryPipe(&temp,_dialog);
+  pipe->update(inputBox->text());
+  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(update(const QString&)));
+}
+
+QTDialog::StringsQTQuery::~StringsQTQuery()
+{
+  delete pipe;
+}
+
+// All values besides the empty string are valid
+bool QTDialog::StringsQTQuery::handle()
+{
+  // 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 temp!="";
 }
 

src/UIElements/QT4/QTDialog.hpp

@@ -40 +40 @@
   virtual void queryDouble(const char*,double *,std::string = "");
   virtual void queryString(const char*, std::string *,std::string = "");
+  virtual void queryStrings(const char*, std::vector<std::string> *,std::string = "");
   virtual void queryAtom(const char*,atom**,std::string = "");
   virtual void queryMolecule(const char*,molecule**,std::string = "");
@@ -93 +94 @@
     };
 
+    class StringsQTQuery : public Dialog::StringsQuery {
+    public:
+      StringsQTQuery(std::string _title, std::vector<std::string> *_target, QBoxLayout *_parent,QTDialog *_dialog);
+      virtual ~StringsQTQuery();
+      virtual bool handle();
+    private:
+      QBoxLayout *parent;
+      QBoxLayout *thisLayout;
+      QLabel *titleLabel;
+      QLineEdit *inputBox;
+
+      StringQTQueryPipe *pipe;
+    };
+
     class MoleculeQTQuery : public Dialog::MoleculeQuery {
     public:

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);