Changes in src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp [3927ef:ed26ae]

File:

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

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

@@ -41 +41 @@
 {
   QGLBuilder builder;
-  builder << QGLSphere(2.0);
+  builder << QGLSphere(0.5);
   QGLSceneNode *n = builder.finalizedSceneNode();
   n->setParent(parent);
@@ -57 +57 @@
   atomref->signOn(this, AtomObservable::ElementChanged);
   atomref->signOn(this, AtomObservable::BondsAdded);
-  World::getInstance().signOn(this, World::SelectionChanged);
 
   // set the object's id
@@ -73 +72 @@
   _atom->signOff(this, AtomObservable::ElementChanged);
   _atom->signOff(this, AtomObservable::BondsAdded);
-  World::getInstance().signOff(this, World::SelectionChanged);
 }
 
@@ -106 +104 @@
       "GLMoleculeObject_atom::GLMoleculeObject_atom() - QGLMaterial ref from getter function is NULL.");
   setMaterial(elementmaterial);
+  QGLMaterial *hovermaterial = getMaterial(0); // 0 is the hover material
+  ASSERT(hovermaterial != NULL,
+      "GLMoleculeObject_atom::GLMoleculeObject_atom() - QGLMaterial ref from getter function for hover is NULL.");
+  setHoverMaterial(hovermaterial);
 
   // set scale
@@ -114 +116 @@
     radius = 0.5;
   }
-  setScale( radius / 4. );
+  setScale( radius );
 }
 
@@ -134 +136 @@
   // set the object's id
   resetIndex();
-
-  // selected?
-  setSelected(World::getInstance().isSelected(_atom));
 }
 
@@ -144 +143 @@
 void GLMoleculeObject_atom::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  if (publisher == dynamic_cast<const Observable*>(_atom)){
-    // notofication from atom
 #ifdef LOG_OBSERVER
-    observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(this)
-          << " received notification from atom " << _atom->getId() << " for channel "
-          << notification->getChannelNo() << ".";
+  observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(this)
+      << " received notification from atom " << _atom->getId() << " for channel "
+      << notification->getChannelNo() << ".";
 #endif
-    switch (notification->getChannelNo()) {
-      case AtomObservable::ElementChanged:
-        resetElement();
-        emit changed();
+  switch (notification->getChannelNo()) {
+    case AtomObservable::ElementChanged:
+      resetElement();
+      break;
+    case AtomObservable::IndexChanged:
+      resetIndex();
+      break;
+    case AtomObservable::PositionChanged:
+      resetPosition();
+      break;
+    case AtomObservable::BondsAdded:
+      {
+        ASSERT(!_atom->getListOfBonds().empty(),
+            "GLMoleculeObject_atom::recieveNotification() - received BondsAdded but ListOfBonds is empty.");
+        const bond * _bond = *(_atom->getListOfBonds().rbegin());
+        const GLMoleculeObject_bond::SideOfBond side = (_bond->leftatom == _atom) ?
+            GLMoleculeObject_bond::left : GLMoleculeObject_bond::right;
+        emit BondsInserted(_bond, side);
         break;
-      case AtomObservable::IndexChanged:
-        resetIndex();
-        break;
-      case AtomObservable::PositionChanged:
-        resetPosition();
-        emit changed();
-        break;
-      case AtomObservable::BondsAdded:
-      {
-          ASSERT(!_atom->getListOfBonds().empty(),
-              "GLMoleculeObject_atom::recieveNotification() - received BondsAdded but ListOfBonds is empty.");
-          const bond * _bond = *(_atom->getListOfBonds().rbegin());
-          const GLMoleculeObject_bond::SideOfBond side = (_bond->leftatom == _atom) ?
-              GLMoleculeObject_bond::left : GLMoleculeObject_bond::right;
-          emit BondsInserted(_bond, side);
-          break;
-        }
-      default:
-        //setProperties();
-        break;
-    }
-  }else{
-    // notification from world
-#ifdef LOG_OBSERVER
-    observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(this)
-          << " received notification from world for channel "
-          << notification->getChannelNo() << ".";
-#endif
-    switch (notification->getChannelNo()) {
-      case World::SelectionChanged:
-        setSelected(World::getInstance().isSelected(_atom));
-        break;
-      default:
-        break;
-    }
+      }
+    default:
+      //setProperties();
+      break;
   }
 }