Changeset 1478 for trunk/packages/vizservers/nanovis/Volume.h

Timestamp:

May 30, 2009 8:07:17 PM (15 years ago)

Author:

gah

Message:

Fix volume management routines to handle deletion

File:

• trunk/packages/vizservers/nanovis/Volume.h (modified) (18 diffs)

trunk/packages/vizservers/nanovis/Volume.h

@@ -26 +26 @@
 #include "AxisRange.h"
 #include "R2/R2Object.h"
+#include "TransferFunction.h"
 
 struct CutPlane{
@@ -38 +39 @@
 };
 
-enum {CUBIC, VOLQD, ZINCBLENDE};
-
-class Volume : public R2Object {
+class VolumeInterpolator;
+
+
+class Volume {
+protected:
+    TransferFunction *_tfPtr;           // This is the designated transfer 
+                                        // to use to render this volume.
+
+    float _specular;                    // Specular lighting parameter
+    float _diffuse;                     // Diffuse lighting parameter
+    float _opacity_scale;               // The scale multiplied to the opacity
+                                        // assigned by the transfer function.
+                                        // Rule of thumb: higher opacity_scale
+                                        // the object is to appear like
+                                        // plastic
+    int _volumeDataID;
+    Vector3 _physical_min;
+    Vector3 _physical_max;
+    float* _data;
+    
+    int _n_components;
+
+    double _nonzero_min;
+    
+    std::vector <CutPlane> _plane; // cut planes
+
+    Texture3D* _tex;            // OpenGL texture storing the volume
+
+    
+    int _pointsetIndex;
+
+    Vector3 _location;
+
+    int _n_slices;              // Number of slices when rendered. The greater
+                                // the better quality, lower speed.
+
+    bool _enabled; 
+
+    bool _data_enabled;         // show/hide cloud of volume data
+    
+    bool _outline_enabled;      // show/hide outline around volume
+
+    Color _outline_color;       // color for outline around volume
+
+    int _volume_type;           // cubic or zincblende
+    
+    int _iso_surface;
+
 public:
-    int                         _volumeDataID;
+    enum { CUBIC, VOLQD, ZINCBLENDE };
+    float aspect_ratio_width;
+    float aspect_ratio_height;
+    float aspect_ratio_depth;
+
+    NVISid id;                  //OpenGL textue identifier (==tex->id)
 
     int width;                  // The resolution of the data (how many points
@@ -50 +101 @@
     int depth;                  // Width, height and depth together determing
                                 // the proprotion of the volume ONLY.
-        
     float size;                 // This is the scaling factor that will size
                                 // the volume on screen.  A render program
@@ -57 +107 @@
                                 // objects. This size is provided by the
                                 // render engine.
-    Vector3 _physical_min;
-    Vector3 _physical_max;
 
     AxisRange xAxis, yAxis, zAxis, wAxis;
     static bool update_pending;
     static double valueMin, valueMax;
-
-    int n_components;
-
-    double nonzero_min;
-    
-    std::vector <CutPlane> plane; // cut planes
-
-    Texture3D* tex;             // OpenGL texture storing the volume
-
-    float* _data;
-    
-    int pointsetIndex;
-
-    Vector3 location;
-
-    bool enabled; 
-
-    int n_slice;                // Number of slices when rendered. The greater
-                                // the better quality, lower speed.
-
-    float _specular;            // specular lighting parameter
-    float _diffuse;             // diffuse lighting parameter
-    float _opacity_scale;       // The scale multiplied to the opacity assigned
-                                // by the transfer function.  Rule of thumb:
-                                // higher opacity_scale the object is to appear
-                                // like plastic
-    
-    bool data_enabled;          // show/hide cloud of volume data
-    
-    bool outline_enabled;       // show/hide outline around volume
-
-    Color outline_color;        // color for outline around volume
-
-    int volume_type;            // cubic or zincblende
-    
-    float aspect_ratio_width;
-    float aspect_ratio_height;
-    float aspect_ratio_depth;
-
-    NVISid id;                  //OpenGL textue identifier (==tex->id)
-
-    int iso_surface;
 
 public :
@@ -110 +116 @@
            float size, int n_component, float* data, double vmin, double vmax, 
            double nonzero_min);
-
-protected :
-    virtual ~Volume();
+    ~Volume();
         
 public :
     void visible(bool value) { 
-        enabled = value; 
+        _enabled = value; 
     }
     bool visible(void) { 
-        return enabled; 
-    }
-    void move(Vector3 _loc) { 
-        location = _loc; 
-    }
-
-    Vector3* get_location();
-    
-    void set_isosurface(int iso);
-    int get_isosurface() const;
-
-    double range_nzero_min() { return nonzero_min; }
-    
-    void set_n_slice(int val);  // set number of slices
-    int get_n_slice();          // return number of slices
-    
+        return _enabled; 
+    }
+    void location(Vector3 loc) { 
+        _location = loc; 
+    }
+    Vector3 location(void) const {
+        return _location;
+    }
+    int isosurface(void) const {
+        return _iso_surface;
+    }
+    void isosurface(int iso) {
+        _iso_surface = iso;
+    }
+    int n_components(void) {
+        return _n_components;
+    }
+    double nonzero_min(void) {
+        return _nonzero_min;
+    }
+    int volume_type(void) {
+        return _volume_type;
+    }
+    float *data(void) {
+        return _data;
+    }
+    Texture3D *tex(void) {
+        return _tex;
+    }
+
+    double range_nzero_min() { return _nonzero_min; }
+    
+    int n_slices(void) const {
+        return _n_slices;
+    }
+    void n_slices(int n) {
+        _n_slices = n;
+    }
+
     void set_size(float s);     //set the drawing size of volume 
 
@@ -166 +193 @@
         _opacity_scale = value;
     }
-    void data(bool value) {
-        data_enabled = value;
-    }
-    bool data(void) {
-        return data_enabled;
+    void data_enabled(bool value) {
+        _data_enabled = value;
+    }
+    bool data_enabled(void) {
+        return _data_enabled;
     }
     void outline(bool value) {
-        outline_enabled = value; 
+        _outline_enabled = value; 
     }
     bool outline(void) {
-        return outline_enabled;
+        return _outline_enabled;
+    }
+    TransferFunction *transferFunction(void) {
+        return _tfPtr;
+    }
+    void transferFunction(TransferFunction *tfPtr) {
+        _tfPtr = tfPtr;
     }
     void set_outline_color(float* rgb);
@@ -189 +222 @@
     Vector3& getPhysicalBBoxMax();
 
-    void setDataID(int id);
-    int getDataID() const;
+    void dataID(size_t index) {
+        _volumeDataID = index;
+    }
+    size_t dataID(void) const {
+        return _volumeDataID;
+    }
 };
 
-inline Vector3* Volume::get_location() { 
-    return &location; 
-}
 inline 
-int Volume::add_cutplane(int _orientation, float _location) {
-    plane.push_back(CutPlane(1, 0.5));
-    return plane.size() - 1;
+int Volume::add_cutplane(int orientation, float location) {
+    _plane.push_back(CutPlane(1, 0.5));
+    return _plane.size() - 1;
 }
 
@@ -206 +240 @@
 { 
     //assert(index < plane.size());
-    plane[index].enabled = true;
+    _plane[index].enabled = true;
 }
 inline void 
@@ -212 +246 @@
 {
     //assert(index < plane.size());
-    plane[index].enabled = false;
+    _plane[index].enabled = false;
 }
 
@@ -219 +253 @@
 {
     //assert(index < plane.size());
-    plane[index].offset = location;
+    _plane[index].offset = location;
 }
 
@@ -226 +260 @@
 {
     //assert(index < plane.size());
-    return &plane[index];
+    return &_plane[index];
 }
 
@@ -232 +266 @@
 Volume::get_cutplane_count()
 {
-    return plane.size();
+    return _plane.size();
 }
 
@@ -239 +273 @@
 {
     //assert(index < plane.size());
-    return plane[index].enabled; 
-}
-
-inline void 
-Volume::set_n_slice(int n) 
-{ 
-    n_slice = n; 
-}
-
-inline int 
-Volume::get_n_slice() 
-{ 
-    return n_slice; 
+    return _plane[index].enabled; 
 }
 
@@ -258 +280 @@
 { 
     size = s; 
-    aspect_ratio_width = s*tex->aspect_ratio_width;
-    aspect_ratio_height = s*tex->aspect_ratio_height;
-    aspect_ratio_depth = s*tex->aspect_ratio_depth;
+    aspect_ratio_width  = s * _tex->aspect_ratio_width;
+    aspect_ratio_height = s * _tex->aspect_ratio_height;
+    aspect_ratio_depth  = s * _tex->aspect_ratio_depth;
 }
 
@@ -266 +288 @@
 Volume::set_outline_color(float *rgb) 
 {
-    outline_color = Color(rgb[0],rgb[1],rgb[2]);
+    _outline_color = Color(rgb[0],rgb[1],rgb[2]);
 }
 
@@ -272 +294 @@
 Volume::get_outline_color(float *rgb) 
 {
-    outline_color.GetRGB(rgb);
+    _outline_color.GetRGB(rgb);
 }
 
@@ -281 +303 @@
 }
 
-inline int 
-Volume::get_isosurface() const
-{
-    return iso_surface;
-}
-
-inline void 
-Volume::set_isosurface(int iso) 
-{
-    iso_surface = iso;
-}
 
 inline void 
@@ -322 +333 @@
 }
 
-inline void 
-Volume::setDataID(int id)
-{
-        _volumeDataID = id;
-}
-
-inline int 
-Volume::getDataID() const
-{
-        return _volumeDataID;
-}
 
 #endif