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

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),
-  uptodatePosition(false),
-  uptodateElement(false)
+  atomicid(_id)
 {
   // sign on as observer (obtain non-const instance before)
@@ -110 +108 @@
     ELOG(2, "Atom with id "+toString(atomicid)+" is already gone.");
   }
-  uptodatePosition = true;
 }
 
@@ -144 +141 @@
   }
   setScale( radius / 4. );
-
-  uptodateElement = true;
 }
 
@@ -170 +165 @@
   // 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);
 }
 
@@ -202 +185 @@
     switch (notification->getChannelNo()) {
       case AtomObservable::ElementChanged:
-        uptodateElement = false;
+        resetElement();
+        emit changed();
         break;
       case AtomObservable::IndexChanged:
@@ -208 +192 @@
         break;
       case AtomObservable::PositionChanged:
-        uptodatePosition = false;
+        resetPosition();
+        emit changed();
         break;
       case AtomObservable::BondsAdded:
@@ -214 +199 @@
         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.");