Changeset 3a4be0 for src/UIElements


Ignore:
Timestamp:
May 17, 2015, 12:06:12 PM (10 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:
3054689
Parents:
2cf12a
git-author:
Frederik Heber <heber@…> (05/17/15 07:02:25)
git-committer:
Frederik Heber <heber@…> (05/17/15 12:06:12)
Message:

FIX: Removed specific queries for RandomNumberDistribution_Parameters.

Location:
src/UIElements
Files:
3 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/CommandLineUI/CommandLineDialog.cpp

    r2cf12a r3a4be0  
    136136}
    137137
    138 void CommandLineDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const std::string title, const std::string description){
    139   registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(param, title, description));
    140 }
    141 
    142138/************************** Query Infrastructure ************************/
    143139/*       ---> shifted to folder Query                                   */

  • src/UIElements/CommandLineUI/CommandLineDialog.hpp

    r2cf12a r3a4be0  
    5454  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
    5555  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string ="", const std::string = "");
    56   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "");
    5756  // specialized stuff for command line queries
    5857  // all placed into Query/CommandLineQuery.hpp
    … …  
    7978  class VectorCommandLineQuery;
    8079  class VectorsCommandLineQuery;
    81   class RandomNumberDistribution_ParametersCommandLineQuery;
    8280};
    8381

  • src/UIElements/CommandLineUI/CommandLineParser.cpp

    r2cf12a r3a4be0  
    399399//                  po::value < std::vector<const element *> >()->default_value(boost::lexical_cast< std::vector<const element *> >(currentOption->getDefaultValue().c_str())) :
    400400                  po::value < std::vector<int> >()->multitoken(),
    401                   currentOption->getDescription().c_str())
    402         ;
    403       break;
    404     case TypeEnumContainer::RandomNumberDistribution_ParametersType:
    405       OptionList->add_options()
    406         (currentOption->getKeyAndShortForm().c_str(),
    407             currentOption->hasDefaultValue() ?
    408                   (_DefaultAsImplicit ?
    409                       po::value < std::string >()->implicit_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
    410                       po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str()))) :
    411                   po::value < std::string >(),
    412401                  currentOption->getDescription().c_str())
    413402        ;

  • src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

    r2cf12a r3a4be0  
    164164};
    165165
    166 class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::TQuery<RandomNumberDistribution_Parameters> {
    167 public:
    168   RandomNumberDistribution_ParametersCommandLineQuery(Parameter<RandomNumberDistribution_Parameters> &_param, const std::string &_title, const std::string &_description = "");
    169   virtual ~RandomNumberDistribution_ParametersCommandLineQuery();
    170   virtual bool handle();
    171 };
    172 
    173166#endif /* COMMANDLINEQUERY_HPP_ */

  • src/UIElements/CommandLineUI/TypeEnumContainer.cpp

    r2cf12a r3a4be0  
    8181  TypeEnumMap[&typeid(const element *)] = ElementType;
    8282  TypeEnumMap[&typeid(std::vector<const element *>)] = ListOfElementsType;
    83   TypeEnumMap[&typeid(RandomNumberDistribution_Parameters)] = RandomNumberDistribution_ParametersType;
    8483
    8584  // for debugging: list all stored types

  • src/UIElements/CommandLineUI/TypeEnumContainer.hpp

    r2cf12a r3a4be0  
    4646        ElementType,
    4747        ListOfElementsType,
    48         RandomNumberDistribution_ParametersType,
    4948        RealSpaceMatrixType
    5049  };

  • src/UIElements/Dialog.cpp

    r2cf12a r3a4be0  
    235235}
    236236
    237 template <> void Dialog::query< RandomNumberDistribution_Parameters >(Parameter<RandomNumberDistribution_Parameters> &param, const std::string title, const std::string description)
    238 {
    239   queryRandomNumberDistribution_Parameters(param, title, description);
    240 }
    241 
    242237/************************** Query Infrastructure ************************/
    243238/*       ---> shifted to folder Query                                   */

  • src/UIElements/Dialog.hpp

    r2cf12a r3a4be0  
    2222#include "LinearAlgebra/RealSpaceMatrix.hpp"
    2323#include "LinearAlgebra/Vector.hpp"
    24 #include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
    2524#include "Parameters/Parameter.hpp"
    2625
    … …  
    179178  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "")=0;
    180179  virtual void queryFiles(Parameter< std::vector<boost::filesystem::path> > &, const std::string ="", const std::string = "")=0;
    181   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "")=0;
    182180
    183181  virtual bool display();

  • src/UIElements/Makefile.am

    r2cf12a r3a4be0  
    2525  UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp \
    2626  UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp \
    27   UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp \
    2827  UIElements/CommandLineUI/CommandLineDialog.cpp \
    2928  UIElements/CommandLineUI/CommandLineParser.cpp \
    … …  
    9796  UIElements/TextUI/Query/VectorTextQuery.cpp \
    9897  UIElements/TextUI/Query/VectorsTextQuery.cpp \
    99   UIElements/TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp \
    10098  UIElements/TextUI/TextDialog.cpp \
    10199  UIElements/TextUI/TextStatusIndicator.cpp \
    … …  
    163161  UIElements/Qt4/Query/VectorQtQuery.cpp \
    164162  UIElements/Qt4/Query/VectorsQtQuery.cpp \
    165   UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp \
    166163  UIElements/Qt4/QtMainWindow.cpp \
    167164  UIElements/Qt4/QtDialog.cpp \

  • src/UIElements/Qt4/QtDialog.cpp

    r2cf12a r3a4be0  
    197197}
    198198
    199 void QtDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const std::string title, const std::string description)
    200 {
    201   registerQuery(new RandomNumberDistribution_ParametersQtQuery(param,title,description,inputLayout,this));
    202 }
    203 
    204199/************************** Query Infrastructure ************************/
    205200/*       ---> shifted to folder Query                                   */

  • src/UIElements/Qt4/QtDialog.hpp

    r2cf12a r3a4be0  
    5555  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
    5656  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string ="", const std::string = "");
    57   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "");
    5857
    5958  virtual bool display();
    … …  
    8382  class VectorQtQuery;
    8483  class VectorsQtQuery;
    85   class RandomNumberDistribution_ParametersQtQuery;
    8684
    8785private:

  • src/UIElements/Qt4/Query/QtQuery.hpp

    r2cf12a r3a4be0  
    411411};
    412412
    413 class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public QtQuery<RandomNumberDistribution_Parameters> {
    414   Q_OBJECT
    415 public:
    416   RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, const std::string &_title, const std::string &_description,QBoxLayout *,Dialog *);
    417   virtual ~RandomNumberDistribution_ParametersQtQuery();
    418 
    419 public slots:
    420   void onUpdate();
    421 
    422 private:
    423   QBoxLayout *parent;
    424   QHBoxLayout *thisLayout;
    425   QLabel *titleLabel;
    426   QTextEdit *inputBox;
    427   QPushButton *okButton;
    428   Dialog *dialog;
    429 };
    430 
    431413#endif /* QTQUERY_HPP_ */

  • src/UIElements/Qt4/Query/QtQueryList.hpp

    r2cf12a r3a4be0  
    142142  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string = "", const std::string = ""){}
    143143  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string = "", const std::string = ""){}
    144   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string = "", const std::string = ""){}
    145144private:
    146145  QtQueryListUntyped *parent;

  • src/UIElements/TextUI/Query/TextQuery.hpp

    r2cf12a r3a4be0  
    164164};
    165165
    166 class TextDialog::RandomNumberDistribution_ParametersTextQuery : public Dialog::TQuery<RandomNumberDistribution_Parameters> {
    167 public:
    168   RandomNumberDistribution_ParametersTextQuery(Parameter<RandomNumberDistribution_Parameters> &, const std::string &_title, const std::string &_description = NULL);
    169   virtual ~RandomNumberDistribution_ParametersTextQuery();
    170   virtual bool handle();
    171 };
    172 
    173166#endif /* TEXTQUERY_HPP_ */

  • src/UIElements/TextUI/TextDialog.cpp

    r2cf12a r3a4be0  
    134134}
    135135
    136 void TextDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &_param, const std::string title, const std::string description){
    137   registerQuery(new RandomNumberDistribution_ParametersTextQuery(_param, title,description));
    138 }
    139 
    140 
    141136/************************** Query Infrastructure ************************/
    142137/*       ---> shifted to folder Query                                   */

  • src/UIElements/TextUI/TextDialog.hpp

    r2cf12a r3a4be0  
    5252  virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
    5353  virtual void queryFiles(Parameter<std::vector<boost::filesystem::path> > &, const std::string ="", const std::string = "");
    54   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "");
    5554
    5655protected:
    … …  
    7978  class VectorTextQuery;
    8079  class VectorsTextQuery;
    81   class RandomNumberDistribution_ParametersTextQuery;
    8280};
    8381
Note: See TracChangeset for help on using the changeset viewer.