Changeset 8d56a6 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Jun 21, 2018, 8:31:25 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, ChemicalSpaceEvaluator

Children:

d83d64, f5ea10

Parents:

3e334e (diff), 4fc0ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TremoloParser_IncreasedPrecision' into Candidate_v1.6.1

Conflicts:

tests/Python/ForceAnnealing/post/five_carbon_test_bondgraph.data
tests/Python/ForceAnnealing/post/five_carbon_test_no-bondgraph.data

File:

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

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

@@ -93 +93 @@
 //  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
-  connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
+  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(this, SIGNAL(changed()), this, SLOT(updateGL()));
-  connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
+  connect(worldscene, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
   connect(this, SIGNAL(moleculesVisibilityChanged(ObservedValue_Index_t,bool)),
       worldscene, SLOT(moleculesVisibilityChanged(ObservedValue_Index_t,bool)));
@@ -104 +104 @@
   WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
+  AtomObserver::getInstance().signOn(this, AtomObservable::VelocityChanged);
+  AtomObserver::getInstance().signOn(this, AtomObservable::ForceChanged);
 
   ShapeRegistry::getInstance().signOn(this);
@@ -124 +126 @@
   WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
+  AtomObserver::getInstance().signOff(this, AtomObservable::VelocityChanged);
+  AtomObserver::getInstance().signOff(this, AtomObservable::ForceChanged);
   ShapeRegistry::getInstance().signOff(this);
   ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeInserted);
@@ -341 +345 @@
       observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that WorldTime's time has changed.";
 #endif
+        needsRedraw = false;
         emit changed();
         emit TimeChanged();
@@ -353 +358 @@
       case ShapeRegistry::ShapeInserted:
       {
+        needsRedraw = false;
         emit ShapeAdded(ShapeRegistry::getInstance().lastChanged()->getName());
         break;
@@ -358 +364 @@
       case ShapeRegistry::ShapeRemoved:
       {
+        needsRedraw = false;
         emit ShapeRemoved(ShapeRegistry::getInstance().lastChanged()->getName());
         break;
@@ -363 +370 @@
       case ShapeRegistry::SelectionChanged:
       {
+        needsRedraw = false;
         worldscene->updateSelectedShapes();
         break;
@@ -375 +383 @@
 void GLWorldView::checkChanges()
 {
+  needsRedraw = false;
   updateGL();
-  needsRedraw = false;
 }
 
@@ -385 +393 @@
   setdreiBeinStatus(!status);
   // realize
-  updateGL();
   needsRedraw = true;
+  emit changed();
 }
 
@@ -403 +411 @@
   setDomainStatus(!status);
   // realize
-  updateGL();
   needsRedraw = true;
+  emit changed();
 }
 
@@ -417 +425 @@
 void GLWorldView::sceneChangeSignalled()
 {
-  if (!needsRedraw){
+  if (needsRedraw){
     redrawTimer->singleShot(0, this, SLOT(checkChanges()));
     needsRedraw = true;
@@ -432 +440 @@
 void GLWorldView::paintGL(QGLPainter *painter)
 {
-  if (changesPresent) {
+  if (changesPresent)
     initializeGL(painter);
-    changesPresent = false;
-  }
 
   QVector3D cameraDir = camera()->center() - camera()->eye();
@@ -492 +498 @@
 {
   changesPresent = true;
+  updateGL();
 }
 
@@ -548 +555 @@
   setStereoType(QGLView::Hardware);
   camera()->setEyeSeparation(0.0);
-  updateGL();
+  emit changed();
 }
 
@@ -555 +562 @@
   setStereoType(QGLView::Hardware);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -562 +569 @@
   setStereoType(QGLView::LeftRight);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -569 +576 @@
   setStereoType(QGLView::RightLeft);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -576 +583 @@
   setStereoType(QGLView::TopBottom);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -583 +590 @@
   setStereoType(QGLView::BottomTop);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -590 +597 @@
   setStereoType(QGLView::RedCyanAnaglyph);
   camera()->setEyeSeparation(defaultEyeSeparation);
-  updateGL();
+  emit changed();
 }
 
@@ -714 +721 @@
 void GLWorldView::sceneHoverSignalled(const atomId_t _id)
 {
+  needsRedraw = true;
+  emit changed();
   emit hoverChanged(_id);
 }
@@ -719 +728 @@
 void GLWorldView::sceneHoverSignalled(const moleculeId_t _id, int _i)
 {
+  needsRedraw = true;
+  emit changed();
   emit hoverChanged(_id, _i);
 }