Changeset 3f5b0a

Timestamp:

Apr 23, 2021, 8:31:23 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

0ad4781

Parents:

b0060a

git-author:

Frederik Heber <frederik.heber@…> (08/08/20 23:20:31)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:31:23)

Message:

Added mutex on changes_present in GLWorldView.

• this should prevent selections from being not updated immediatelty.
• This happens because the selections may occur during painting of the WorldView and race conditions of setting change_present.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

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

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -434 +434 @@
 void GLWorldView::initializeGL(QGLPainter *painter)
 {
+  boost::recursive_mutex::scoped_lock lock(changed_mutex);
   worldscene->initialize(this, painter);
   changesPresent = false;
@@ -440 +441 @@
 void GLWorldView::paintGL(QGLPainter *painter)
 {
-  if (changesPresent)
-    initializeGL(painter);
+  {
+    boost::recursive_mutex::scoped_lock lock(changed_mutex);
+    if (changesPresent)
+      initializeGL(painter);
+  }
 
   QVector3D cameraDir = camera()->center() - camera()->eye();
@@ -497 +501 @@
 void GLWorldView::changeSignalled()
 {
+  boost::recursive_mutex::scoped_lock lock(changed_mutex);
   changesPresent = true;
   updateGL();

src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

@@ -19 +19 @@
 
 #include "World.hpp"
+
+#include <boost/thread/recursive_mutex.hpp>
 
 class molecule;
@@ -130 +132 @@
 
   double defaultEyeSeparation;
+
+  boost::recursive_mutex changed_mutex;
+
 };