Changes in src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp [ce4126:f115cc]

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp (modified) (7 diffs)

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

@@ -56 +56 @@
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_atom")+toString(_id)),
-  atomicid(_id)
+  atomicid(_id),
+  uptodatePosition(false),
+  uptodateElement(false)
 {
   // sign on as observer (obtain non-const instance before)
@@ -108 +110 @@
     ELOG(2, "Atom with id "+toString(atomicid)+" is already gone.");
   }
+  uptodatePosition = true;
 }
 
@@ -141 +144 @@
   }
   setScale( radius / 4. );
+
+  uptodateElement = true;
 }
 
@@ -165 +170 @@
   // selected?
   setSelected(World::getInstance().isAtomSelected(atomicid));
+}
+
+void GLMoleculeObject_atom::draw(QGLPainter *painter, const QVector4D &cameraPlane)
+{
+  // hook to update prior to painting
+  if (!uptodatePosition)
+    resetPosition();
+  if (!uptodateElement)
+    resetElement();
+
+  // call old hook to do the actual paining
+  GLMoleculeObject::draw(painter, cameraPlane);
 }
 
@@ -185 +202 @@
     switch (notification->getChannelNo()) {
       case AtomObservable::ElementChanged:
-        resetElement();
-        emit changed();
+        uptodateElement = false;
         break;
       case AtomObservable::IndexChanged:
@@ -192 +208 @@
         break;
       case AtomObservable::PositionChanged:
-        resetPosition();
-        emit changed();
+        uptodatePosition = false;
         break;
       case AtomObservable::BondsAdded:
@@ -199 +214 @@
         const atom *_atom = World::getInstance().getAtom(AtomById(atomicid));
         if (_atom != NULL) {
+          // make sure position is up-to-date
+          if (!uptodatePosition)
+            resetPosition();
           ASSERT(!_atom->getListOfBonds().empty(),
               "GLMoleculeObject_atom::recieveNotification() - received BondsAdded but ListOfBonds is empty.");