Changeset 7516f6 for src/UIElements/Views/Qt4/QtStatusBar.cpp

Timestamp:

Jul 12, 2017, 7:11:51 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, stable

Children:

4c6f0d

Parents:

b10593

git-author:

Frederik Heber <frederik.heber@…> (07/12/17 12:20:23)

git-committer:

Frederik Heber <frederik.heber@…> (07/12/17 19:11:51)

Message:

FIX: several Qt...Lists required mutex to control refill triggered by observable update.

• QtGeometryList, QtHomologyList, and QtShapeList
• also QtStatusBar, and QtTimeLine.

File:

• src/UIElements/Views/Qt4/QtStatusBar.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QtStatusBar.cpp

@@ -99 +99 @@
 }
 
-void QtStatusBar::update(Observable *subject){
+void QtStatusBar::paintEvent(QPaintEvent * event)
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
+  QStatusBar::paintEvent(event);
+}
+
+void QtStatusBar::update(Observable *subject)
+{
   if (subject == World::getPointer()){
     atomCount = World::getInstance().numAtoms();
@@ -133 +141 @@
 void QtStatusBar::updateStatusMessage()
 {
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   if (StatusList.size() != 0) {
     // get oldest message from the StatusList
@@ -177 +187 @@
 }
 
-void QtStatusBar::redrawStatus(){
+void QtStatusBar::redrawStatus()
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   stringstream sstr;
   sstr << "You have " << atomCount << " atom" << PLURAL_S(atomCount)
@@ -190 +203 @@
     const bool StopStatus)
 {
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   progressIndicator *ind=0;
   progressBars_t::iterator iter = progressBars.find(name);
@@ -216 +231 @@
 
 
-QtStatusBar::progressIndicator::progressIndicator(const std::string &name){
+QtStatusBar::progressIndicator::progressIndicator(const std::string &name)
+{
   stringstream sstr;
   sstr << "Busy (" << name << ")";