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

Timestamp:

Jul 12, 2017, 7:11:51 PM (9 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/QtHomologyList.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -108 +108 @@
 
   dirty = true;
-  clearing = false;
   
   QSettings settings;
@@ -151 +150 @@
 }
 
-void QtHomologyList::update(Observable *publisher) {
-
+void QtHomologyList::update(Observable *publisher)
+{
   dirty = true;
 
   // force an update from Qt...
-//  clearing = true;
 //  treewidget->clear();
-//  clearing = false;
   emit changed(); //doesn't work!?!
 }
@@ -164 +161 @@
 void QtHomologyList::refill()
 {
-  clearing = true;
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   const HomologyContainer &homologies = World::getInstance().getHomologies();
 
@@ -290 +288 @@
   }
   dirty = false;
-  clearing = false;
 }
 
 void QtHomologyList::paintEvent(QPaintEvent * event)
 {
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   if (dirty)
     refill();
@@ -313 +312 @@
 void QtHomologyList::rowSelected()
 {
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   //std::cout << "rowSelected\n";
   for (int i=0;i<treewidget->topLevelItemCount();i++){