Changeset bd81f9 for src/UIElements

Timestamp:

Jul 11, 2012, 1:02:17 PM (13 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:

8a4b88

Parents:

0174b62 (diff), 5ffa05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (07/11/12 10:53:51)

git-committer:

Frederik Heber <heber@…> (07/11/12 13:02:17)

Message:

Merge branch 'Candidate_v1.3.0' into stable

Conflicts:

src/Actions/unittests/stubs/DummyUI.hpp
src/UIElements/CommandLineUI/CommandLineDialog.cpp
src/UIElements/CommandLineUI/CommandLineDialog.hpp
src/UIElements/Dialog.cpp
src/UIElements/Dialog.hpp
src/UIElements/Makefile.am
src/UIElements/Qt4/QtDialog.cpp
src/UIElements/Qt4/QtDialog.hpp
src/UIElements/TextUI/TextDialog.cpp
src/UIElements/TextUI/TextDialog.hpp

• File_s_Query was not yet adapted to the new Parameter and Validator structure introduced in v1.2.5.
• new Action FragmentationAutomationAction lacked paramvalids.
• adapted FilesQuery for all UIs, especially FilesTextQuery.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineDialog.cpp (modified) (1 diff)
• CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• CommandLineUI/Query/CommandLineQuery.hpp (modified) (1 diff)
• CommandLineUI/Query/FilesCommandLineQuery.cpp (added)
• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (2 diffs)
• Makefile.am (modified) (7 diffs)
• Qt4/QtDialog.cpp (modified) (1 diff)
• Qt4/QtDialog.hpp (modified) (2 diffs)
• Qt4/Query/FilesQtQuery.cpp (added)
• Qt4/Query/QtQuery.hpp (modified) (2 diffs)
• Query/FilesQuery.cpp (added)
• TextUI/Query/FileTextQuery.cpp (modified) (1 diff)
• TextUI/Query/FilesTextQuery.cpp (added)
• TextUI/Query/TextQuery.hpp (modified) (1 diff)
• TextUI/TextDialog.cpp (modified) (1 diff)
• TextUI/TextDialog.hpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -116 +116 @@
 }
 
+void CommandLineDialog::queryFiles(Parameter<std::vector< boost::filesystem::path> > &param, const char* title, std::string _description){
+  registerQuery(new FilesCommandLineQuery(param, title, _description));
+}
+
 void CommandLineDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const char* title, std::string _description){
   registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(param, title, _description));

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -53 +53 @@
   virtual void queryElements(Parameter<std::vector<const element *> > &, const char*, std::string = "");
   virtual void queryFile(Parameter<boost::filesystem::path> &, const char*, std::string = "");
+  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const char*, std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const char*, std::string = "");
-protected:
   // specialized stuff for command line queries
   // all placed into Query/CommandLineQuery.hpp
@@ -67 +67 @@
   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(Parameter<std::vector< boost::filesystem::path> > &param, std::string title, std::string _description = "");
+  virtual ~FilesCommandLineQuery();
+  virtual bool handle();
+};
+
 class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
 public:

src/UIElements/Dialog.cpp

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

src/UIElements/Dialog.hpp

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

src/UIElements/Makefile.am

@@ -11 +11 @@
   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 \
@@ -80 +81 @@
   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 \
@@ -129 +131 @@
   UIElements/Query/EmptyQuery.cpp \
   UIElements/Query/FileQuery.cpp \
+  UIElements/Query/FilesQuery.cpp \
   UIElements/Query/IntQuery.cpp \
   UIElements/Query/IntsQuery.cpp \
@@ -181 +184 @@
   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 \
@@ -256 +260 @@
 lib_LTLIBRARIES += libMolecuilderUI.la
 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
-libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
-libMolecuilderUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 
+if CONDJOBMARKET
+libMolecuilderUI_la_CPPFLAGS += ${JobMarket_CFLAGS}
+endif
+libMolecuilderUI_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        $(BOOST_FILESYSTEM_LDFLAGS) \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
+        $(BOOST_RANDOM_LDFLAGS) \
+        $(BOOST_SERIALIZATION_LDFLAGS) 
+        $(BOOST_SYSTEM_LDFLAGS) \
+        $(BOOST_THREAD_LDFLAGS)
 
 # NOTE: ActionPrototypes BEFORE Actions!
@@ -277 +291 @@
         libMolecuilderHelpers.la \
         libMolecuilderElement.la \
+        libMolecuilderJobs.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        libMolecuilderRandomNumbers.la \
+        libMolecuilderRandomNumbers.la
+if CONDJOBMARKET
+libMolecuilderUI_la_LIBADD += ${JobMarket_Controller_LIBS}
+endif
+libMolecuilderUI_la_LIBADD += \
         ${CodePatterns_LIBS} \
         $(BOOST_SERIALIZATION_LIBS) \
@@ -328 +347 @@
 
 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
-libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS}
 libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 

src/UIElements/Qt4/QtDialog.cpp

@@ -175 +175 @@
 }
 
+void QtDialog::queryFiles(Parameter<std::vector< boost::filesystem::path> >&param, const char* title, std::string)
+{
+  registerQuery(new FilesQtQuery(param, title,inputLayout,this));
+}
+
 void QtDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const char* title, std::string)
 {

src/UIElements/Qt4/QtDialog.hpp

@@ -53 +53 @@
   virtual void queryElements(Parameter<std::vector<const element *> > &, const char*,std::string = "");
   virtual void queryFile(Parameter<boost::filesystem::path> &, const char*,std::string = "");
+  virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const char*,std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const char*,std::string = "");
 
@@ -70 +71 @@
   class EmptyQtQuery;
   class FileQtQuery;
+  class FilesQtQuery;
   class IntQtQuery;
   class IntsQtQuery;

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -44 +44 @@
 class EmptyQtQueryPipe;
 class FileQtQueryPipe;
+class FilesQtQueryPipe;
 class IntQtQueryPipe;
 class MoleculeQtQueryPipe;
@@ -196 +197 @@
 };
 
+class QtDialog::FilesQtQuery : public Dialog::FilesQuery {
+public:
+  FilesQtQuery(Parameter<std::vector< boost::filesystem::path> > &param, 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/FileTextQuery.cpp

@@ -48 +48 @@
       std::cin.clear();
       std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-      std::cout << "Input was not a number!" << std::endl;
+      std::cout << "Input was not a file!" << std::endl;
       continue;
     }

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -87 +87 @@
 };
 
+class TextDialog::FilesTextQuery : public Dialog::FilesQuery {
+public:
+  FilesTextQuery(Parameter<std::vector< boost::filesystem::path> > &param, 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(Parameter<std::vector< boost::filesystem::path> > &param, const char* title, std::string description){
+  registerQuery(new FilesTextQuery(param, title,description));
+}
+
 void TextDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const char* title, std::string description){
   registerQuery(new RandomNumberDistribution_ParametersTextQuery(param, title,description));

src/UIElements/TextUI/TextDialog.hpp

@@ -51 +51 @@
   virtual void queryElements(Parameter<std::vector<const element *> > &, const char*, std::string = "");
   virtual void queryFile(Parameter<boost::filesystem::path> &, const char*, std::string = "");
+  virtual void queryFiles(Parameter<std::vector<boost::filesystem::path> > &, const char*, std::string = "");
   virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const char*, std::string = "");
 
@@ -66 +67 @@
   class EmptyTextQuery;
   class FileTextQuery;
+  class FilesTextQuery;
   class IntTextQuery;
   class IntsTextQuery;