Changeset 426c84 for src/UIElements/Views/Qt4/QtStatusBar.hpp

Timestamp:

Sep 29, 2013, 11:40:48 AM (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, 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:

8481f5

Parents:

c48ac12

git-author:

Frederik Heber <heber@…> (08/29/13 09:23:47)

git-committer:

Frederik Heber <heber@…> (09/29/13 11:40:48)

Message:

QtStatusBar::updateProcess() replaced by signal/slot mechanism.

• updateProcess() added QProgessBar() widgets which can only take place in main thread, but notify comes from ActionQueue's thread. Hence, we relay the information via signal/slot redrawProgressBar()/updateProgressBar() to main thread and instantiate there.

File:

• src/UIElements/Views/Qt4/QtStatusBar.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/QtStatusBar.hpp

@@ -35 +35 @@
 
   struct progressIndicator{
-    progressIndicator(std::string);
+    progressIndicator(const std::string &name);
     ~progressIndicator();
     QLabel *label;
@@ -49 +49 @@
   void subjectKilled(Observable *subject);
 
+private slots:
+  void updateProgressBar(
+      const std::string name,
+      const unsigned int maxsteps,
+      const unsigned int currentstep,
+      const bool StopStatus);
+
+signals:
+  void redrawProgressBar(
+      const std::string name,
+      const unsigned int maxsteps,
+      const unsigned int currentstep,
+      const bool StopStatus);
+
 private:
   void redrawStatus();
-  void redrawProcess(MoleCuilder::Process *proc);
 
   int atomCount;
@@ -58 +71 @@
   QLabel *statusLabel;
   QWidget *parent;
-  std::map<MoleCuilder::Process*,progressIndicator*> progressBars;
-  MoleCuilder::Process* activeProcess;
+  typedef std::map<std::string,progressIndicator*> progressBars_t;
+  progressBars_t progressBars;
+  std::string activeProcess;
 };