Ignore:
Timestamp:
Jul 22, 2010, 7:37:46 PM (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:
ca1ba5
Parents:
d02e07
git-author:
Frederik Heber <heber@…> (07/22/10 19:36:18)
git-committer:
Frederik Heber <heber@…> (07/22/10 19:37:46)
Message:

Dialog->query...() don't need a _target anymore,

  • new class ValueStorage servers as a mediator to MapOfActions to relax inter-dependencies.
  • setResult() now puts the value as string into ValueStorage.
  • all class Dialog and derivatives don't have a _target in their functions and bodies anymore.
Location:
src/UIElements/CommandLineUI
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/CommandLineUI/CommandLineDialog.cpp

    rd02e07 r75dc28  
    5050}
    5151
    52 void CommandLineDialog::queryInt(const char* title, int* target, string _description){
    53   registerQuery(new IntCommandLineQuery(title,target, _description));
    54 }
    55 
    56 void CommandLineDialog::queryBoolean(const char* title, bool* target, string _description){
    57   registerQuery(new BooleanCommandLineQuery(title,target, _description));
    58 }
    59 
    60 void CommandLineDialog::queryDouble(const char* title, double* target, string _description){
    61   registerQuery(new DoubleCommandLineQuery(title,target, _description));
    62 }
    63 
    64 void CommandLineDialog::queryString(const char* title, string* target, string _description){
    65   registerQuery(new StringCommandLineQuery(title,target, _description));
    66 }
    67 
    68 void CommandLineDialog::queryStrings(const char* title, vector<string> * target, string _description){
    69   registerQuery(new StringsCommandLineQuery(title,target, _description));
    70 }
    71 
    72 void CommandLineDialog::queryAtom(const char* title, atom **target, string _description) {
    73   registerQuery(new AtomCommandLineQuery(title,target, _description));
    74 }
    75 
    76 void CommandLineDialog::queryMolecule(const char* title, molecule **target, string _description) {
    77   registerQuery(new MoleculeCommandLineQuery(title,target, _description));
    78 }
    79 
    80 void CommandLineDialog::queryVector(const char* title, Vector *target, bool check, string _description) {
    81   registerQuery(new VectorCommandLineQuery(title,target,check, _description));
    82 }
    83 
    84 void CommandLineDialog::queryBox(const char* title, Box* cellSize, string _description) {
    85   registerQuery(new BoxCommandLineQuery(title,cellSize,_description));
    86 }
    87 
    88 void CommandLineDialog::queryElement(const char* title, std::vector<element *> *target, string _description){
    89   registerQuery(new ElementCommandLineQuery(title,target, _description));
     52void CommandLineDialog::queryInt(const char* title, string _description){
     53  registerQuery(new IntCommandLineQuery(title, _description));
     54}
     55
     56void CommandLineDialog::queryBoolean(const char* title, string _description){
     57  registerQuery(new BooleanCommandLineQuery(title, _description));
     58}
     59
     60void CommandLineDialog::queryDouble(const char* title, string _description){
     61  registerQuery(new DoubleCommandLineQuery(title, _description));
     62}
     63
     64void CommandLineDialog::queryString(const char* title, string _description){
     65  registerQuery(new StringCommandLineQuery(title, _description));
     66}
     67
     68void CommandLineDialog::queryStrings(const char* title, string _description){
     69  registerQuery(new StringsCommandLineQuery(title, _description));
     70}
     71
     72void CommandLineDialog::queryAtom(const char* title, string _description) {
     73  registerQuery(new AtomCommandLineQuery(title, _description));
     74}
     75
     76void CommandLineDialog::queryMolecule(const char* title, string _description) {
     77  registerQuery(new MoleculeCommandLineQuery(title, _description));
     78}
     79
     80void CommandLineDialog::queryVector(const char* title, bool check, string _description) {
     81  registerQuery(new VectorCommandLineQuery(title,check, _description));
     82}
     83
     84void CommandLineDialog::queryBox(const char* title, string _description) {
     85  registerQuery(new BoxCommandLineQuery(title,_description));
     86}
     87
     88void CommandLineDialog::queryElement(const char* title, string _description){
     89  registerQuery(new ElementCommandLineQuery(title, _description));
    9090}
    9191
    … …  
    103103}
    104104
    105 CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title,int *_target, string _description) :
    106     Dialog::IntQuery(title,_target, _description)
     105CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title, string _description) :
     106    Dialog::IntQuery(title, _description)
    107107{}
    108108
    … …  
    119119}
    120120
    121 CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title,bool *_target, string _description) :
    122     Dialog::BooleanQuery(title,_target, _description)
     121CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title, string _description) :
     122    Dialog::BooleanQuery(title, _description)
    123123{}
    124124
    … …  
    135135}
    136136
    137 CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title,string *_target, string _description) :
    138     Dialog::StringQuery(title,_target, _description)
     137CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title, string _description) :
     138    Dialog::StringQuery(title, _description)
    139139{}
    140140
    … …  
    151151}
    152152
    153 CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title,vector<string> *_target, string _description) :
    154     Dialog::StringsQuery(title,_target, _description)
     153CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title, string _description) :
     154    Dialog::StringsQuery(title, _description)
    155155{}
    156156
    … …  
    167167}
    168168
    169 CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title,double *_target, string _description) :
    170     Dialog::DoubleQuery(title,_target, _description)
     169CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title, string _description) :
     170    Dialog::DoubleQuery(title, _description)
    171171{}
    172172
    … …  
    183183}
    184184
    185 CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, atom **_target, string _description) :
    186     Dialog::AtomQuery(title,_target, _description)
     185CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, string _description) :
     186    Dialog::AtomQuery(title, _description)
    187187{}
    188188
    … …  
    201201}
    202202
    203 CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, molecule **_target, string _description) :
    204     Dialog::MoleculeQuery(title,_target, _description)
     203CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, string _description) :
     204    Dialog::MoleculeQuery(title, _description)
    205205{}
    206206
    … …  
    223223}
    224224
    225 CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, Vector *_target, bool _check, string _description) :
    226     Dialog::VectorQuery(title,_target,_check, _description)
     225CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, bool _check, string _description) :
     226    Dialog::VectorQuery(title,_check, _description)
    227227{}
    228228
    … …  
    245245
    246246
    247 CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, Box* _cellSize, string _description) :
    248     Dialog::BoxQuery(title,_cellSize, _description)
     247CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, string _description) :
     248    Dialog::BoxQuery(title, _description)
    249249{}
    250250
    … …  
    269269}
    270270
    271 CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, std::vector<element *> *target, string _description) :
     271CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, string _description) :
    272272    Dialog::ElementQuery(title,target, _description)
    273273{}

  • src/UIElements/CommandLineUI/CommandLineDialog.hpp

    rd02e07 r75dc28  
    2828
    2929  virtual void queryEmpty(const char *, std::string = "");
    30   virtual void queryInt(const char *, int *, std::string = "");
    31   virtual void queryBoolean(const char *, bool *, std::string = "");
    32   virtual void queryString(const char*, std::string *, std::string = "");
    33   virtual void queryStrings(const char*, std::vector<std::string> *, std::string = "");
    34   virtual void queryDouble(const char*, double*, std::string = "");
    35   virtual void queryAtom(const char*,atom**, std::string = "");
    36   virtual void queryMolecule(const char*,molecule**,std::string = "");
    37   virtual void queryVector(const char*,Vector *,bool, std::string = "");
    38   virtual void queryBox(const char*,Box *, std::string = "");
    39   virtual void queryElement(const char*, std::vector<element *> *, std::string = "");
     30  virtual void queryInt(const char *, std::string = "");
     31  virtual void queryBoolean(const char *, std::string = "");
     32  virtual void queryString(const char*, std::string = "");
     33  virtual void queryStrings(const char*, std::string = "");
     34  virtual void queryDouble(const char*, std::string = "");
     35  virtual void queryAtom(const char*, std::string = "");
     36  virtual void queryMolecule(const char*, std::string = "");
     37  virtual void queryVector(const char*, bool, std::string = "");
     38  virtual void queryBox(const char*, std::string = "");
     39  virtual void queryElement(const char*, std::string = "");
    4040
    4141protected:
    … …  
    5050  class IntCommandLineQuery : public Dialog::IntQuery {
    5151  public:
    52     IntCommandLineQuery(std::string title, int *_target, std::string _description = "");
     52    IntCommandLineQuery(std::string title, std::string _description = "");
    5353    virtual ~IntCommandLineQuery();
    5454    virtual bool handle();
    … …  
    5757  class BooleanCommandLineQuery : public Dialog::BooleanQuery {
    5858  public:
    59     BooleanCommandLineQuery(std::string title, bool *_target, std::string _description = "");
     59    BooleanCommandLineQuery(std::string title, std::string _description = "");
    6060    virtual ~BooleanCommandLineQuery();
    6161    virtual bool handle();
    … …  
    6464  class DoubleCommandLineQuery : public Dialog::DoubleQuery {
    6565  public:
    66     DoubleCommandLineQuery(std::string title, double *_target, std::string _description = "");
     66    DoubleCommandLineQuery(std::string title, std::string _description = "");
    6767    virtual ~DoubleCommandLineQuery();
    6868    virtual bool handle();
    … …  
    7171  class StringCommandLineQuery : public Dialog::StringQuery {
    7272  public:
    73     StringCommandLineQuery(std::string title, std::string *_target, std::string _description = "");
     73    StringCommandLineQuery(std::string title, std::string _description = "");
    7474    virtual ~StringCommandLineQuery();
    7575    virtual bool handle();
    … …  
    7878  class StringsCommandLineQuery : public Dialog::StringsQuery {
    7979  public:
    80     StringsCommandLineQuery(std::string title, std::vector<std::string> *_target, std::string _description = "");
     80    StringsCommandLineQuery(std::string title, std::string _description = "");
    8181    virtual ~StringsCommandLineQuery();
    8282    virtual bool handle();
    … …  
    8585  class AtomCommandLineQuery : public Dialog::AtomQuery {
    8686  public:
    87     AtomCommandLineQuery(std::string title, atom **_target, std::string _description = "");
     87    AtomCommandLineQuery(std::string title, std::string _description = "");
    8888    virtual ~AtomCommandLineQuery();
    8989    virtual bool handle();
    … …  
    9292  class MoleculeCommandLineQuery : public Dialog::MoleculeQuery {
    9393  public:
    94     MoleculeCommandLineQuery(std::string title, molecule **_target, std::string _description = "");
     94    MoleculeCommandLineQuery(std::string title, std::string _description = "");
    9595    virtual ~MoleculeCommandLineQuery();
    9696    virtual bool handle();
    … …  
    9999  class VectorCommandLineQuery : public Dialog::VectorQuery {
    100100  public:
    101     VectorCommandLineQuery(std::string title,Vector *_target,bool _check, std::string _description = "");
     101    VectorCommandLineQuery(std::string title,bool _check, std::string _description = "");
    102102    virtual ~VectorCommandLineQuery();
    103103    virtual bool handle();
    … …  
    106106  class BoxCommandLineQuery : public Dialog::BoxQuery {
    107107  public:
    108     BoxCommandLineQuery(std::string title,Box* _cellSize, std::string _description = "");
     108    BoxCommandLineQuery(std::string title, std::string _description = "");
    109109    virtual ~BoxCommandLineQuery();
    110110    virtual bool handle();
    … …  
    113113  class ElementCommandLineQuery : public Dialog::ElementQuery {
    114114  public:
    115     ElementCommandLineQuery(std::string title, std::vector<element *> *_target, std::string _description = "");
     115    ElementCommandLineQuery(std::string title, std::string _description = "");
    116116    virtual ~ElementCommandLineQuery();
    117117    virtual bool handle();
Note: See TracChangeset for help on using the changeset viewer.