Changes in src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp [5aaa43:7b93f9]

File:

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

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

@@ -62 +62 @@
 QGLMaterial *GLMoleculeObject::m_selectionBoxMaterial = NULL;
 
+QGLSceneNode *GLMoleculeObject::meshEmpty[GLMoleculeObject::DETAILTYPES_MAX];
+QGLSceneNode *GLMoleculeObject::meshSphere[GLMoleculeObject::DETAILTYPES_MAX];
+QGLSceneNode *GLMoleculeObject::meshCylinder[GLMoleculeObject::DETAILTYPES_MAX];
 
 double GLMoleculeObject::detailMinDistance[GLMoleculeObject::DETAILTYPES_MAX] = {0, 15, 30, 42};
@@ -69 +72 @@
 {
    //mesh->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = mesh[i];
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh[i];
+  MeshFreeType = free_none;
+   m_scaleX = 1.0f;
+   m_scaleY = 1.0f;
+   m_scaleZ = 1.0f;
+   m_rotationAngle = 0.0f;
+   m_effect = 0;
+   m_objectId = -1;
+   m_hovering = false;
+   m_selected = false;
+   m_visible = true;
+   m_material = 0;
+   initStaticMaterials();
+}
+
+GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+   : QObject(parent)
+{
+   //mesh->setParent(this);
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh;
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -83 +107 @@
 }
 
-GLMoleculeObject::GLMoleculeObject(QGLSceneNode *mesh, QObject *parent)
+GLMoleculeObject::GLMoleculeObject(QGLAbstractScene *scene, QObject *parent)
    : QObject(parent)
 {
-   //mesh->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = mesh;
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = scene->mainNode();
+  MeshFreeType = free_none;
    m_scaleX = 1.0f;
    m_scaleY = 1.0f;
@@ -101 +125 @@
 }
 
-GLMoleculeObject::GLMoleculeObject(QGLAbstractScene *scene, QObject *parent)
-   : QObject(parent)
-{
-   scene->setParent(this);
-   for (int i=0;i<DETAILTYPES_MAX;i++)
-     m_mesh[i] = scene->mainNode();
-   m_scaleX = 1.0f;
-   m_scaleY = 1.0f;
-   m_scaleZ = 1.0f;
-   m_rotationAngle = 0.0f;
-   m_effect = 0;
-   m_objectId = -1;
-   m_hovering = false;
-   m_selected = false;
-   m_material = 0;
-   initStaticMaterials();
-}
-
 GLMoleculeObject::~GLMoleculeObject()
 {
@@ -163 +169 @@
    painter->modelViewMatrix().push();
    painter->modelViewMatrix().translate(m_position);
+   if ((m_scaleX != 1.0f) || (m_scaleY != 1.0f) || (m_scaleZ != 1.0f))
+     painter->modelViewMatrix().scale(m_scaleX, m_scaleY, m_scaleZ);
    if (m_rotationAngle != 0.0f)
      painter->modelViewMatrix().rotate(m_rotationAngle, m_rotationVector);
-   painter->modelViewMatrix().scale(m_scaleX, m_scaleY, m_scaleZ);
 
    // Apply the material and effect to the painter.
@@ -325 +332 @@
   }
 }
+
+void GLMoleculeObject::setVisible(bool value)
+{
+  if (value != m_visible){
+    m_visible = value;
+    emit changed();
+  }
+}
+
+void GLMoleculeObject::updateMesh(QGLSceneNode *mesh)
+{
+  if (m_mesh[0] != NULL) {
+    switch(MeshFreeType) {
+    case free_all:
+      for (int i=0;i<DETAILTYPES_MAX;i++)
+        delete m_mesh[i];
+      break;
+    case free_single:
+      delete m_mesh[0];
+      break;
+    default:
+    case free_none:
+      break;
+    }
+  }
+  MeshFreeType = free_single;
+  for (int i=0;i<DETAILTYPES_MAX;i++)
+    m_mesh[i] = mesh;
+}