Changeset 973 for trunk/vizservers/nanovis/nanovis.cpp

Timestamp:

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

Author:

gah

Message:

 

File:

• trunk/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)

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;