Changeset 15e197

Timestamp:

Jun 10, 2015, 9:41:07 PM (10 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:

0f0407

Parents:

3054689

git-author:

Frederik Heber <heber@…> (05/13/15 18:20:52)

git-committer:

Frederik Heber <heber@…> (06/10/15 21:41:07)

Message:

Command-line arguments are passed to QApplication inside QtUIFactory.

Location:

src

Files:

• UIElements/Qt4/QtUIFactory.cpp (modified) (5 diffs)
• UIElements/Qt4/QtUIFactory.hpp (modified) (3 diffs)
• builder_init.cpp (modified) (1 diff)

src/UIElements/Qt4/QtUIFactory.cpp

@@ -37 +37 @@
 #include <string.h>
 
+#include <boost/filesystem/path.hpp>
+
 #include <Qt/qapplication.h>
 
@@ -44 +46 @@
 #include "UIElements/Qt4/QtDialog.hpp"
 
+// boost::python uses placement new which is incompatible with MemDebug.
+#ifdef HAVE_PYTHON
+#include "Python/PythonScripting.hpp"
+#endif
+
 #include "CodePatterns/MemDebug.hpp"
 
-#include "version.h"
 #include "Helpers/defs.hpp"
 
 using namespace std;
 
-QtUIFactory::QtUIFactory() :
-  argc(1)
+QtUIFactory::QtUIFactory(int _argc, char **_argv) :
+    argc(1),
+    argv(new char*[1]),
+    testlauncher_Interrupted(false),
+    testlauncher_thread(NULL)
 {
-  // For now we just fake the command line parameters to make QT happy
-  argv = new char*[1];
-  argv[0] = new char[256];
-  strcpy(argv[0],MOLECUILDERVERSION);
-  app = new QApplication(argc,argv);
+
+  // check whether we are in test mode
+  if ((_argc > 1) && (isTestMode(_argv[1]))) {
+#ifdef HAVE_BOOST_THREAD_HPP
+    std::vector<std::string> scripts;
+    scripts.reserve(_argc-1);
+    for (int i=2;i<_argc;++i)
+      scripts.push_back(std::string(_argv[i]));
+
+    // prepare an extra thread
+    std::cout << "TESTLAUNCHER: Preparing " << std::endl;
+    testlauncher_thread = new boost::thread(
+        boost::bind(&QtUIFactory::testrun, this, scripts));
+#else
+    std::cerr << "Boost::thread support missing! Cannot launch test scripts.\n";
+#endif
+    // use fake commands to not pass test stuff
+    const int length = strlen(_argv[0]);
+    argv[0] = new char[length];
+    strncpy(_argv[0],_argv[0], length);
+    app = new QApplication(argc,argv);
+  } else {
+    app = new QApplication(_argc,_argv);
+  }
 }
 
 QtUIFactory::~QtUIFactory()
 {
-  //delete app;
-  delete [] argv[0];
-  delete [] argv;
+  if (testlauncher_thread != NULL) {
+    // notify testlauncher_thread thread that we wish to terminate
+    testlauncher_thread->interrupt();
+    // wait till it ends
+    testlauncher_thread->join();
+    // and remove
+    delete testlauncher_thread;
+  }
+  // free fake command line argument arrays
+  delete[] argv[0];
+  delete[] argv;
 }
 
@@ -76 +112 @@
 }
 
-QtUIFactory::description::description() :
-    UIFactory::factoryDescription("Qt4")
+QtUIFactory::description::description(int _argc, char **_argv) :
+    UIFactory::factoryDescription("Qt4"),
+    argc(_argc),
+    argv(_argv)
 {}
 
@@ -84 +122 @@
 
 UIFactory* QtUIFactory::description::makeFactory(){
-  return new QtUIFactory();
+  return new QtUIFactory(argc, argv);
 }
 
@@ -91 +129 @@
   return (strncmp(_argument,"--test", 6) == 0);
 }
+
+void QtUIFactory::testrun(const std::vector<std::string> _scripts) const
+{
+  std::cout << "TESTLAUNCHER: Waiting for GUI to set up" << std::endl;
+  testlauncher_sleep(boost::posix_time::seconds(3));
+
+  std::vector<std::string>::const_iterator scriptiter = _scripts.begin();
+  do {
+    // then launch script
+    std::cout << "TESTLAUNCHER: Launching script " << *scriptiter << std::endl;
+    boost::filesystem::path scriptfilename(*scriptiter);
+    ASSERT( boost::filesystem::exists(scriptfilename),
+        "QtUIFactory::testrun() - given testmode script file "
+        +toString(scriptfilename.string())+" does not exist.");
+    executePythonScriptFile(scriptfilename);
+    ++scriptiter;
+
+    std::cout << "TESTLAUNCHER: Sleeping after script" << std::endl;
+    testlauncher_sleep(boost::posix_time::seconds(1.5));
+
+  } while ((scriptiter != _scripts.end()) && (!testlauncher_Interrupted));
+
+  // send quit signal
+  std::cout << "TESTLAUNCHER: Quitting" << std::endl;
+  app->quit();
+}
+
+void QtUIFactory::testlauncher_sleep(const boost::posix_time::time_duration& _period) const
+{
+  try {
+    // first sleep for four seconds
+#if BOOST_VERSION < 105000
+    testlauncher_thread->sleep(boost::get_system_time() + _period);
+#else
+    boost::this_thread::sleep_for(boost::chrono::seconds(4));
+#endif
+  } catch(boost::thread_interrupted &e) {
+    LOG(2, "INFO: testlauncher thread has received stop signal.");
+  }
+}

src/UIElements/Qt4/QtUIFactory.hpp

@@ -17 +17 @@
 #include "UIElements/UIFactory.hpp"
 
+#include <boost/thread.hpp>
+#include <string>
+#include <vector>
+
 class QApplication;
 
@@ -30 +34 @@
 
   struct description : public UIFactory::factoryDescription {
-    description();
+    description(int _argc, char **_argv);
     virtual ~description();
 
     virtual UIFactory* makeFactory();
-  };
+
+  private:
+    int argc;
+    char **argv;
+ };
   virtual std::string getUIName(){  return "Qt4";  }
 
@@ -40 +48 @@
 
 protected:
-  QtUIFactory();
+  QtUIFactory(int _argc, char **_argv);
 
 private:
-  // faked command line arguments
+
+  void testrun(const std::vector<std::string> _scripts) const;
+
+  void testlauncher_sleep(const boost::posix_time::time_duration& _period) const;
+
+private:
+  QApplication *app;
+
   int argc;
   char **argv;
-  QApplication *app;
+
+  //!> internal flag to tell testlauncher_thread to stop
+  mutable bool testlauncher_Interrupted;
+
+  //!> internal thread to call Actions
+  boost::thread *testlauncher_thread;
 };
 

src/builder_init.cpp

@@ -150 +150 @@
       ASSERT_DO(Assert::Ask);
       LOG(0, "Setting UI to Qt4.");
-      UIFactory::registerFactory(new QtUIFactory::description());
+      UIFactory::registerFactory(new QtUIFactory::description(argc, argv));
       UIFactory::makeUserInterface("Qt4");
     #else