Changeset 2c5765

Timestamp:

Jul 6, 2012, 10:18:42 AM (12 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:

c586d8

Parents:

30438f

git-author:

Frederik Heber <heber@…> (05/21/12 09:56:07)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:42)

Message:

Added Query for File_s_, i.e. vector of boost::filesystem::path.

Location:

src

Files:

• Actions/unittests/stubs/DummyUI.hpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineDialog.cpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• UIElements/CommandLineUI/Query/CommandLineQuery.hpp (modified) (1 diff)
• UIElements/CommandLineUI/Query/FilesCommandLineQuery.cpp (added)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/Dialog.hpp (modified) (2 diffs)
• UIElements/Makefile.am (modified) (4 diffs)
• UIElements/Qt4/QtDialog.cpp (modified) (1 diff)
• UIElements/Qt4/QtDialog.hpp (modified) (2 diffs)
• UIElements/Qt4/Query/FilesQtQuery.cpp (added)
• UIElements/Qt4/Query/QtQuery.hpp (modified) (1 diff)
• UIElements/Query/FilesQuery.cpp (added)
• UIElements/TextUI/Query/FilesTextQuery.cpp (added)
• UIElements/TextUI/Query/TextQuery.hpp (modified) (1 diff)
• UIElements/TextUI/TextDialog.cpp (modified) (1 diff)
• UIElements/TextUI/TextDialog.hpp (modified) (2 diffs)

src/Actions/unittests/stubs/DummyUI.hpp

@@ -43 +43 @@
   virtual void queryElements(const char*, std::string = ""){}
   virtual void queryFile(const char*, std::string = ""){}
+  virtual void queryFiles(const char*, std::string = ""){}
   virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = ""){}
 };

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -116 +116 @@
 }
 
+void CommandLineDialog::queryFiles(const char* title, std::string _description){
+  registerQuery(new FilesCommandLineQuery(title, _description));
+}
+
 void CommandLineDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string _description){
   registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(title, _description));

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -53 +53 @@
   virtual void queryElements(const char*, std::string = "");
   virtual void queryFile(const char*, std::string = "");
+  virtual void queryFiles(const char*, std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "");
 protected:
@@ -68 +69 @@
   class EmptyCommandLineQuery;
   class FileCommandLineQuery;
+  class FilesCommandLineQuery;
   class IntCommandLineQuery;
   class IntsCommandLineQuery;

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -157 +157 @@
 };
 
+class CommandLineDialog::FilesCommandLineQuery : public Dialog::FilesQuery {
+public:
+  FilesCommandLineQuery(std::string title, std::string _description = "");
+  virtual ~FilesCommandLineQuery();
+  virtual bool handle();
+};
+
 class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
 public:

src/UIElements/Dialog.cpp

@@ -196 +196 @@
 }
 
+template <> void Dialog::query< std::vector<boost::filesystem::path> >(const char *token, std::string description)
+{
+  queryFiles(token, description);
+}
+
 template <> void Dialog::query< RandomNumberDistribution_Parameters >(const char *token, std::string description)
 {

src/UIElements/Dialog.hpp

@@ -177 +177 @@
   virtual void queryElements(const char*, std::string = "")=0;
   virtual void queryFile(const char*, std::string = "")=0;
+  virtual void queryFiles(const char*, std::string = "")=0;
   virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "")=0;
 
@@ -462 +463 @@
   };
 
+  class FilesQuery : public Query {
+  public:
+    FilesQuery(std::string title, std::string _description = "");
+    virtual ~FilesQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    std::vector<boost::filesystem::path> tmp;
+  };
+
   class RandomNumberDistribution_ParametersQuery : public Query {
   public:

src/UIElements/Makefile.am

@@ -12 +12 @@
   UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp \
+  UIElements/CommandLineUI/Query/FilesCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp \
@@ -81 +82 @@
   UIElements/TextUI/Query/EmptyTextQuery.cpp \
   UIElements/TextUI/Query/FileTextQuery.cpp \
+  UIElements/TextUI/Query/FilesTextQuery.cpp \
   UIElements/TextUI/Query/IntTextQuery.cpp \
   UIElements/TextUI/Query/IntsTextQuery.cpp \
@@ -130 +132 @@
   UIElements/Query/EmptyQuery.cpp \
   UIElements/Query/FileQuery.cpp \
+  UIElements/Query/FilesQuery.cpp \
   UIElements/Query/IntQuery.cpp \
   UIElements/Query/IntsQuery.cpp \
@@ -182 +185 @@
   UIElements/Qt4/Query/EmptyQtQuery.cpp \
   UIElements/Qt4/Query/FileQtQuery.cpp \
+  UIElements/Qt4/Query/FilesQtQuery.cpp \
   UIElements/Qt4/Query/IntQtQuery.cpp \
   UIElements/Qt4/Query/IntsQtQuery.cpp \

src/UIElements/Qt4/QtDialog.cpp

@@ -175 +175 @@
 }
 
+void QtDialog::queryFiles(const char* title, std::string)
+{
+  registerQuery(new FilesQtQuery(title,inputLayout,this));
+}
+
 void QtDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string)
 {

src/UIElements/Qt4/QtDialog.hpp

@@ -52 +52 @@
   virtual void queryElements(const char*,std::string = "");
   virtual void queryFile(const char*,std::string = "");
+  virtual void queryFiles(const char*,std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(const char*,std::string = "");
 
@@ -69 +70 @@
   class EmptyQtQuery;
   class FileQtQuery;
+  class FilesQtQuery;
   class IntQtQuery;
   class IntsQtQuery;

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -195 +195 @@
 };
 
+class QtDialog::FilesQtQuery : public Dialog::FilesQuery {
+public:
+  FilesQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  virtual ~FilesQtQuery();
+  virtual bool handle();
+  void IntegerEntered(const QString&);
+  void IntegerSelected();
+  void AddInteger();
+  void RemoveInteger();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+
+  QtQueryListPipe<boost::filesystem::path> *pipe;
+};
+
 class QtDialog::IntQtQuery : public Dialog::IntQuery {
 public:

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -87 +87 @@
 };
 
+class TextDialog::FilesTextQuery : public Dialog::FilesQuery {
+public:
+  FilesTextQuery(std::string title, std::string _description = NULL);
+  virtual ~FilesTextQuery();
+  virtual bool handle();
+};
+
 class TextDialog::IntTextQuery : public Dialog::IntQuery {
 public:

src/UIElements/TextUI/TextDialog.cpp

@@ -114 +114 @@
 }
 
+void TextDialog::queryFiles(const char* title, std::string description){
+  registerQuery(new FilesTextQuery(title,description));
+}
+
 void TextDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string description){
   registerQuery(new RandomNumberDistribution_ParametersTextQuery(title,description));

src/UIElements/TextUI/TextDialog.hpp

@@ -50 +50 @@
   virtual void queryElements(const char*, std::string = "");
   virtual void queryFile(const char*, std::string = "");
+  virtual void queryFiles(const char*, std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "");
 
@@ -66 +67 @@
   class EmptyTextQuery;
   class FileTextQuery;
+  class FilesTextQuery;
   class IntTextQuery;
   class IntsTextQuery;