Changeset 7f1b51 for src/UIElements/Qt4

Timestamp:

Sep 15, 2014, 3:05:28 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, Candidate_v1.7.0, Candidate_v1.7.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:

7e1a88

Parents:

b73545 (diff), 8859b5 (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.

Message:

Merge branch 'GUI_Fixes' into stable

Location:

src/UIElements/Qt4

Files:

• QtDialog.cpp (modified) (1 diff)
• QtDialog.hpp (modified) (1 diff)
• QtMainWindow.cpp (modified) (1 diff)
• QtUIFactory.cpp (modified) (1 diff)
• QtUIFactory.hpp (modified) (1 diff)
• Query/AtomsQtQuery.cpp (modified) (1 diff)
• Query/DoublesQtQuery.cpp (modified) (1 diff)
• Query/ElementsQtQuery.cpp (modified) (1 diff)
• Query/FileQtQuery.cpp (modified) (5 diffs)
• Query/FilesQtQuery.cpp (modified) (1 diff)
• Query/IntsQtQuery.cpp (modified) (1 diff)
• Query/MoleculesQtQuery.cpp (modified) (1 diff)
• Query/QtQuery.hpp (modified) (1 diff)
• Query/QtQueryList.hpp (modified) (1 diff)
• Query/StringsQtQuery.cpp (modified) (1 diff)
• Query/UnsignedIntsQtQuery.cpp (modified) (1 diff)
• Query/VectorsQtQuery.cpp (modified) (1 diff)

src/UIElements/Qt4/QtDialog.cpp

@@ -45 +45 @@
 using namespace std;
 
-QtDialog::QtDialog() :
-    QDialog(0)
-{
+QtDialog::QtDialog(const std::string &_title) :
+    QDialog(0),
+    Dialog(_title)
+{
+  setWindowTitle(QString(_title.c_str()));
   // creating and filling of the Dialog window
   mainLayout = new QVBoxLayout();

src/UIElements/Qt4/QtDialog.hpp

@@ -30 +30 @@
   Q_OBJECT
 public:
-  QtDialog();
+  QtDialog(const std::string &_title);
   virtual ~QtDialog();
 

src/UIElements/Qt4/QtMainWindow.cpp

@@ -116 +116 @@
   toolbar = new QtToolBar(this);
   glWorldView->addToolBarActions(toolbar);
+  toolbar->addFavoriteActionItems(20);
   addToolBar(toolbar);
 

src/UIElements/Qt4/QtUIFactory.cpp

@@ -67 +67 @@
 }
 
-Dialog* QtUIFactory::makeDialog() {
-  return new QtDialog();
+Dialog* QtUIFactory::makeDialog(const std::string &_title) {
+  return new QtDialog(_title);
 }
 

src/UIElements/Qt4/QtUIFactory.hpp

@@ -26 +26 @@
   virtual ~QtUIFactory();
 
-  virtual Dialog* makeDialog();
+  virtual Dialog* makeDialog(const std::string &_title);
   virtual MainWindow* makeMainWindow();
 

src/UIElements/Qt4/Query/AtomsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<const atom *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new AtomQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/DoublesQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<double>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new DoubleQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/ElementsQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<const element *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new ElementQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

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();
@@ -57 +66 @@
   filenameLineEdit->setReadOnly(true);
 
-  filenameLabel = new QLabel(QString("Input file:"));
+  filenameLabel = new QLabel(QString(_title.c_str()));
   filenameLabel->setBuddy(filenameLineEdit);
   filenameLabel->setToolTip(QString(getDescription().c_str()));
@@ -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/FilesQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<boost::filesystem::path>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new FileQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/IntsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<int>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new IntQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<const molecule *>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new MoleculeQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/QtQuery.hpp

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

src/UIElements/Qt4/Query/QtQueryList.hpp

@@ -107 +107 @@
 {
 public:
-  ListQuerySubDialog(QtQueryListUntyped *_parent) : parent(_parent), sub(NULL){}
+  ListQuerySubDialog(QtQueryListUntyped *_parent, const std::string &_title) :
+    Dialog(_title),
+    parent(_parent),
+    sub(NULL)
+  {}
   virtual void update()
   {

src/UIElements/Qt4/Query/StringsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<std::string>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new StringQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

@@ -47 +47 @@
     QtQueryList<unsigned int>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new UnsignedIntQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);

src/UIElements/Qt4/Query/VectorsQtQuery.cpp

@@ -48 +48 @@
     QtQueryList<Vector>(_param, _parent, _dialog, temp)
 {
-  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this);
+  ListQuerySubDialog *subDialog = new ListQuerySubDialog(this, _title);
   subQuery = new VectorQtQuery(*subParam, _title, _description, thisVLayout, subDialog);
   subDialog->setSubQuery(subQuery);