Changeset f001ca

Timestamp:

Oct 23, 2010, 2:36:11 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:

9d457d

Parents:

db7cb0

Message:

FIX: result variable Dialog::FileQuery::tmp is now set. Label added in front of QLineEdit.

Location:

src/UIElements/QT4

Files:

• QTDialog.cpp (modified) (3 diffs)
• QTDialog.hpp (modified) (3 diffs)

src/UIElements/QT4/QTDialog.cpp

@@ -635 +635 @@
   filenameLineEdit->setReadOnly(true);
 
+  filenameLabel = new QLabel(QString("Input file:"));
+  filenameLabel->setBuddy(filenameLineEdit);
+
   filedialogButton = new QPushButton("&Choose", _dialog);
 
-  pipe = new FileQTQueryPipe(tmp,_dialog,filenameLineEdit,filedialogButton);
+  pipe = new FileQTQueryPipe(&tmp,_dialog,filenameLineEdit,filedialogButton);
 
   thisLayout = new QHBoxLayout();
   parent->addLayout(thisLayout);
+  thisLayout->addWidget(filenameLabel);
   thisLayout->addWidget(filenameLineEdit);
   thisLayout->addWidget(filedialogButton);
@@ -896 +900 @@
 }
 
-FileQTQueryPipe::FileQTQueryPipe(const boost::filesystem::path &_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
+FileQTQueryPipe::FileQTQueryPipe(boost::filesystem::path *_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
   content(_content),
   dialog(_dialog),
   filenameLineEdit(_filenameLineEdit),
   filedialogButton(_filedialogButton)
-{}
+{
+  theFileDialog = NULL;
+}
 
 FileQTQueryPipe::~FileQTQueryPipe()
-{}
+{
+  if (theFileDialog != NULL)
+    delete theFileDialog;
+}
 
 void FileQTQueryPipe::update() {
   QStringList ListOfFilenames = theFileDialog->selectedFiles();
   std::cout << "Selected File is " << ListOfFilenames.at(0).toStdString() << std::endl;
-  content = ListOfFilenames.at(0).toStdString();
+  (*content) = ListOfFilenames.at(0).toStdString();
+  filenameLineEdit->setText(QString::fromStdString((*content).string()));
   dialog->update();
 }
@@ -921 +931 @@
     theFileDialog->setViewMode(QFileDialog::List);
   }
-  theFileDialog->show();
-
-  filenameLineEdit->setText(QString());
+  theFileDialog->exec();
+
+  update();
   filedialogButton->setFlat(false);
 }

src/UIElements/QT4/QTDialog.hpp

@@ -286 +286 @@
       QBoxLayout *parent;
       QBoxLayout *thisLayout;
+      QLabel *filenameLabel;
       QLineEdit *filenameLineEdit;
       QPushButton *filedialogButton;
@@ -500 +501 @@
   Q_OBJECT
 public:
-  FileQTQueryPipe(const boost::filesystem::path &_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
+  FileQTQueryPipe(boost::filesystem::path *_content, QTDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
   virtual ~FileQTQueryPipe();
 
@@ -508 +509 @@
 
 private:
-  boost::filesystem::path content;
+  boost::filesystem::path *content;
   QTDialog *dialog;
   QLineEdit *filenameLineEdit;