Changeset 57608e for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Dec 19, 2025, 10:33:07 PM (13 days ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

37d1c3

Parents:

4e124d

git-author:

Frederik Heber <frederik.heber@…> (11/06/25 21:05:00)

git-committer:

Frederik Heber <frederik.heber@…> (12/19/25 22:33:07)

Message:

Attempt to simplify redraw event in Qt View.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (18 diffs)

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

@@ -71 +71 @@
   Observer("GLWorldView"),
   worldscene(NULL),
-  changesPresent(false),
-  needsRedraw(false)
+  changesPresent(false)
 {
   worldscene = new GLWorldScene(_board, this);
@@ -91 +90 @@
   connect(this, SIGNAL(ShapeAdded(const std::string &)), worldscene, SLOT(addShape(const std::string &)));
   connect(this, SIGNAL(ShapeRemoved(const std::string &)), worldscene, SLOT(removeShape(const std::string &)));
-//  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
-  connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
-  connect(this, SIGNAL(changed()), this, SLOT(changeSignalled()));
   connect(worldscene, SIGNAL(hoverChanged(const atomId_t)), this, SLOT(sceneHoverSignalled(const atomId_t)));
   connect(worldscene, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SLOT(sceneHoverSignalled(const moleculeId_t, int)));
-  connect(worldscene, SIGNAL(hoverEnd()), this, SLOT(sceneHoverEndSignalled()));
-  //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
-  connect(worldscene, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
+  connect(worldscene, SIGNAL(hoverEnd()), this, SLOT(triggerUpdateGL()));
+  connect(worldscene, SIGNAL(updated()), this, SLOT(triggerUpdateGL()));
+  connect(this, SIGNAL(updated()), this, SLOT(triggerUpdateGL()));
+  connect(worldscene, SIGNAL(sceneChanged()), this, SLOT(sceneChangeSignalled()));
   connect(this, SIGNAL(moleculesVisibilityChanged(ObservedValue_Index_t,bool)),
       worldscene, SLOT(moleculesVisibilityChanged(ObservedValue_Index_t,bool)));
@@ -325 +322 @@
 void GLWorldView::update(Observable *publisher)
 {
-//  emit changed();
+//  emit updated();
 }
 
@@ -351 +348 @@
 #endif
         needsRedraw = false;
-        emit changed();
+        emit updated();
         emit TimeChanged();
         break;
@@ -386 +383 @@
 }
 
-void GLWorldView::checkChanges()
-{
-  needsRedraw = false;
-  updateGL();
-}
-
 void GLWorldView::changeDreiBein()
 {
@@ -399 +390 @@
   // realize
   needsRedraw = true;
-  emit changed();
+  emit updated();
 }
 
@@ -417 +408 @@
   // realize
   needsRedraw = true;
-  emit changed();
+  emit updated();
 }
 
@@ -428 +419 @@
 }
 
-void GLWorldView::sceneChangeSignalled()
-{
-  if (needsRedraw){
-    redrawTimer->singleShot(0, this, SLOT(checkChanges()));
-    needsRedraw = true;
-    redrawTimer->start();
-  }
+void GLWorldView::triggerUpdateGL()
+{
+  redrawTimer->singleShot(0, this, SLOT(updateGL()));
+  redrawTimer->start();
 }
 
@@ -461 +449 @@
   // Domain box has to be last because of its transparency.
   drawDomainBox(painter);
+}
+
+void GLWorldView::sceneChangeSignalled()
+{
+  boost::recursive_mutex::scoped_lock lock(changed_mutex);
+        changesPresent = true;
 }
 
@@ -504 +498 @@
 }
 
-void GLWorldView::changeSignalled()
-{
-  boost::recursive_mutex::scoped_lock lock(changed_mutex);
-  changesPresent = true;
-  updateGL();
-}
-
-
 /**
  * Set the current camera control mode.
@@ -565 +551 @@
   setStereoType(QGLView::Hardware);
   camera()->setEyeSeparation(0.0);
-  emit changed();
+  emit updated();
 }
 
@@ -572 +558 @@
   setStereoType(QGLView::Hardware);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -579 +565 @@
   setStereoType(QGLView::LeftRight);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -586 +572 @@
   setStereoType(QGLView::RightLeft);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -593 +579 @@
   setStereoType(QGLView::TopBottom);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -600 +586 @@
   setStereoType(QGLView::BottomTop);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -607 +593 @@
   setStereoType(QGLView::RedCyanAnaglyph);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  emit changed();
+  emit updated();
 }
 
@@ -739 +725 @@
 void GLWorldView::sceneHoverSignalled(const atomId_t _id)
 {
-  needsRedraw = true;
   emit hoverChanged(_id);
-  emit changed();
+  emit updated();
 }
 
 void GLWorldView::sceneHoverSignalled(const moleculeId_t _id, int _i)
 {
-  needsRedraw = true;
   emit hoverChanged(_id, _i);
-  emit changed();
-}
-
-void GLWorldView::sceneHoverEndSignalled()
-{
-  LOG(1, "GLWorldView::sceneHoverEndSignalled()");
-  needsRedraw = true;
-  emit changed();
-}
+  emit updated();
+}