Changes in src/UIElements/Qt4/Query/FileQtQuery.cpp [f8bccc:f130d4]

File:

• src/UIElements/Qt4/Query/FileQtQuery.cpp (modified) (5 diffs)

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"
@@ -59 +51 @@
     QtQuery<boost::filesystem::path>(_param, _title, _description),
     parent(_parent),
-    dialog(_dialog),
-    mustBePresent(false)
+    dialog(_dialog)
 {
   filenameLineEdit = new QLineEdit();
@@ -66 +57 @@
   filenameLineEdit->setReadOnly(true);
 
-  filenameLabel = new QLabel(QString(_title.c_str()));
+  filenameLabel = new QLabel(QString("Input file:"));
   filenameLabel->setBuddy(filenameLineEdit);
   filenameLabel->setToolTip(QString(getDescription().c_str()));
@@ -80 +71 @@
 
   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());
 }
 
@@ -123 +93 @@
     // gather all possible suffixes
     QStringList filters;
-    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());
+    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);
     }
+    parsersuffixes << std::string(")");
+    filters << tr(parsersuffixes.str().c_str());
+    filters << tr("Data files (*.dat)");
     filters << tr("Any files (*)");
     theFileDialog->setNameFilters(filters);