Changeset b918031 for molecuilder/src/UIElements/CommandLineDialog.hpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

e62daa

Parents:

c93262

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@…>

File:

• molecuilder/src/UIElements/CommandLineDialog.hpp (modified) (1 diff)

molecuilder/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();
   };