Changeset b918031


Ignore:
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.

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

Location:
molecuilder/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Actions/CmdAction/HelpAction.cpp

    rc93262 rb918031  
    2727
    2828Action::state_ptr CommandLineHelpAction::performCall() {
     29  ostringstream usage;
    2930  Dialog *dialog = UIFactory::getInstance().makeDialog();
    3031
    31   cout << CommandLineParser::getInstance().visible << endl;
     32  usage << CommandLineParser::getInstance().visible << endl;
     33  dialog->queryEmpty(NAME, usage.str());
    3234
    33   delete dialog;
    34   return Action::failure;
     35  if(dialog->display()) {
     36    delete dialog;
     37    return Action::success;
     38  } else {
     39    delete dialog;
     40    return Action::failure;
     41  }
    3542}
    3643

  • molecuilder/src/UIElements/CommandLineDialog.cpp

    rc93262 rb918031  
    3535
    3636
    37 void CommandLineDialog::queryInt(const char* title, int* target){
    38   registerQuery(new IntTextQuery(title,target));
     37void CommandLineDialog::queryEmpty(const char* title, string _description){
     38  registerQuery(new EmptyCommandLineQuery(title, _description));
    3939}
    4040
    41 void CommandLineDialog::queryDouble(const char* title, double* target){
    42   registerQuery(new DoubleTextQuery(title,target));
     41void CommandLineDialog::queryInt(const char* title, int* target, string _description){
     42  registerQuery(new IntCommandLineQuery(title,target, _description));
    4343}
    4444
    45 void CommandLineDialog::queryString(const char* title, string* target){
    46   registerQuery(new StringTextQuery(title,target));
     45void CommandLineDialog::queryDouble(const char* title, double* target, string _description){
     46  registerQuery(new DoubleCommandLineQuery(title,target, _description));
    4747}
    4848
    49 void CommandLineDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules) {
    50   registerQuery(new MoleculeTextQuery(title,target,molecules));
     49void CommandLineDialog::queryString(const char* title, string* target, string _description){
     50  registerQuery(new StringCommandLineQuery(title,target, _description));
    5151}
    5252
    53 void CommandLineDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
    54   registerQuery(new VectorTextQuery(title,target,cellSize,check));
     53void CommandLineDialog::queryMolecule(const char* title, molecule **target, MoleculeListClass *molecules, string _description) {
     54  registerQuery(new MoleculeCommandLineQuery(title,target,molecules, _description));
    5555}
    5656
    57 void CommandLineDialog::queryElement(const char* title, const element **target){
    58   registerQuery(new ElementTextQuery(title,target));
     57void CommandLineDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check, string _description) {
     58  registerQuery(new VectorCommandLineQuery(title,target,cellSize,check, _description));
     59}
     60
     61void CommandLineDialog::queryElement(const char* title, const element **target, string _description){
     62  registerQuery(new ElementCommandLineQuery(title,target, _description));
    5963}
    6064
    6165/************************** Query Infrastructure ************************/
    6266
    63 CommandLineDialog::IntTextQuery::IntTextQuery(string title,int *_target) :
    64     Dialog::IntQuery(title,_target)
     67CommandLineDialog::EmptyCommandLineQuery::EmptyCommandLineQuery(string title, string _description) :
     68    Dialog::EmptyQuery(title, _description)
    6569{}
    6670
    67 CommandLineDialog::IntTextQuery::~IntTextQuery() {}
     71CommandLineDialog::EmptyCommandLineQuery::~EmptyCommandLineQuery() {}
    6872
    69 bool CommandLineDialog::IntTextQuery::handle() {
     73bool CommandLineDialog::EmptyCommandLineQuery::handle() {
     74  cout << "Message of " << getTitle() << ":\n" << getDescription() << "\n";
     75  return true;
     76}
     77
     78CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title,int *_target, string _description) :
     79    Dialog::IntQuery(title,_target, _description)
     80{}
     81
     82CommandLineDialog::IntCommandLineQuery::~IntCommandLineQuery() {}
     83
     84bool CommandLineDialog::IntCommandLineQuery::handle() {
    7085  if (CommandLineParser::getInstance().vm.count(getTitle())) {
    7186    tmp = CommandLineParser::getInstance().vm[getTitle()].as<int>();
    … …  
    7590}
    7691
    77 CommandLineDialog::StringTextQuery::StringTextQuery(string title,string *_target) :
    78     Dialog::StringQuery(title,_target)
     92CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title,string *_target, string _description) :
     93    Dialog::StringQuery(title,_target, _description)
    7994{}
    8095
    81 CommandLineDialog::StringTextQuery::~StringTextQuery() {}
     96CommandLineDialog::StringCommandLineQuery::~StringCommandLineQuery() {}
    8297
    83 bool CommandLineDialog::StringTextQuery::handle() {
     98bool CommandLineDialog::StringCommandLineQuery::handle() {
    8499  if (CommandLineParser::getInstance().vm.count(getTitle())) {
    85     tmp = CommandLineParser::getInstance().vm[getTitle()].as<std::string>();
     100    tmp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
    86101    return true;
    87102  } else
    … …  
    89104}
    90105
    91 CommandLineDialog::DoubleTextQuery::DoubleTextQuery(string title,double *_target) :
    92     Dialog::DoubleQuery(title,_target)
     106CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title,double *_target, string _description) :
     107    Dialog::DoubleQuery(title,_target, _description)
    93108{}
    94109
    95 CommandLineDialog::DoubleTextQuery::~DoubleTextQuery() {}
     110CommandLineDialog::DoubleCommandLineQuery::~DoubleCommandLineQuery() {}
    96111
    97 bool CommandLineDialog::DoubleTextQuery::handle() {
     112bool CommandLineDialog::DoubleCommandLineQuery::handle() {
    98113  if (CommandLineParser::getInstance().vm.count(getTitle())) {
    99114    tmp = CommandLineParser::getInstance().vm[getTitle()].as<double>();
    … …  
    103118}
    104119
    105 CommandLineDialog::MoleculeTextQuery::MoleculeTextQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
    106     Dialog::MoleculeQuery(title,_target,_molecules)
     120CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, MoleculeListClass *_molecules, string _description) :
     121    Dialog::MoleculeQuery(title,_target,_molecules, _description)
    107122{}
    108123
    109 CommandLineDialog::MoleculeTextQuery::~MoleculeTextQuery() {}
     124CommandLineDialog::MoleculeCommandLineQuery::~MoleculeCommandLineQuery() {}
    110125
    111 bool CommandLineDialog::MoleculeTextQuery::handle() {
     126bool CommandLineDialog::MoleculeCommandLineQuery::handle() {
    112127  int IdxOfMol = -1;
    113128  if (CommandLineParser::getInstance().vm.count(getTitle())) {
    … …  
    119134}
    120135
    121 CommandLineDialog::VectorTextQuery::VectorTextQuery(std::string title, Vector *_target, const double *const _cellSize, bool _check) :
    122     Dialog::VectorQuery(title,_target,_cellSize,_check)
     136CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, const double *const _cellSize, bool _check, string _description) :
     137    Dialog::VectorQuery(title,_target,_cellSize,_check, _description)
    123138{}
    124139
    125 CommandLineDialog::VectorTextQuery::~VectorTextQuery()
     140CommandLineDialog::VectorCommandLineQuery::~VectorCommandLineQuery()
    126141{}
    127142
    128 bool CommandLineDialog::VectorTextQuery::handle() {
     143bool CommandLineDialog::VectorCommandLineQuery::handle() {
    129144  vector<double> temp;
    130145  if (CommandLineParser::getInstance().vm.count(getTitle())) {
    … …  
    140155
    141156
    142 CommandLineDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target) :
    143     Dialog::ElementQuery(title,target)
     157CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, const element **target, string _description) :
     158    Dialog::ElementQuery(title,target, _description)
    144159{}
    145160
    146 CommandLineDialog::ElementTextQuery::~ElementTextQuery()
     161CommandLineDialog::ElementCommandLineQuery::~ElementCommandLineQuery()
    147162{}
    148163
    149 bool CommandLineDialog::ElementTextQuery::handle() {
     164bool CommandLineDialog::ElementCommandLineQuery::handle() {
    150165  int Z = -1;
    151166  if (CommandLineParser::getInstance().vm.count(getTitle())) {

  • molecuilder/src/UIElements/CommandLineDialog.hpp

    rc93262 rb918031  
    2222  virtual ~CommandLineDialog();
    2323
    24   virtual void queryInt(const char *, int *);
    25   virtual void queryString(const char*, std::string *);
    26   virtual void queryDouble(const char*, double*);
    27   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
    28   virtual void queryVector(const char*,Vector *,const double * const,bool);
    29   virtual void queryElement(const char*,const element **);
     24  virtual void queryEmpty(const char *, std::string = "");
     25  virtual void queryInt(const char *, int *, std::string = "");
     26  virtual void queryString(const char*, std::string *, std::string = "");
     27  virtual void queryDouble(const char*, double*, std::string = "");
     28  virtual void queryMolecule(const char*,molecule**,MoleculeListClass*, std::string = "");
     29  virtual void queryVector(const char*,Vector *,const double * const,bool, std::string = "");
     30  virtual void queryElement(const char*,const element **, std::string = "");
    3031
    3132protected:
    3233  // specialized stuff for text queries
    33   class IntTextQuery : public Dialog::IntQuery {
     34  class EmptyCommandLineQuery : public Dialog::EmptyQuery {
    3435  public:
    35     IntTextQuery(std::string title, int *_target);
    36     virtual ~IntTextQuery();
     36    EmptyCommandLineQuery(std::string title, std::string _description = "");
     37    virtual ~EmptyCommandLineQuery();
    3738    virtual bool handle();
    3839  };
    3940
    40   class DoubleTextQuery : public Dialog::DoubleQuery {
     41  class IntCommandLineQuery : public Dialog::IntQuery {
    4142  public:
    42     DoubleTextQuery(std::string title, double *_target);
    43     virtual ~DoubleTextQuery();
     43    IntCommandLineQuery(std::string title, int *_target, std::string _description = "");
     44    virtual ~IntCommandLineQuery();
    4445    virtual bool handle();
    4546  };
    4647
    47   class StringTextQuery : public Dialog::StringQuery {
     48  class DoubleCommandLineQuery : public Dialog::DoubleQuery {
    4849  public:
    49     StringTextQuery(std::string title, std::string *_target);
    50     virtual ~StringTextQuery();
     50    DoubleCommandLineQuery(std::string title, double *_target, std::string _description = "");
     51    virtual ~DoubleCommandLineQuery();
    5152    virtual bool handle();
    5253  };
    5354
    54   class MoleculeTextQuery : public Dialog::MoleculeQuery {
     55  class StringCommandLineQuery : public Dialog::StringQuery {
    5556  public:
    56     MoleculeTextQuery(std::string title, molecule **_target, MoleculeListClass *_molecules);
    57     virtual ~MoleculeTextQuery();
     57    StringCommandLineQuery(std::string title, std::string *_target, std::string _description = "");
     58    virtual ~StringCommandLineQuery();
    5859    virtual bool handle();
    5960  };
    6061
    61   class VectorTextQuery : public Dialog::VectorQuery {
     62  class MoleculeCommandLineQuery : public Dialog::MoleculeQuery {
    6263  public:
    63     VectorTextQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
    64     virtual ~VectorTextQuery();
     64    MoleculeCommandLineQuery(std::string title, molecule **_target, MoleculeListClass *_molecules, std::string _description = "");
     65    virtual ~MoleculeCommandLineQuery();
    6566    virtual bool handle();
    6667  };
    6768
    68   class ElementTextQuery : public Dialog::ElementQuery {
     69  class VectorCommandLineQuery : public Dialog::VectorQuery {
    6970  public:
    70     ElementTextQuery(std::string title, const element **_target);
    71     virtual ~ElementTextQuery();
     71    VectorCommandLineQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description = "");
     72    virtual ~VectorCommandLineQuery();
     73    virtual bool handle();
     74  };
     75
     76  class ElementCommandLineQuery : public Dialog::ElementQuery {
     77  public:
     78    ElementCommandLineQuery(std::string title, const element **_target, std::string _description = "");
     79    virtual ~ElementCommandLineQuery();
    7280    virtual bool handle();
    7381  };

  • molecuilder/src/UIElements/CommandLineUIFactory.cpp

    rc93262 rb918031  
    2525
    2626Dialog* CommandLineUIFactory::makeDialog() {
    27   return NULL;
     27  return new CommandLineDialog();
    2828}
    2929

  • molecuilder/src/UIElements/Dialog.cpp

    rc93262 rb918031  
    6565  return description;
    6666}
     67// empty Queries
     68
     69Dialog::EmptyQuery::EmptyQuery(string title, std::string description) :
     70    Query(title, description)
     71{}
     72
     73Dialog::EmptyQuery::~EmptyQuery() {}
     74
     75void Dialog::EmptyQuery::setResult() {
     76}
     77
    6778// Int Queries
    6879

  • molecuilder/src/UIElements/Dialog.hpp

    rc93262 rb918031  
    2323  virtual ~Dialog();
    2424
     25  virtual void queryEmpty(const char *, std::string = "")=0;
    2526  virtual void queryInt(const char *, int *, std::string = "")=0;
    2627  virtual void queryDouble(const char*,double *, std::string = "")=0;
    … …  
    5657    std::string title;  //!< short title of the query
    5758    std::string description; //!< longer description for tooltips or for help
     59  };
     60
     61  // Empty Query is just meant for showing text, such as version, help, initial message or alike
     62  class EmptyQuery : public Query {
     63  public:
     64    EmptyQuery(std::string title, std::string _description = "");
     65    virtual ~EmptyQuery();
     66    virtual bool handle()=0;
     67    virtual void setResult();
    5868  };
    5969

  • molecuilder/src/UIElements/TextDialog.cpp

    rc93262 rb918031  
    2929
    3030
     31void TextDialog::queryEmpty(const char* title, string description){
     32  registerQuery(new EmptyTextQuery(title,description));
     33}
     34
    3135void TextDialog::queryInt(const char* title, int* target, string description){
    3236  registerQuery(new IntTextQuery(title,target,description));
    … …  
    5559/************************** Query Infrastructure ************************/
    5660
    57 TextDialog::IntTextQuery::IntTextQuery(string title,int *_target, std::string _description) :
     61TextDialog::EmptyTextQuery::EmptyTextQuery(string title, std::string _description) :
     62    Dialog::EmptyQuery(title,_description)
     63{}
     64
     65TextDialog::EmptyTextQuery::~EmptyTextQuery() {}
     66
     67bool TextDialog::EmptyTextQuery::handle() {
     68  cout << "Message of " << getTitle() << ":\n" << getDescription() << "\n";
     69  return true;
     70}
     71
     72TextDialog::IntTextQuery::IntTextQuery(string title, int * _target, std::string _description) :
    5873    Dialog::IntQuery(title,_target,_description)
    5974{}

  • molecuilder/src/UIElements/TextDialog.hpp

    rc93262 rb918031  
    1919  virtual ~TextDialog();
    2020
     21  virtual void queryEmpty(const char *, std::string = "");
    2122  virtual void queryInt(const char *, int *, std::string = "");
    2223  virtual void queryString(const char*, std::string *, std::string = "");
    … …  
    2829protected:
    2930  // specialized stuff for text queries
     31  class EmptyTextQuery : public Dialog::EmptyQuery {
     32  public:
     33    EmptyTextQuery(std::string title, std::string _description = NULL);
     34    virtual ~EmptyTextQuery();
     35    virtual bool handle();
     36  };
     37
    3038  class IntTextQuery : public Dialog::IntQuery {
    3139  public:
Note: See TracChangeset for help on using the changeset viewer.