Changeset 86466e

Timestamp:

May 9, 2010, 11:59:35 AM (15 years ago)

Author:

Frederik Heber <heber@…>

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:

50dfda

Parents:

148d8f0

git-author:

Frederik Heber <heber@…> (05/09/10 11:15:17)

git-committer:

Frederik Heber <heber@…> (05/09/10 11:59:35)

Message:

new query class EmptyQuery for showing text messages.

• new class in Dialog EmptyQuery and function queryEmpty to install and register
• specializations added to Text and CommandLine UI
  • new class EmptyTextQuery that prints "title:description" to console
  • new class EmptyCommandLineQuery that prints "title:description" to console
• FIX: CommandLineDialog was so far lacking the added _description parameter
• FIX: CommandLineUIFactory::makeDialog() was returning NULL instead of available new CommandLineDialog
• HelpAction now uses EmptyQuery to show the help message

Signed-off-by: Frederik Heber <heber@…>

Location:

src

Files:

• Actions/CmdAction/HelpAction.cpp (modified) (1 diff)
• UIElements/CommandLineDialog.cpp (modified) (6 diffs)
• UIElements/CommandLineDialog.hpp (modified) (1 diff)
• UIElements/CommandLineUIFactory.cpp (modified) (1 diff)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/Dialog.hpp (modified) (2 diffs)
• UIElements/TextDialog.cpp (modified) (2 diffs)
• UIElements/TextDialog.hpp (modified) (2 diffs)

src/Actions/CmdAction/HelpAction.cpp

@@ -27 +27 @@
 
 Action::state_ptr CommandLineHelpAction::performCall() {
+  ostringstream usage;
   Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  cout << CommandLineParser::getInstance().visible << endl;
+  usage << CommandLineParser::getInstance().visible << endl;
+  dialog->queryEmpty(NAME, usage.str());
 
-  delete dialog;
-  return Action::failure;
+  if(dialog->display()) {
+    delete dialog;
+    return Action::success;
+  } else {
+    delete dialog;
+    return Action::failure;
+  }
 }
 

src/UIElements/CommandLineDialog.cpp

@@ -35 +35 @@
 
 
-void CommandLineDialog::queryInt(const char* title, int* target){
-  registerQuery(new IntTextQuery(title,target));
+void CommandLineDialog::queryEmpty(const char* title, string _description){
+  registerQuery(new EmptyCommandLineQuery(title, _description));
 }
 
-void CommandLineDialog::queryDouble(const char* title, double* target){
-  registerQuery(new DoubleTextQuery(title,target));
+void CommandLineDialog::queryInt(const char* title, int* target, string _description){
+  registerQuery(new IntCommandLineQuery(title,target, _description));
 }
 
-void CommandLineDialog::queryString(const char* title, string* target){
-  registerQuery(new StringTextQuery(title,target));
+void CommandLineDialog::queryDouble(const char* title, double* target, string _description){
+  registerQuery(new DoubleCommandLineQuery(title,target, _description));
 }
 
-void CommandLineDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules) {
-  registerQuery(new MoleculeTextQuery(title,target,molecules));
+void CommandLineDialog::queryString(const char* title, string* target, string _description){
+  registerQuery(new StringCommandLineQuery(title,target, _description));
 }
 
-void CommandLineDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
-  registerQuery(new VectorTextQuery(title,target,cellSize,check));
+void CommandLineDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules, string _description) {
+  registerQuery(new MoleculeCommandLineQuery(title,target,molecules, _description));
 }
 
-void CommandLineDialog::queryElement(const char* title, const element **target){
-  registerQuery(new ElementTextQuery(title,target));
+void CommandLineDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check, string _description) {
+  registerQuery(new VectorCommandLineQuery(title,target,cellSize,check, _description));
+}
+
+void CommandLineDialog::queryElement(const char* title, const element **target, string _description){
+  registerQuery(new ElementCommandLineQuery(title,target, _description));
 }
 
 /************************** Query Infrastructure ************************/
 
-CommandLineDialog::IntTextQuery::IntTextQuery(string title,int *_target) :
-    Dialog::IntQuery(title,_target)
+CommandLineDialog::EmptyCommandLineQuery::EmptyCommandLineQuery(string title, string _description) :
+    Dialog::EmptyQuery(title, _description)
 {}
 
-CommandLineDialog::IntTextQuery::~IntTextQuery() {}
+CommandLineDialog::EmptyCommandLineQuery::~EmptyCommandLineQuery() {}
 
-bool CommandLineDialog::IntTextQuery::handle() {
+bool CommandLineDialog::EmptyCommandLineQuery::handle() {
+  cout << "Message of " << getTitle() << ":\n" << getDescription() << "\n";
+  return true;
+}
+
+CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title,int *_target, string _description) :
+    Dialog::IntQuery(title,_target, _description)
+{}
+
+CommandLineDialog::IntCommandLineQuery::~IntCommandLineQuery() {}
+
+bool CommandLineDialog::IntCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<int>();
@@ -75 +90 @@
 }
 
-CommandLineDialog::StringTextQuery::StringTextQuery(string title,string *_target) :
-    Dialog::StringQuery(title,_target)
+CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title,string *_target, string _description) :
+    Dialog::StringQuery(title,_target, _description)
 {}
 
-CommandLineDialog::StringTextQuery::~StringTextQuery() {}
+CommandLineDialog::StringCommandLineQuery::~StringCommandLineQuery() {}
 
-bool CommandLineDialog::StringTextQuery::handle() {
+bool CommandLineDialog::StringCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    tmp = CommandLineParser::getInstance().vm[getTitle()].as<std::string>();
+    tmp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
     return true;
   } else
@@ -89 +104 @@
 }
 
-CommandLineDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target) :
-    Dialog::DoubleQuery(title,_target)
+CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title,double *_target, string _description) :
+    Dialog::DoubleQuery(title,_target, _description)
 {}
 
-CommandLineDialog::DoubleTextQuery::~DoubleTextQuery() {}
+CommandLineDialog::DoubleCommandLineQuery::~DoubleCommandLineQuery() {}
 
-bool CommandLineDialog::DoubleTextQuery::handle() {
+bool CommandLineDialog::DoubleCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
     tmp = CommandLineParser::getInstance().vm[getTitle()].as<double>();
@@ -103 +118 @@
 }
 
-CommandLineDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
-    Dialog::MoleculeQuery(title,_target,_molecules)
+CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, MoleculeListClass *_molecules, string _description) :
+    Dialog::MoleculeQuery(title,_target,_molecules, _description)
 {}
 
-CommandLineDialog::MoleculeTextQuery::~MoleculeTextQuery() {}
+CommandLineDialog::MoleculeCommandLineQuery::~MoleculeCommandLineQuery() {}
 
-bool CommandLineDialog::MoleculeTextQuery::handle() {
+bool CommandLineDialog::MoleculeCommandLineQuery::handle() {
   int IdxOfMol = -1;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
@@ -119 +134 @@
 }
 
-CommandLineDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check) :
-    Dialog::VectorQuery(title,_target,_cellSize,_check)
+CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, const double *const _cellSize, bool _check, string _description) :
+    Dialog::VectorQuery(title,_target,_cellSize,_check, _description)
 {}
 
-CommandLineDialog::VectorTextQuery::~VectorTextQuery()
+CommandLineDialog::VectorCommandLineQuery::~VectorCommandLineQuery()
 {}
 
-bool CommandLineDialog::VectorTextQuery::handle() {
+bool CommandLineDialog::VectorCommandLineQuery::handle() {
   vector<double> temp;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
@@ -140 +155 @@
 
 
-CommandLineDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target) :
-    Dialog::ElementQuery(title,target)
+CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, const element **target, string _description) :
+    Dialog::ElementQuery(title,target, _description)
 {}
 
-CommandLineDialog::ElementTextQuery::~ElementTextQuery()
+CommandLineDialog::ElementCommandLineQuery::~ElementCommandLineQuery()
 {}
 
-bool CommandLineDialog::ElementTextQuery::handle() {
+bool CommandLineDialog::ElementCommandLineQuery::handle() {
   int Z = -1;
   if (CommandLineParser::getInstance().vm.count(getTitle())) {

src/UIElements/CommandLineDialog.hpp

@@ -22 +22 @@
   virtual ~CommandLineDialog();
 
-  virtual void queryInt(const char *, int *);
-  virtual void queryString(const char*, std::string *);
-  virtual void queryDouble(const char*, double*);
-  virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
-  virtual void queryVector(const char*,Vector *,const double * const,bool);
-  virtual void queryElement(const char*,const element **);
+  virtual void queryEmpty(const char *, std::string = "");
+  virtual void queryInt(const char *, int *, std::string = "");
+  virtual void queryString(const char*, std::string *, std::string = "");
+  virtual void queryDouble(const char*, double*, std::string = "");
+  virtual void queryMolecule(const char*,molecule**,MoleculeListClass*, std::string = "");
+  virtual void queryVector(const char*,Vector *,const double * const,bool, std::string = "");
+  virtual void queryElement(const char*,const element **, std::string = "");
 
 protected:
   // specialized stuff for text queries
-  class IntTextQuery : public Dialog::IntQuery {
+  class EmptyCommandLineQuery : public Dialog::EmptyQuery {
   public:
-    IntTextQuery(std::string title, int *_target);
-    virtual ~IntTextQuery();
+    EmptyCommandLineQuery(std::string title, std::string _description = "");
+    virtual ~EmptyCommandLineQuery();
     virtual bool handle();
   };
 
-  class DoubleTextQuery : public Dialog::DoubleQuery {
+  class IntCommandLineQuery : public Dialog::IntQuery {
   public:
-    DoubleTextQuery(std::string title, double *_target);
-    virtual ~DoubleTextQuery();
+    IntCommandLineQuery(std::string title, int *_target, std::string _description = "");
+    virtual ~IntCommandLineQuery();
     virtual bool handle();
   };
 
-  class StringTextQuery : public Dialog::StringQuery {
+  class DoubleCommandLineQuery : public Dialog::DoubleQuery {
   public:
-    StringTextQuery(std::string title, std::string *_target);
-    virtual ~StringTextQuery();
+    DoubleCommandLineQuery(std::string title, double *_target, std::string _description = "");
+    virtual ~DoubleCommandLineQuery();
     virtual bool handle();
   };
 
-  class MoleculeTextQuery : public Dialog::MoleculeQuery {
+  class StringCommandLineQuery : public Dialog::StringQuery {
   public:
-    MoleculeTextQuery(std::string title, molecule **_target, MoleculeListClass *_molecules);
-    virtual ~MoleculeTextQuery();
+    StringCommandLineQuery(std::string title, std::string *_target, std::string _description = "");
+    virtual ~StringCommandLineQuery();
     virtual bool handle();
   };
 
-  class VectorTextQuery : public Dialog::VectorQuery {
+  class MoleculeCommandLineQuery : public Dialog::MoleculeQuery {
   public:
-    VectorTextQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
-    virtual ~VectorTextQuery();
+    MoleculeCommandLineQuery(std::string title, molecule **_target, MoleculeListClass *_molecules, std::string _description = "");
+    virtual ~MoleculeCommandLineQuery();
     virtual bool handle();
   };
 
-  class ElementTextQuery : public Dialog::ElementQuery {
+  class VectorCommandLineQuery : public Dialog::VectorQuery {
   public:
-    ElementTextQuery(std::string title, const element **_target);
-    virtual ~ElementTextQuery();
+    VectorCommandLineQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description = "");
+    virtual ~VectorCommandLineQuery();
+    virtual bool handle();
+  };
+
+  class ElementCommandLineQuery : public Dialog::ElementQuery {
+  public:
+    ElementCommandLineQuery(std::string title, const element **_target, std::string _description = "");
+    virtual ~ElementCommandLineQuery();
     virtual bool handle();
   };

src/UIElements/CommandLineUIFactory.cpp

@@ -25 +25 @@
 
 Dialog* CommandLineUIFactory::makeDialog() {
-  return NULL;
+  return new CommandLineDialog();
 }
 

src/UIElements/Dialog.cpp

@@ -65 +65 @@
   return description;
 }
+// empty Queries
+
+Dialog::EmptyQuery::EmptyQuery(string title, std::string description) :
+    Query(title, description)
+{}
+
+Dialog::EmptyQuery::~EmptyQuery() {}
+
+void Dialog::EmptyQuery::setResult() {
+}
+
 // Int Queries
 

src/UIElements/Dialog.hpp

@@ -23 +23 @@
   virtual ~Dialog();
 
+  virtual void queryEmpty(const char *, std::string = "")=0;
   virtual void queryInt(const char *, int *, std::string = "")=0;
   virtual void queryDouble(const char*,double *, std::string = "")=0;
@@ -56 +57 @@
     std::string title;  //!< short title of the query
     std::string description; //!< longer description for tooltips or for help
+  };
+
+  // Empty Query is just meant for showing text, such as version, help, initial message or alike
+  class EmptyQuery : public Query {
+  public:
+    EmptyQuery(std::string title, std::string _description = "");
+    virtual ~EmptyQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
   };
 

src/UIElements/TextDialog.cpp

@@ -29 +29 @@
 
 
+void TextDialog::queryEmpty(const char* title, string description){
+  registerQuery(new EmptyTextQuery(title,description));
+}
+
 void TextDialog::queryInt(const char* title, int* target, string description){
   registerQuery(new IntTextQuery(title,target,description));
@@ -55 +59 @@
 /************************** Query Infrastructure ************************/
 
-TextDialog::IntTextQuery::IntTextQuery(string title,int *_target, std::string _description) :
+TextDialog::EmptyTextQuery::EmptyTextQuery(string title, std::string _description) :
+    Dialog::EmptyQuery(title,_description)
+{}
+
+TextDialog::EmptyTextQuery::~EmptyTextQuery() {}
+
+bool TextDialog::EmptyTextQuery::handle() {
+  cout << "Message of " << getTitle() << ":\n" << getDescription() << "\n";
+  return true;
+}
+
+TextDialog::IntTextQuery::IntTextQuery(string title, int * _target, std::string _description) :
     Dialog::IntQuery(title,_target,_description)
 {}

src/UIElements/TextDialog.hpp

@@ -19 +19 @@
   virtual ~TextDialog();
 
+  virtual void queryEmpty(const char *, std::string = "");
   virtual void queryInt(const char *, int *, std::string = "");
   virtual void queryString(const char*, std::string *, std::string = "");
@@ -28 +29 @@
 protected:
   // specialized stuff for text queries
+  class EmptyTextQuery : public Dialog::EmptyQuery {
+  public:
+    EmptyTextQuery(std::string title, std::string _description = NULL);
+    virtual ~EmptyTextQuery();
+    virtual bool handle();
+  };
+
   class IntTextQuery : public Dialog::IntQuery {
   public: