Changeset 12948c for src/UIElements/CommandLineUI

Timestamp:

Oct 6, 2011, 4:06:10 PM (14 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/UIElements/CommandLineUI

Files:

• CommandLineDialog.cpp (modified) (1 diff)
• CommandLineDialog.hpp (modified) (2 diffs)
• CommandLineParser.cpp (modified) (1 diff)
• Query/CommandLineQuery.hpp (modified) (1 diff)
• Query/UnsignedIntsCommandLineQuery.cpp (added)
• TypeEnumContainer.cpp (modified) (1 diff)
• TypeEnumContainer.hpp (modified) (1 diff)

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,