Changeset 57608e for src/UIElements/Views/Qt4

Timestamp:

Dec 19, 2025, 10:33:07 PM (12 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.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (4 diffs)
• GLWorldScene.cpp (modified) (11 diffs)
• GLWorldScene.hpp (modified) (1 diff)
• GLWorldView.cpp (modified) (18 diffs)
• GLWorldView.hpp (modified) (1 diff)

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

@@ -124 +124 @@
   setArrow(Position, 10.*ObservedAtom->getAtomVelocity(), scaleX(), GLMoleculeObjectVelocity);
   setArrow(Position, 10.*ObservedAtom->getAtomForce(), scaleX(), GLMoleculeObjectForce);
+  
+  emit changed();
 }
 
@@ -167 +169 @@
   alignArrow(Velocity, GLMoleculeObjectVelocity);
 //  GLMoleculeObjectForce.setScaleZ(Velocity.Norm());
+  
+  emit changed();
 }
 
@@ -175 +179 @@
   alignArrow(Force, GLMoleculeObjectForce);
 //  GLMoleculeObjectForce.setScaleZ(Force.Norm());
+  
+  emit changed();
 }
 
@@ -203 +209 @@
   }
   setScale( radius / 4. );
+  
+  emit changed();
 }
 

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

@@ -202 +202 @@
   connect(board, SIGNAL(bondRemoved(ObservedValue_Index_t)),
       this, SLOT(removeBond(ObservedValue_Index_t)));
-
-//  connect(this, SIGNAL(updated()), this, SLOT(update()));
 }
 
@@ -313 +311 @@
 
   connect (atomObject, SIGNAL(clicked(atomId_t)), this, SLOT(clickAtom(atomId_t)));
-  connect (atomObject, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SIGNAL(changed()));
+  connect (atomObject, SIGNAL(changed()), this, SIGNAL(updated()));
   connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -386 +383 @@
   checkAndRemoveAtom( _atomid );
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -478 +475 @@
               _bond,
               bondsides[i]);
-      connect (bondObject, SIGNAL(changed()), this, SIGNAL(changed()));
+      connect (bondObject, SIGNAL(changed()), this, SIGNAL(updated()));
       BondsinSceneMap.insert( std::make_pair(bondid, bondObject) );
     }
   }
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -542 +539 @@
   checkAndRemoveBond( _bondid );
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -654 +651 @@
       +" already present in scene.");
 
-  connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
-
-  emit changed();
-  emit changeOccured();
+  connect (molObject, SIGNAL(changed()), this, SIGNAL(updated()));
+  connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(updated()));
+  connect (molObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
+
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -686 +684 @@
   MoleculesinSceneMap.erase(iter);
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -700 +698 @@
   molObject->setVisible(_visible);
 
-  emit changed();
-  emit changeOccured();
+        emit sceneChanged();
+  emit updated();
 }
 
@@ -895 +893 @@
     ELOG(2, "GLWorldScene::addShape() - shape disappeared before we could draw it.");
 
-  emit changed();
+  emit updated();
 }
 
@@ -906 +904 @@
   ShapesinSceneMap.erase(iter);
 
-  emit changed();
+  emit updated();
 }
 
@@ -918 +916 @@
   }
 
-  emit changed();
+  emit updated();
 }
 

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

@@ -77 +77 @@
 
 signals:
-  void changed();
-//  void updated();
-  void changeOccured();
+  void updated();
+  void sceneChanged();
   void pressed();
   void released();

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();
+}

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

@@ -59 +59 @@
 
 public slots:
-  void changeSignalled();
-  void checkChanges();
   void sceneChangeSignalled();
+  void triggerUpdateGL();
   void sceneHoverSignalled(const atomId_t _id);
   void sceneHoverSignalled(const moleculeId_t _id, int);
-  void sceneHoverEndSignalled();
   void changeDreiBein();
   void changeDomain();
 
 signals:
-  void changed();
+  void updated();
+  void sceneUpdated();
   void TimeChanged();
   void worldSelectionChanged();