Changes in src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp [2d5137:7b93f9]

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp (modified) (5 diffs)

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

@@ -74 +74 @@
    void setSelected(bool value);
 
+   bool visible() const { return m_visible; }
+   virtual void setVisible(bool value);
+
    void initStaticMaterials();
-   void initialize(QGLView *view, QGLPainter *painter);
+   virtual void initialize(QGLView *view, QGLPainter *painter);
    virtual void draw(QGLPainter *painter, const QVector4D &cameraPlane);
    void drawSelectionBox(QGLPainter *painter);
@@ -94 +97 @@
    static void cleanMaterialMap();
 
+   void updateMesh(QGLSceneNode *scene);
+
    typedef std::map< size_t, QGLMaterial *> ElementMaterialMap;
    static ElementMaterialMap ElementNoMaterialMap;
@@ -100 +105 @@
    enum{DETAIL_HIGHEST, DETAIL_HIGH, DETAIL_MEDIUM, DETAIL_LOW, DETAILTYPES_MAX} DetailType;
 
+   static QGLSceneNode *meshEmpty[DETAILTYPES_MAX];
+   static QGLSceneNode *meshSphere[DETAILTYPES_MAX];
+   static QGLSceneNode *meshCylinder[DETAILTYPES_MAX];
+
 protected:
 
@@ -105 +114 @@
 
    QGLSceneNode *m_mesh[DETAILTYPES_MAX];
+   enum enum_MeshFreeType {
+     free_all,
+     free_single,
+     free_none
+   } MeshFreeType;
    QGLAbstractScene *m_scene;
    QVector3D m_position;
@@ -120 +134 @@
    bool m_hovering;
    bool m_selected;
+   bool m_visible;
 };