Changeset dae158 for src

Timestamp:

Sep 8, 2014, 9:37:32 PM (11 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:

95cfac

Parents:

ce4126

git-author:

Frederik Heber <heber@…> (09/07/14 17:44:06)

git-committer:

Frederik Heber <heber@…> (09/08/14 21:37:32)

Message:

FileQtQuery retrieves valid suffixes from validators.

• added getFlatListFromHierarchyOfValidators() that steps through the hierarchy of validators and generates a flat vector with all matching types.
• Or_Validatorm Not_Validator::getA(), ::getB() added. (present for And_... already).
• FileSuffixValidator::getSuffix(), ParserFileValidator::getSuffixes() added.

Location:

src

Files:

• Parameters/Makefile.am (modified) (1 diff)
• Parameters/Validators/Ops_Validator_impl.hpp (modified) (3 diffs)
• Parameters/Validators/Specific/FileSuffixValidator.hpp (modified) (1 diff)
• Parameters/Validators/Specific/ParserFileValidator.cpp (modified) (1 diff)
• Parameters/Validators/Specific/ParserFileValidator.hpp (modified) (1 diff)
• Parameters/Validators/Validator.hpp (modified) (1 diff)
• Parameters/Validators/getFlatListFromHierarchyOfValidators.hpp (added)
• UIElements/Qt4/Query/FileQtQuery.cpp (modified) (4 diffs)
• UIElements/Qt4/Query/QtQuery.hpp (modified) (1 diff)

src/Parameters/Makefile.am

@@ -39 +39 @@
         Parameters/Validators/GenericValidators.hpp \
         Parameters/Validators/GenericValidators_impl.hpp \
+        Parameters/Validators/getFlatListFromHierarchyOfValidators.hpp \
         Parameters/Validators/Ops_Validator.hpp \
         Parameters/Validators/Ops_Validator_impl.hpp \

src/Parameters/Validators/Ops_Validator_impl.hpp

@@ -52 +52 @@
   Validator<T> *getA(){ return a; }
   Validator<T> *getB(){ return b; }
+  const Validator<T> *getA() const { return a; }
+  const Validator<T> *getB() const { return b; }
 
 private:
@@ -90 +92 @@
   }
 
+  Validator<T> *getA(){ return a; }
+  Validator<T> *getB(){ return b; }
+  const Validator<T> *getA() const { return a; }
+  const Validator<T> *getB() const { return b; }
+
 private:
   Validator<T> *a;
@@ -126 +133 @@
   }
 
+  Validator<T> *getA(){ return a; }
+  const Validator<T> *getA() const { return a; }
+
 private:
   Validator<T> *a;

src/Parameters/Validators/Specific/FileSuffixValidator.hpp

@@ -33 +33 @@
   Validator< boost::filesystem::path >* clone() const;
 
+  const std::string & getSuffix() const
+  { return suffix; }
+
 private:
   std::string suffix;

src/Parameters/Validators/Specific/ParserFileValidator.cpp

@@ -72 +72 @@
 }
 
+std::vector<std::string> ParserFileValidator::getSuffixes() const
+{
+  std::vector<std::string> suffixes;
+  for (ParserTypes t = ParserTypes_begin; t < ParserTypes_end; ++ t){
+    suffixes.push_back(
+        FormatParserStorage::getInstance().getSuffixFromType(t));
+  }
+  return suffixes;
+}
 
 
-

src/Parameters/Validators/Specific/ParserFileValidator.hpp

@@ -27 +27 @@
   bool operator==(const Validator<boost::filesystem::path> &_instance) const;
   Validator< boost::filesystem::path >* clone() const;
+
+public:
+  std::vector<std::string> getSuffixes() const;
 };
 

src/Parameters/Validators/Validator.hpp

@@ -35 +35 @@
 };
 
-
 #endif /* VALIDATOR_HPP_ */

src/UIElements/Qt4/Query/FileQtQuery.cpp

@@ -45 +45 @@
 #include "UIElements/Qt4/Query/QtQuery.hpp"
 
+#include <algorithm>
+#include <boost/filesystem.hpp>
+
+#include "Parameters/Validators/getFlatListFromHierarchyOfValidators.hpp"
+#include "Parameters/Validators/Validator.hpp"
+#include "Parameters/Validators/Specific/FilePresentValidator.hpp"
+#include "Parameters/Validators/Specific/FileSuffixValidator.hpp"
+#include "Parameters/Validators/Specific/ParserFileValidator.hpp"
 #include "Parser/ParserTypes.hpp"
 #include "Parser/FormatParserStorage.hpp"
@@ -51 +59 @@
     QtQuery<boost::filesystem::path>(_param, _title, _description),
     parent(_parent),
-    dialog(_dialog)
+    dialog(_dialog),
+    mustBePresent(false)
 {
   filenameLineEdit = new QLineEdit();
@@ -71 +80 @@
 
   QObject::connect(filedialogButton,SIGNAL(clicked()),this,SLOT(showFileDialog()));
+
+  // fill list of suffixes
+  const Validator<boost::filesystem::path> &validator =
+      _param.getValidator();
+  typedef std::vector<std::pair<const Validator<boost::filesystem::path> *, bool> > validators_t;
+  const validators_t validators =
+      getFlatListFromHierarchyOfValidators<boost::filesystem::path>(validator);
+  for (validators_t::const_iterator iter = validators.begin();
+      iter != validators.end(); ++iter) {
+    const Validator< boost::filesystem::path > &currentvalidator = *iter->first;
+    if (dynamic_cast<const FileSuffixValidator * const>(&currentvalidator) != NULL)
+      suffixes.push_back(dynamic_cast<const FileSuffixValidator &>(currentvalidator).getSuffix());
+    if (dynamic_cast<const ParserFileValidator * const>(&currentvalidator) != NULL) {
+      const std::vector<std::string> moresuffixes =
+          dynamic_cast<const ParserFileValidator &>(currentvalidator).getSuffixes();
+      suffixes.insert(suffixes.end(), moresuffixes.begin(), moresuffixes.end());
+    }
+    if (dynamic_cast<const FilePresentValidator * const>(&currentvalidator) != NULL)
+      mustBePresent = iter->second;
+  }
+  std::sort(suffixes.begin(), suffixes.end());
 }
 
@@ -93 +123 @@
     // gather all possible suffixes
     QStringList filters;
-    std::stringstream parsersuffixes;
-    parsersuffixes << std::string("Config files (");
-    for (ParserTypes t = ParserTypes_begin; t < ParserTypes_end; ++t){
-      if (t != ParserTypes_begin)
-        parsersuffixes << std::string(" ");
-      parsersuffixes << std::string("*.") <<
-          FormatParserStorage::getInstance().getSuffixFromType(t);
+    std::stringstream filter_string;
+    if (!suffixes.empty()) {
+      filter_string << "Valid files (";
+      for (std::vector<std::string>::const_iterator iter = suffixes.begin();
+          iter != suffixes.end(); ++iter)
+        filter_string << (iter == suffixes.begin() ? "*." : " *.") << *iter << " ";
+      filter_string << ")";
+      filters << tr(filter_string.str().c_str());
     }
-    parsersuffixes << std::string(")");
-    filters << tr(parsersuffixes.str().c_str());
-    filters << tr("Data files (*.dat)");
     filters << tr("Any files (*)");
     theFileDialog->setNameFilters(filters);

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -211 +211 @@
   QFileDialog *theFileDialog;
   Dialog *dialog;
+  std::vector<std::string> suffixes;
+  bool mustBePresent;
 };