Changes in src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp [b6d92e:5a9f4c]

File:

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

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

@@ -71 +71 @@
   setOption(QGLView::ObjectPicking, true);
   setOption(QGLView::CameraNavigation, false);
-  setFocusPolicy(Qt::StrongFocus);
   setCameraControlMode(Rotate);
   defaultEyeSeparation = 4.0;
@@ -79 +78 @@
   //changeMaterials(false);
 
-  qRegisterMetaType<atomId_t>("atomId_t");
-  qRegisterMetaType<moleculeId_t>("moleculeId_t");
+  qRegisterMetaType<atomicNumber_t>("atomicNumber_t");
 
   connect(this, SIGNAL(ShapeAdded()), worldscene, SLOT(addShape()));
   connect(this, SIGNAL(ShapeRemoved()), worldscene, SLOT(removeShape()));
-  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
   connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect(worldscene, SIGNAL(hoverChanged(const atom &)), this, SLOT(sceneHoverSignalled(const atom &)));
-  connect(worldscene, SIGNAL(hoverChanged(const molecule &, int)), this, SLOT(sceneHoverSignalled(const molecule &, int)));
+  connect(worldscene, SIGNAL(hoverChanged(const atom *)), this, SLOT(sceneHoverSignalled(const atom *)));
+  connect(this, SIGNAL(atomInserted(const atomicNumber_t)), worldscene, SLOT(atomInserted(const atomicNumber_t)));
+  connect(this, SIGNAL(atomRemoved(const atomicNumber_t)), worldscene, SLOT(atomRemoved(const atomicNumber_t)));
   connect(this, SIGNAL(worldSelectionChanged()), worldscene, SLOT(worldSelectionChanged()));
-  connect(this, SIGNAL(moleculeRemoved(const moleculeId_t)), worldscene, SLOT(moleculeRemoved(const moleculeId_t)));
-  connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
+  connect(this, SIGNAL(moleculeRemoved(const molecule *)), worldscene, SLOT(moleculeRemoved(const molecule *)));
+  //connect(this, SIGNAL(moleculeInserted(const molecule *)), worldscene, SLOT(moleculeInserted(const molecule *)));
   //connect(this, SIGNAL(changed()), this, SLOT(updateGL()));
   connect(this, SIGNAL(changed()), this, SLOT(sceneChangeSignalled()));
-  connect(this, SIGNAL(moleculesVisibilityChanged(const moleculeId_t,bool)), worldscene, SLOT(moleculesVisibilityChanged(const moleculeId_t,bool)));
 
   // sign on to changes in the world
   World::getInstance().signOn(this);
+  World::getInstance().signOn(this, World::AtomInserted);
+  World::getInstance().signOn(this, World::AtomRemoved);
   World::getInstance().signOn(this, World::MoleculeInserted);
   World::getInstance().signOn(this, World::MoleculeRemoved);
@@ -338 +337 @@
   if (static_cast<World *>(publisher) == World::getPointer()) {
     switch (notification->getChannelNo()) {
+      case World::AtomInserted:
+      {
+        const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
+  #endif
+        emit atomInserted(_id);
+        break;
+      }
+      case World::AtomRemoved:
+      {
+        const atomicNumber_t _id = World::getInstance().lastChanged<atom>()->getId();
+  #ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been removed.";
+  #endif
+        emit atomRemoved(_id);
+        break;
+      }
       case World::SelectionChanged:
       {
@@ -348 +365 @@
       case World::MoleculeInserted:
       {
-        const molecule * _mol = World::getInstance().lastChanged<molecule>();
+        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_mol->getId())+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
   #endif
-        emit moleculeInserted(_mol);
+        emit moleculeInserted(_molecule);
         break;
       }
       case World::MoleculeRemoved:
       {
-        const moleculeId_t _id = World::getInstance().lastChanged<molecule>()->getId();
+        const molecule *_molecule = World::getInstance().lastChanged<molecule>();
   #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been removed.";
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_molecule->getId())+" has been removed.";
   #endif
-        emit moleculeRemoved(_id);
+        emit moleculeRemoved(_molecule);
         break;
       }
@@ -376 +393 @@
 #endif
         emit changed();
-        emit TimeChanged();
         break;
       }
@@ -500 +516 @@
 void GLWorldView::keyPressEvent(QKeyEvent *e)
 {
-  // Find the distance between the eye and focus point.
-  QVector3D d = camera()->eye() - camera()->center();
-//  LOG(1, "Distance vector eye and center is "
-//      << d.x() << "," << d.y() << "," << d.z());
-  // scale the move unit by the eye <-> domain center distance
-  const double key_move_unit = 0.04*(d.length()/50.);
-
   if (e->key() == Qt::Key_Tab) {
     // The Tab key turns the ShowPicking option on and off,
@@ -512 +521 @@
     setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
     updateGL();
-  } else if ((e->key() == Qt::Key_Minus) || (e->key() == Qt::Key_Plus)) {
-    // Scale the distance.
-    if (e->key() == Qt::Key_Minus)
-      d *= 1.2;
-    else if (e->key() == Qt::Key_Plus)
-      d /= 1.2;
-    // Set new eye position.
-    camera()->setEye(camera()->center() + d);
-  } else if ((e->key() == Qt::Key_Left) || (e->key() == Qt::Key_Right)) {
-    // Translate the camera.
-    const double d = (e->key() == Qt::Key_Left) ? -key_move_unit : key_move_unit;
-    camera()->translateCenter( d, 0., 0);
-    camera()->translateEye( d, 0., 0);
-  } else if ((e->key() == Qt::Key_Up) || (e->key() == Qt::Key_Down)) {
-    // Translate the camera.
-    const double d = (e->key() == Qt::Key_Up) ? -key_move_unit : key_move_unit;
-    camera()->translateCenter( 0., d, 0);
-    camera()->translateEye( 0., d, 0);
-  } else if ((e->key() == Qt::Key_PageUp) || (e->key() == Qt::Key_PageDown)) {
-    // Translate the camera.
-    const double d = (e->key() == Qt::Key_PageUp) ? -key_move_unit : key_move_unit;
-    camera()->translateCenter( 0., 0., d);
-    camera()->translateEye( 0., 0., d);
   }
   QGLView::keyPressEvent(e);
@@ -762 +748 @@
 }
 
-void GLWorldView::sceneHoverSignalled(const atom &_atom)
+void GLWorldView::sceneHoverSignalled(const atom *_atom)
 {
   emit hoverChanged(_atom);
 }
-
-void GLWorldView::sceneHoverSignalled(const molecule &_mol, int _i)
-{
-  emit hoverChanged(_mol, _i);
-}