Changes in src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp [2ad1ec:3927ef]

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (6 diffs)

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

@@ -25 +25 @@
 #include "GLMoleculeObject_atom.hpp"
 #include "GLMoleculeObject_bond.hpp"
+#include "GLMoleculeObject_molecule.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -74 +75 @@
         Runner != molecules.end();
         Runner++) {
-      // create molecule
+
       for (molecule::const_iterator atomiter = (*Runner)->begin();
           atomiter != (*Runner)->end();
@@ -109 +110 @@
   AtomsinSceneMap.insert( make_pair(_atom->getId(), atomObject) );
   connect (atomObject, SIGNAL(clicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
+  connect (atomObject, SIGNAL(changed()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(hoverChanged()), this, SIGNAL(changed()));
+  connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(BondsInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)));
   //bondsChanged(_atom);
@@ -134 +137 @@
 }
 
+/** ....
+ *
+ */
+void GLWorldScene::worldSelectionChanged()
+{
+  LOG(3, "INFO: GLWorldScene: Received signal selectionChanged.");
+
+  const std::vector<molecule*> &molecules = World::getInstance().getAllMolecules();
+
+  if (molecules.size() > 0) {
+    for (std::vector<molecule*>::const_iterator Runner = molecules.begin();
+        Runner != molecules.end();
+        Runner++) {
+
+      MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find((*Runner)->getId());
+      bool isSelected = World::getInstance().isSelected(*Runner);
+
+      // molecule selected but not in scene?
+      if (isSelected && (iter == MoleculesinSceneMap.end())){
+        // -> create new mesh
+        GLMoleculeObject_molecule *molObject = new GLMoleculeObject_molecule(this, *Runner);
+        MoleculesinSceneMap.insert( make_pair((*Runner)->getId(), molObject) );
+        connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
+        connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+        connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+        emit changed();
+        emit changeOccured();
+      }
+
+      // molecule not selected but in scene?
+      if (!isSelected && (iter != MoleculesinSceneMap.end())){
+        // -> remove from scene
+        moleculeRemoved(*Runner);
+      }
+
+    }
+  }
+}
+
+/** Removes a molecule from the scene.
+ *
+ * @param _molecule molecule to remove
+ */
+void GLWorldScene::moleculeRemoved(const molecule *_molecule)
+{
+  LOG(3, "INFO: GLWorldScene: Received signal moleculeRemoved for molecule "+toString(_molecule->getId())+".");
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molecule->getId());
+
+  // only remove if the molecule is in the scene
+  //  (= is selected)
+  if (iter != MoleculesinSceneMap.end()){
+    GLMoleculeObject_molecule *molObject = iter->second;
+    molObject->disconnect();
+    MoleculesinSceneMap.erase(iter);
+    delete molObject;
+    emit changed();
+    emit changeOccured();
+  }
+}
+
 /** Adds a bond to the scene.
  *
@@ -143 +206 @@
   LOG(3, "INFO: GLWorldScene::bondInserted() - Adding bond "+toString(*_bond)+".");
   //LOG(4, "INFO: Currently present bonds " << BondsinSceneMap << ".");
-  const double distance =
-      _bond->leftatom->getPosition().distance(_bond->rightatom->getPosition())/2.;
 
   BondIds ids;
@@ -161 +222 @@
 #endif
   GLMoleculeObject_bond *bondObject =
-      new GLMoleculeObject_bond(this, _bond, distance, side);
+      new GLMoleculeObject_bond(this, _bond, side);
   connect (
       bondObject, SIGNAL(BondRemoved(const atomId_t, const atomId_t)),
       this, SLOT(bondRemoved(const atomId_t, const atomId_t)));
+  connect (bondObject, SIGNAL(changed()), this, SIGNAL(changed()));
   BondsinSceneMap.insert( make_pair(ids, bondObject) );
 //    BondIdsinSceneMap.insert( Leftids );