Changeset b1bb35

Timestamp:

Sep 1, 2016, 10:09:00 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Gui_Fixes

Children:

e03e9f

Parents:

c40e1f8

Message:

FIX: QtFragmentList controls access to clear() and refill() via mutex.

Location:

src/UIElements/Views/Qt4

Files:

• QtFragmentList.cpp (modified) (3 diffs)
• QtFragmentList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -73 +73 @@
 
         dirty = true;
-  clearing = false;
 
   refill();
@@ -93 +92 @@
 
 void QtFragmentList::update(Observable *publisher) {
-
+  boost::unique_lock<boost::mutex> lock(flag_mutex);
   dirty = true;
-
-  // force an update from Qt...
-  clearing = true;
-  clear();
-  clearing = false;
-  emit changed(); // doesn't work!?!
 }
 
 void QtFragmentList::refill()
 {
-  clearing = true;
+  boost::unique_lock<boost::mutex> lock(flag_mutex);
   FragmentationResultContainer &fragments =
       FragmentationResultContainer::getInstance();
@@ -177 +170 @@
   }
   dirty = false;
-  clearing = false;
 }
 

src/UIElements/Views/Qt4/QtFragmentList.hpp

@@ -14 +14 @@
 #endif
 
-
 #include <QtGui/QTreeWidget>
 #include "CodePatterns/Observer/Observer.hpp"
 
+#include <boost/thread/mutex.hpp>
+
 #include "Fragmentation/Summation/IndexSet.hpp"
+
 
 class FragmentGraph;
@@ -53 +55 @@
   //!> index set of the fragment
   std::vector<IndexSet> indexsets;
+  //!> controls atomic access to flags
+  boost::mutex flag_mutex;
   //!> flag to indicate that we got an update
   bool dirty;
-  //!> flag to indicate that we currently clear the view, avoids thread collisions
-  bool clearing;
 };