Changeset 28864c

Timestamp:

Jul 24, 2015, 4:44:35 PM (9 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:

8923ad8

Parents:

d619338

git-author:

Frederik Heber <heber@…> (06/08/15 16:26:34)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:35)

Message:

UIs are now initialized before any action takes place.

• UIFactory::doneInitializing() is set after mainwindow is instantiated.
• QTUIFactory::testrun() waits till UI is done initializing.

Location:

src

Files:

• UIElements/CommandLineUI/CommandLineUIFactory.cpp (modified) (1 diff)
• UIElements/Qt4/QtUIFactory.cpp (modified) (2 diffs)
• UIElements/TextUI/TextUIFactory.cpp (modified) (1 diff)
• UIElements/UIFactory.cpp (modified) (1 diff)
• UIElements/UIFactory.hpp (modified) (1 diff)
• builder_init.cpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineUIFactory.cpp

@@ -57 +57 @@
 
 MainWindow* CommandLineUIFactory::makeMainWindow() {
-  return new CommandLineWindow();
+  MainWindow* const mainwindow = new CommandLineWindow();
+  UIFactory::doneInitializing = true;
+  return mainwindow;
 }
 

src/UIElements/Qt4/QtUIFactory.cpp

@@ -113 +113 @@
 
 MainWindow* QtUIFactory::makeMainWindow() {
-  return new QtMainWindow(app);
+  MainWindow * const mainwindow = new QtMainWindow(app);
+  UIFactory::doneInitializing = true;
+  return mainwindow;
 }
 
@@ -137 +139 @@
 {
   std::cout << "TESTLAUNCHER: Waiting for GUI to set up" << std::endl;
-  testlauncher_sleep(boost::posix_time::seconds(3));
+  while (!UIFactory::isDoneInitializing())
+    testlauncher_sleep(boost::posix_time::seconds(.1));
 
   std::vector<std::string>::const_iterator scriptiter = _scripts.begin();

src/UIElements/TextUI/TextUIFactory.cpp

@@ -51 +51 @@
 
 MainWindow* TextUIFactory::makeMainWindow() {
-  return new TextWindow();
+  MainWindow* const mainwindow = new TextWindow();
+  UIFactory::doneInitializing = true;
+  return mainwindow;
 }
 

src/UIElements/UIFactory.cpp

@@ -45 +45 @@
 std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
 
+bool UIFactory::doneInitializing = false;
+
 UIFactory::UIFactory()
 {}

src/UIElements/UIFactory.hpp

@@ -79 +79 @@
   static bool isFactoryPresent() { return !factories.empty(); }
   virtual std::string getUIName(){  return "none";  }
+  static bool isDoneInitializing() { return doneInitializing; }
 protected:
+  //!> indicates whether the made factory is done initializing
+  static bool doneInitializing;
+
 private:
   static std::map<std::string,boost::shared_ptr<factoryDescription> > factories;

src/builder_init.cpp

@@ -168 +168 @@
 {
   MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow();
+
+  // wait till is done initializing
+  while (!UIFactory::isDoneInitializing());
+
+  LOG(0, "UI is done initializing.");
+
   mainWindow->display();
+
   delete mainWindow;
 }