Changeset 6f5dfe for src/UIElements

Timestamp:

Oct 22, 2010, 4:13:36 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:

bd2390, db7cb0

Parents:

e4decc

Message:

Added boost::filesystem usage for input files.

• parameters for Action input now have type boost::filesystem.
• rewritten Actions to use boost::filesystems
• in the progress of writing FileQtQuery to present a file dialog.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineDialog.cpp (modified) (2 diffs)
• CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• Dialog.cpp (modified) (2 diffs)
• Dialog.hpp (modified) (3 diffs)
• QT4/QTDialog.cpp (modified) (3 diffs)
• QT4/QTDialog.hpp (modified) (5 diffs)
• TextUI/TextDialog.cpp (modified) (3 diffs)
• TextUI/TextDialog.hpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -125 +125 @@
 void CommandLineDialog::queryElements(const char* title, string _description){
   registerQuery(new ElementsCommandLineQuery(title, _description));
+}
+
+void CommandLineDialog::queryFile(const char* title, string _description){
+  registerQuery(new FileCommandLineQuery(title, _description));
 }
 
@@ -457 +461 @@
   }
 }
+
+CommandLineDialog::FileCommandLineQuery::FileCommandLineQuery(string title, string _description) :
+    Dialog::FileQuery(title, _description)
+{}
+
+CommandLineDialog::FileCommandLineQuery::~FileCommandLineQuery() {}
+
+bool CommandLineDialog::FileCommandLineQuery::handle() {
+  if (CommandLineParser::getInstance().vm.count(getTitle())) {
+    tmp = CommandLineParser::getInstance().vm[getTitle()].as<string>();
+    return true;
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing string for " << getTitle() << "." << endl);
+    return false;
+  }
+}
+

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -44 +44 @@
   virtual void queryElement(const char*, std::string = "");
   virtual void queryElements(const char*, std::string = "");
+  virtual void queryFile(const char*, std::string = "");
 
 protected:
@@ -165 +166 @@
     virtual bool handle();
   };
+
+  class FileCommandLineQuery : public Dialog::FileQuery {
+  public:
+    FileCommandLineQuery(std::string title, std::string _description = "");
+    virtual ~FileCommandLineQuery();
+    virtual bool handle();
+  };
 };
 

src/UIElements/Dialog.cpp

@@ -180 +180 @@
 }
 
+template <> void Dialog::query< boost::filesystem::path >(const char *token, std::string description)
+{
+  queryFile(token, description);
+}
+
 /****************** Query types Infrastructure **************************/
 
@@ -407 +412 @@
   ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
 }
+
+// File Queries
+Dialog::FileQuery::FileQuery(std::string title, std::string _description) :
+  Query(title, _description)
+  {}
+
+Dialog::FileQuery::~FileQuery(){}
+
+void Dialog::FileQuery::setResult(){
+  ValueStorage::getInstance().setCurrentValue(title.c_str(), tmp);
+}

src/UIElements/Dialog.hpp

@@ -12 +12 @@
 #include<list>
 #include<vector>
+
+#include <boost/filesystem.hpp>
 
 #include "Box.hpp"
@@ -57 +59 @@
   virtual void queryElement(const char*, std::string = "")=0;
   virtual void queryElements(const char*, std::string = "")=0;
+  virtual void queryFile(const char*, std::string = "")=0;
 
   virtual bool display();
@@ -271 +274 @@
   };
 
+  class FileQuery : public Query {
+  public:
+    FileQuery(std::string title, std::string _description = "");
+    virtual ~FileQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    boost::filesystem::path tmp;
+  };
+
 void registerQuery(Query* query);
 

src/UIElements/QT4/QTDialog.cpp

@@ -179 +179 @@
   // TODO
   ASSERT(false, "Not implemented yet");
+}
+
+void QTDialog::queryFile(const char* title, std::string){
+  registerQuery(new FileQTQuery(title,inputLayout,this));
 }
 
@@ -622 +626 @@
 }
 
+QTDialog::FileQTQuery::FileQTQuery(std::string _title, QBoxLayout *_parent, QTDialog *_dialog) :
+    Dialog::FileQuery(_title),
+    parent(_parent)
+{
+
+  filenameLineEdit = new QLineEdit(_dialog);
+  filenameLineEdit->setText(QString());
+  filenameLineEdit->setReadOnly(true);
+
+  filedialogButton = new QPushButton("&Choose", _dialog);
+
+  pipe = new FileQTQueryPipe(tmp,_dialog,filenameLineEdit,filedialogButton);
+
+  thisLayout = new QHBoxLayout();
+  parent->addLayout(thisLayout);
+  thisLayout->addWidget(filenameLineEdit);
+  thisLayout->addWidget(filedialogButton);
+
+  QObject::connect(filedialogButton,SIGNAL(clicked()),pipe,SLOT(showFileDialog()));
+}
+
+QTDialog::FileQTQuery::~FileQTQuery()
+{
+  delete pipe;
+}
+
+bool QTDialog::FileQTQuery::handle(){
+  return true;
+}
+
 /*************************** Plumbing *******************************/
 
@@ -862 +896 @@
 }
 
-
+FileQTQueryPipe::FileQTQueryPipe(const boost::filesystem::path &_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
+  content(_content),
+  dialog(_dialog),
+  filenameLineEdit(_filenameLineEdit),
+  filedialogButton(_filedialogButton)
+{}
+
+FileQTQueryPipe::~FileQTQueryPipe()
+{}
+
+void FileQTQueryPipe::update() {
+  QStringList ListOfFilenames = theFileDialog->selectedFiles();
+  std::cout << "Selected File is " << ListOfFilenames.at(0).toStdString() << std::endl;
+  content = ListOfFilenames.at(0).toStdString();
+  dialog->update();
+}
+
+void FileQTQueryPipe::showFileDialog() {
+  filedialogButton->setFlat(true);
+  if (theFileDialog == NULL) {
+    theFileDialog = new QFileDialog(NULL, tr("Open input file"), QString(), tr("ParallelCarParrinello (*.conf);;MassivelyParallelQuantumChemistry (*.mpqc);;ParticleDataBase (*.pdb);;XYZ (*.xyz)"));
+    theFileDialog->setAcceptMode(QFileDialog::AcceptOpen);
+    theFileDialog->setFileMode(QFileDialog::ExistingFile);
+    theFileDialog->setViewMode(QFileDialog::List);
+  }
+  theFileDialog->show();
+
+  filenameLineEdit->setText(QString());
+  filedialogButton->setFlat(false);
+}
+
+
+

src/UIElements/QT4/QTDialog.hpp

@@ -11 +11 @@
 #include "UIElements/Dialog.hpp"
 #include <QtGui/QDialog>
+#include <QtGui/QFileDialog>
+
+#include <boost/filesystem.hpp>
 
 class QBoxLayout;
@@ -37 +40 @@
 class VectorQTQueryPipe;
 class VectorsQTQueryPipe;
+class FileQTQueryPipe;
 
 class QTDialog : public QDialog, public Dialog
@@ -62 +66 @@
   virtual void queryElement(const char*,std::string = "");
   virtual void queryElements(const char*,std::string = "");
+  virtual void queryFile(const char*,std::string = "");
 
   virtual bool display();
@@ -271 +276 @@
 
       ElementsQTQueryPipe *pipe;
+    };
+
+    class FileQTQuery : public Dialog::FileQuery {
+    public:
+      FileQTQuery(std::string _title, QBoxLayout *_parent, QTDialog *_dialog);
+      virtual ~FileQTQuery();
+      virtual bool handle();
+    private:
+      QBoxLayout *parent;
+      QBoxLayout *thisLayout;
+      QLineEdit *filenameLineEdit;
+      QPushButton *filedialogButton;
+
+      FileQTQueryPipe *pipe;
     };
 
@@ -477 +496 @@
   QComboBox *theBox;
 };
+
+class FileQTQueryPipe : public QWidget {
+  Q_OBJECT
+public:
+  FileQTQueryPipe(const boost::filesystem::path &_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
+  virtual ~FileQTQueryPipe();
+
+public slots:
+  void update();
+  void showFileDialog();
+
+private:
+  boost::filesystem::path content;
+  QTDialog *dialog;
+  QLineEdit *filenameLineEdit;
+  QPushButton *filedialogButton;
+  QFileDialog *theFileDialog;
+};
+
 #endif /* QTDIALOG_HPP_ */

src/UIElements/TextUI/TextDialog.cpp

@@ -42 +42 @@
 
 #include <boost/lexical_cast.hpp>
+#include <boost/filesystem.hpp>
 
 using namespace std;
@@ -123 +124 @@
 void TextDialog::queryElements(const char* title, std::string description){
   registerQuery(new ElementsTextQuery(title,description));
+}
+
+void TextDialog::queryFile(const char* title, std::string description){
+  registerQuery(new FileTextQuery(title,description));
 }
 
@@ -684 +689 @@
   return (Z!=-1);
 }
+
+TextDialog::FileTextQuery::FileTextQuery(string title, std::string _description) :
+    Dialog::FileQuery(title,_description)
+{}
+
+TextDialog::FileTextQuery::~FileTextQuery() {}
+
+bool TextDialog::FileTextQuery::handle() {
+  Log() << Verbose(0) << getTitle();
+  std::string tempstring;
+  getline(cin,tempstring);
+  tmp = tempstring;
+  return true;
+}
+

src/UIElements/TextUI/TextDialog.hpp

@@ -41 +41 @@
   virtual void queryElement(const char*, std::string = "");
   virtual void queryElements(const char*, std::string = "");
+  virtual void queryFile(const char*, std::string = "");
 
 protected:
@@ -162 +163 @@
     virtual bool handle();
   };
+
+  class FileTextQuery : public Dialog::FileQuery {
+  public:
+    FileTextQuery(std::string title, std::string _description = NULL);
+    virtual ~FileTextQuery();
+    virtual bool handle();
+  };
 };