Changeset 973 for trunk/vizservers

Timestamp:

Mar 29, 2008, 10:40:15 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/vizservers/nanovis

Files:

• Command.cpp (modified) (5 diffs)
• RpDX.cpp (modified) (1 diff)
• TransferFunction.cpp (modified) (2 diffs)
• TransferFunction.h (modified) (1 diff)
• nanovis.cpp (modified) (2 diffs)
• nanovis.h (modified) (1 diff)

trunk/vizservers/nanovis/Command.cpp

@@ -973 +973 @@
  */
 static int
-TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *CONST *objv)
 {
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
+                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -986 +987 @@
         if (objc != 5) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " define name colormap alphamap\"", 
-                             (char*)NULL);
+                Tcl_GetString(objv[0]), " define name colorMap alphaMap\"", 
+                (char*)NULL);
             return TCL_ERROR;
         }
@@ -1002 +1003 @@
         }
         if ((cmapc % 4) != 0) {
-            Tcl_AppendResult(interp, "bad colormap in transfunc: should be ",
-                             "{ v r g b ... }", (char*)NULL);
+            Tcl_AppendResult(interp, "wrong # elements is colormap: should be ",
+                "{ v r g b ... }", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1011 +1012 @@
         if ((wmapc % 2) != 0) {
             Tcl_AppendResult(interp, "wrong # elements in alphamap: should be ",
-                             " { v w ... }", (char*)NULL);
+                " { v w ... }", (char*)NULL);
             return TCL_ERROR;
         }
         for (i = 0; i < cmapc; i += 4) {
             int j;
-            double vals[4];
+            double q[4];
 
             for (j=0; j < 4; j++) {
-                if (Tcl_GetDoubleFromObj(interp, cmapv[i+j], &vals[j]) != TCL_OK) {
+                if (Tcl_GetDoubleFromObj(interp, cmapv[i+j], &q[j]) != TCL_OK) {
                     return TCL_ERROR;
                 }
-                if ((vals[j] < 0.0) || (vals[j] > 1.0)) {
-                    Tcl_AppendResult(interp, "bad value \"", cmapv[i+j],
-                                     "\": should be in the range 0-1", (char*)NULL);
+                if ((q[j] < 0.0) || (q[j] > 1.0)) {
+                    Tcl_AppendResult(interp, "bad colormap value \"", 
+                        Tcl_GetString(cmapv[i+j]), 
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
             }
-            rFunc.define(vals[0], vals[1]);
-            gFunc.define(vals[0], vals[2]);
-            bFunc.define(vals[0], vals[3]);
+            rFunc.define(q[0], q[1]);
+            gFunc.define(q[0], q[2]);
+            bFunc.define(q[0], q[3]);
         }
         for (i=0; i < wmapc; i += 2) {
-            double vals[2];
+            double q[2];
             int j;
 
             for (j=0; j < 2; j++) {
-                if (Tcl_GetDoubleFromObj(interp, wmapv[i+j], &vals[j]) != TCL_OK) {
+                if (Tcl_GetDoubleFromObj(interp, wmapv[i+j], &q[j]) != TCL_OK) {
                     return TCL_ERROR;
                 }
-                if ((vals[j] < 0.0) || (vals[j] > 1.0)) {
-                    Tcl_AppendResult(interp, "bad value \"", wmapv[i+j],
-                                     "\": should be in the range 0-1", (char*)NULL);
+                if ((q[j] < 0.0) || (q[j] > 1.0)) {
+                    Tcl_AppendResult(interp, "bad alphamap value \"", 
+                        Tcl_GetString(wmapv[i+j]),
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
             }
-            wFunc.define(vals[0], vals[1]);
+            wFunc.define(q[0], q[1]);
         }
         // sample the given function into discrete slots
@@ -1052 +1055 @@
         float data[4*nslots];
         for (i=0; i < nslots; i++) {
-            double xval = double(i)/(nslots-1);
-            data[4*i]   = rFunc.value(xval);
-            data[4*i+1] = gFunc.value(xval);
-            data[4*i+2] = bFunc.value(xval);
-            data[4*i+3] = wFunc.value(xval);
-        }
-
+            double x = double(i)/(nslots-1);
+            data[4*i]   = rFunc.value(x);
+            data[4*i+1] = gFunc.value(x);
+            data[4*i+2] = bFunc.value(x);
+            data[4*i+3] = wFunc.value(x);
+        }
         // find or create this transfer function
-        TransferFunction *tf;
-        tf = NanoVis::get_transfunc(Tcl_GetString(objv[2]));
-        if (tf != NULL) {
-            tf->update(data);
-        } else {
-            tf = NanoVis::set_transfunc(Tcl_GetString(objv[2]), nslots, data);
-        }
+        NanoVis::DefineTransferFunction(Tcl_GetString(objv[2]), nslots, data);
     } else {
         Tcl_AppendResult(interp, "bad option \"", string,
-                         "\": should be define", (char*)NULL);
+                "\": should be define", (char*)NULL);
         return TCL_ERROR;
     }

trunk/vizservers/nanovis/RpDX.cpp

@@ -49 +49 @@
         // error
     }
-
     // open the file with libdx
     fprintf(stdout, "Calling DXImportDX(%s)\n", filename);

trunk/vizservers/nanovis/TransferFunction.cpp

@@ -18 +18 @@
 #include "TransferFunction.h"
 #include <memory.h>
+#include <assert.h>
 
-
-TransferFunction::TransferFunction(int _size, float* data)
+TransferFunction::TransferFunction(int size, float *data)
 {
-    tex = new Texture1D(_size, GL_FLOAT);
+    _tex = new Texture1D(size, GL_FLOAT);
 
     // _size : # of slot, 4 : rgba
-    size = _size * 4;
-    this->data = new float[size];
-    memcpy(this->data, data, sizeof(float) * size);
+    _size = size * 4;
+    _data = new float[_size];
+    memcpy(_data, data, sizeof(float) * _size);
 
-    tex->initialize_float_rgba(data);
-    id = tex->id;
+    _tex->initialize_float_rgba(_data);
+    id = _tex->id;
 }
 
@@ -36 +36 @@
 TransferFunction::~TransferFunction()
 { 
-    delete [] data;
-    delete tex; 
+    delete [] _data;
+    delete _tex; 
 }
 
-void TransferFunction::update(float* data)
+void 
+TransferFunction::update(float* data)
 {
-    memcpy(this->data, data, sizeof(float) * size);
-
-    tex->update_float_rgba(data);
+    memcpy(_data, data, sizeof(float) * _size);
+    _tex->update_float_rgba(_data);
 }
 
 
+void 
+TransferFunction::update(int size, float *data)
+{
+    assert((size*4) == _size);
+    update(data);
+}
+

trunk/vizservers/nanovis/TransferFunction.h

@@ -23 +23 @@
 
 class TransferFunction{
-  int size;     //the resolution of the color map, how many (RGBA) quadraples
-  float* data;
-  Texture1D* tex; //the texture storing the colors 
+    int _size;                  //the resolution of the color map, how many
+                                //(RGBA) quadraples
+    float* _data;
+    Texture1D* _tex;            //the texture storing the colors 
+    
+public:
+    GLuint id;                  //OpenGL's texture identifier
 
-public:
-  GLuint id;    //OpenGL's texture identifier
-  TransferFunction(int _size, float* data);
-  ~TransferFunction();
-  void update(float* data);
-    Texture1D* getTexture();
-  float* getData() { return data; }
+    TransferFunction(int size, float *data);
+    ~TransferFunction();
+    void update(float *data);
+    void update(int size, float *data);
+    Texture1D* getTexture(void) {
+        return _tex;
+    }
+    float* getData(void) { 
+        return _data; 
+    }
 };
 
-inline Texture1D* TransferFunction::getTexture()
-{
-    return tex;
-}
-
 #endif

trunk/vizservers/nanovis/nanovis.cpp

@@ -319 +319 @@
 // Creates of updates a colormap 1D texture by name.
 TransferFunction*
-NanoVis::set_transfunc(const char *name, int nSlots, float *data) 
+NanoVis::DefineTransferFunction(const char *name, size_t n, float *data) 
 {
     int isNew;
@@ -327 +327 @@
     hPtr = Tcl_CreateHashEntry(&tftable, name, &isNew);
     if (isNew) {
-        tf = new TransferFunction(nSlots, data);
-        Tcl_SetHashValue(hPtr, (ClientData)tf);
+        tf = new TransferFunction(n, data);
+        Tcl_SetHashValue(hPtr, (ClientData)tf);
     } else {
-        tf = (TransferFunction*)Tcl_GetHashValue(hPtr);
-        tf->update(data);
+        /* 
+         * You can't delete the transfer function because many 
+         * objects may be holding its pointer.  We must update it.
+         */
+        tf = (TransferFunction *)Tcl_GetHashValue(hPtr);
+        tf->update(n, data);
     }
     return tf;

trunk/vizservers/nanovis/nanovis.h

@@ -140 +140 @@
 
     static TransferFunction* get_transfunc(const char *name);
-    static TransferFunction* set_transfunc(const char *name, int nSlots, 
-                                           float *data);
+    static TransferFunction* DefineTransferFunction(const char *name, 
+        size_t n, float *data);
     static void SetVolumeRanges(void);
     static void SetHeightmapRanges(void);