Changeset 12948c

Timestamp:

Oct 6, 2011, 4:06:10 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:

5a8840

Parents:

838cd0

git-author:

Frederik Heber <heber@…> (09/02/11 09:54:17)

git-committer:

Frederik Heber <heber@…> (10/06/11 16:06:10)

Message:

Added new Query for std::vector of unsigned int.

• this is preparatory to make selection rectangle possible.

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/CommandLineParser.cpp (modified) (1 diff)
• UIElements/CommandLineUI/Query/CommandLineQuery.hpp (modified) (1 diff)
• UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp (added)
• UIElements/CommandLineUI/TypeEnumContainer.cpp (modified) (1 diff)
• UIElements/CommandLineUI/TypeEnumContainer.hpp (modified) (1 diff)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/Dialog.hpp (modified) (3 diffs)
• UIElements/Makefile.am (modified) (4 diffs)
• UIElements/Qt4/QtDialog.cpp (modified) (1 diff)
• UIElements/Qt4/QtDialog.hpp (modified) (2 diffs)
• UIElements/Qt4/Query/QtQuery.hpp (modified) (2 diffs)
• UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp (added)
• UIElements/Query/UnsignedIntsQuery.cpp (added)
• UIElements/TextUI/Query/TextQuery.hpp (modified) (1 diff)
• UIElements/TextUI/Query/UnsignedIntsTextQuery.cpp (added)
• UIElements/TextUI/TextDialog.cpp (modified) (1 diff)
• UIElements/TextUI/TextDialog.hpp (modified) (2 diffs)

src/Actions/unittests/stubs/DummyUI.hpp

@@ -28 +28 @@
   virtual void queryInts(const char *, std::string = ""){}
   virtual void queryUnsignedInt(const char *, std::string = ""){}
+  virtual void queryUnsignedInts(const char *, std::string = ""){}
   virtual void queryString(const char*, std::string = ""){}
   virtual void queryStrings(const char*, std::string = ""){}

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -50 +50 @@
 void CommandLineDialog::queryUnsignedInt(const char* title, string _description){
   registerQuery(new UnsignedIntCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryUnsignedInts(const char* title, string _description){
+  registerQuery(new UnsignedIntsCommandLineQuery(title, _description));
 }
 

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -37 +37 @@
   virtual void queryInts(const char *, std::string = "");
   virtual void queryUnsignedInt(const char *, std::string = "");
+  virtual void queryUnsignedInts(const char *, std::string = "");
   virtual void queryBoolean(const char *, std::string = "");
   virtual void queryString(const char*, std::string = "");
@@ -74 +75 @@
   class StringsCommandLineQuery;
   class UnsignedIntCommandLineQuery;
+  class UnsignedIntsCommandLineQuery;
   class VectorCommandLineQuery;
   class VectorsCommandLineQuery;

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -240 +240 @@
                   po::value < unsigned int >()->default_value(boost::lexical_cast<unsigned int>(currentOption->getDefaultValue().c_str())) :
                   po::value < unsigned int >(),
+                  currentOption->getDescription().c_str())
+        ;
+      break;
+    case TypeEnumContainer::ListOfUnsignedIntegersType:
+      OptionList->add_options()
+        (currentOption->getKeyAndShortForm().c_str(),
+//            currentOption->hasDefaultValue() ?
+//                  po::value < std::vector<unsigned int> >()->default_value(boost::lexical_cast< std::vector<unsigned int> >(currentOption->getDefaultValue().c_str())) :
+                  po::value < std::vector<unsigned int> >()->multitoken(),
                   currentOption->getDescription().c_str())
         ;

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -42 +42 @@
   UnsignedIntCommandLineQuery(std::string title, std::string _description = "");
   virtual ~UnsignedIntCommandLineQuery();
+  virtual bool handle();
+};
+
+class CommandLineDialog::UnsignedIntsCommandLineQuery : public Dialog::UnsignedIntsQuery {
+public:
+  UnsignedIntsCommandLineQuery(std::string title, std::string _description = "");
+  virtual ~UnsignedIntsCommandLineQuery();
   virtual bool handle();
 };

src/UIElements/CommandLineUI/TypeEnumContainer.cpp

@@ -53 +53 @@
   TypeEnumMap[&typeid(std::vector<int>)] = ListOfIntegersType;
   TypeEnumMap[&typeid(unsigned int)] = UnsignedIntegerType;
+  TypeEnumMap[&typeid(std::vector<unsigned int>)] = ListOfUnsignedIntegersType;
   TypeEnumMap[&typeid(double)] = DoubleType;
   TypeEnumMap[&typeid(std::vector<double>)] = ListOfDoublesType;

src/UIElements/CommandLineUI/TypeEnumContainer.hpp

@@ -34 +34 @@
         ListOfIntegersType,
         UnsignedIntegerType,
+        ListOfUnsignedIntegersType,
         DoubleType,
         ListOfDoublesType,

src/UIElements/Dialog.cpp

@@ -111 +111 @@
 }
 
+template <> void Dialog::query< std::vector<unsigned int> >(const char *token, std::string description)
+{
+  queryUnsignedInts(token, description);
+}
+
 template <> void Dialog::query<double>(const char *token, std::string description)
 {

src/UIElements/Dialog.hpp

@@ -138 +138 @@
  *   -# add CommandLineDialog::query...(), TextDialog::query...(), and QtDialog::query...(),
  *      i.e. for each of the three interface
+ *   -# add empty definition DummyDialog::query...() to the stub for Action unittests in DummUI.hpp.
  *   -# add Dialog::...Query class with tmp value of desired type
  *   -# add CommandLineDialog::...Query, TextDialog::...Query, QtDialog::...Query
@@ -161 +162 @@
   virtual void queryInts(const char *, std::string = "")=0;
   virtual void queryUnsignedInt(const char *, std::string = "")=0;
+  virtual void queryUnsignedInts(const char *, std::string = "")=0;
   virtual void queryDouble(const char*, std::string = "")=0;
   virtual void queryDoubles(const char*, std::string = "")=0;
@@ -287 +289 @@
   };
 
+  class UnsignedIntsQuery : public Query {
+  public:
+    UnsignedIntsQuery(std::string title, std::string _description = "");
+    virtual ~UnsignedIntsQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    unsigned int temp;
+    std::vector<unsigned int> tmp;
+  };
+
   class DoubleQuery : public Query {
   public:

src/UIElements/Makefile.am

@@ -19 +19 @@
   UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/UnsignedIntCommandLineQuery.cpp \
+  UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp \
   UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp \
@@ -87 +88 @@
   UIElements/TextUI/Query/StringsTextQuery.cpp \
   UIElements/TextUI/Query/UnsignedIntTextQuery.cpp \
+  UIElements/TextUI/Query/UnsignedIntsTextQuery.cpp \
   UIElements/TextUI/Query/VectorTextQuery.cpp \
   UIElements/TextUI/Query/VectorsTextQuery.cpp \
@@ -137 +139 @@
   UIElements/Query/StringsQuery.cpp \
   UIElements/Query/UnsignedIntQuery.cpp \
+  UIElements/Query/UnsignedIntsQuery.cpp \
   UIElements/Query/VectorQuery.cpp \
   UIElements/Query/VectorsQuery.cpp \
@@ -186 +189 @@
   UIElements/Qt4/Query/StringsQtQuery.cpp \
   UIElements/Qt4/Query/UnsignedIntQtQuery.cpp \
+  UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp \
   UIElements/Qt4/Query/VectorQtQuery.cpp \
   UIElements/Qt4/Query/VectorsQtQuery.cpp \

src/UIElements/Qt4/QtDialog.cpp

@@ -115 +115 @@
 }
 
+void QtDialog::queryUnsignedInts(const char *title,string)
+{
+  registerQuery(new UnsignedIntsQtQuery(title,inputLayout,this));
+}
+
 void QtDialog::queryDouble(const char* title,string)
 {

src/UIElements/Qt4/QtDialog.hpp

@@ -37 +37 @@
   virtual void queryInts(const char *,std::string = "");
   virtual void queryUnsignedInt(const char *,std::string = "");
+  virtual void queryUnsignedInts(const char *,std::string = "");
   virtual void queryDouble(const char*,std::string = "");
   virtual void queryDoubles(const char*,std::string = "");
@@ -75 +76 @@
   class StringsQtQuery;
   class UnsignedIntQtQuery;
+  class UnsignedIntsQtQuery;
   class VectorQtQuery;
   class VectorsQtQuery;

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -48 +48 @@
 class StringsQtQueryPipe;
 class UnsignedIntQtQueryPipe;
+class UnsignedIntsQtQueryPipe;
 class VectorQtQueryPipe;
 class VectorsQtQueryPipe;
@@ -294 +295 @@
 };
 
+class QtDialog::UnsignedIntsQtQuery : public Dialog::UnsignedIntsQuery {
+public:
+  UnsignedIntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~UnsignedIntsQtQuery();
+  virtual bool handle();
+  void IntegerEntered(const QString&);
+  void IntegerSelected();
+  void AddInteger();
+  void RemoveInteger();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+
+  QtQueryListPipe<unsigned int> *pipe;
+};
+
+
 class QtDialog::VectorQtQuery : public Dialog::VectorQuery {
 public:

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -136 +136 @@
 };
 
+class TextDialog::UnsignedIntsTextQuery : public Dialog::UnsignedIntsQuery {
+public:
+  UnsignedIntsTextQuery(std::string title, std::string _description = NULL);
+  virtual ~UnsignedIntsTextQuery();
+  virtual bool handle();
+};
+
 class TextDialog::VectorTextQuery : public Dialog::VectorQuery {
 public:

src/UIElements/TextUI/TextDialog.cpp

@@ -52 +52 @@
 void TextDialog::queryUnsignedInt(const char* title, std::string description){
   registerQuery(new UnsignedIntTextQuery(title,description));
+}
+
+void TextDialog::queryUnsignedInts(const char* title, std::string description){
+  registerQuery(new UnsignedIntsTextQuery(title,description));
 }
 

src/UIElements/TextUI/TextDialog.hpp

@@ -35 +35 @@
   virtual void queryInts(const char *, std::string = "");
   virtual void queryUnsignedInt(const char *, std::string = "");
+  virtual void queryUnsignedInts(const char *, std::string = "");
   virtual void queryString(const char*, std::string = "");
   virtual void queryStrings(const char*, std::string = "");
@@ -72 +73 @@
   class StringsTextQuery;
   class UnsignedIntTextQuery;
+  class UnsignedIntsTextQuery;
   class VectorTextQuery;
   class VectorsTextQuery;