Changeset 1493 for trunk/packages/vizservers/nanovis/nanovis.cpp

Timestamp:

Jun 8, 2009 8:31:59 AM (15 years ago)

Author:

gah

Message:

Changed vector id to name

File:

• trunk/packages/vizservers/nanovis/nanovis.cpp (modified) (10 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -77 +77 @@
 
 extern void NvInitCG(); // in Shader.cpp
-extern bool load_vector_stream2(Rappture::Outcome &result, int index, 
-        size_t length, char *string);
 
 // Indicates "up" axis:  x=1, y=2, z=3, -x=-1, -y=-2, -z=-3
@@ -107 +105 @@
 int NanoVis::updir = Y_POS;
 NvCamera* NanoVis::cam = NULL;
-vector<Volume *>  NanoVis::volumes;
+Tcl_HashTable NanoVis::volumeTable;
 vector<HeightMap*> NanoVis::heightMap;
 VolumeRenderer* NanoVis::vol_renderer = NULL;
@@ -174 +172 @@
 
 // maps transfunc name to TransferFunction object
-static Tcl_HashTable tftable;
+Tcl_HashTable NanoVis::tfTable;
 
 // pointers to 2D planes, currently handle up 10
@@ -513 +511 @@
  */
 Volume *
-NanoVis::load_volume(int dataID, int width, int height, int depth,
-                     int n_component, float* data, double vmin,
-                     double vmax, double nzero_min)
-{
-    // Check if we're attempting to load the volume into an already
-    // occupied slot.
-
-        
-    Volume* volPtr = new Volume(0.f, 0.f, 0.f, width, height, depth, 1.,
-                                n_component, data, vmin, vmax, nzero_min);
-    if (dataID < 0) {
-        dataID = volumes.size();
-        volumes.push_back(volPtr);
-    } else {
-        int i;
-        // Create new slots it needed.
-        for (i = volumes.size(); i <= dataID; i++) {
-            volumes.push_back(NULL);
-        }
-        assert (volumes[dataID] == NULL);
-        volumes[dataID] = volPtr;
-    }
-    volPtr->dataID(dataID);
-    fprintf(stderr, "VOLID=%d, # of volume slots=%d\n", dataID, 
-            volumes.size());
+NanoVis::load_volume(const char *name, int width, int height, int depth, 
+                     int n_component, float* data, double vmin, double vmax, 
+                     double nzero_min)
+{
+    Tcl_HashEntry *hPtr;
+    hPtr = Tcl_FindHashEntry(&NanoVis::volumeTable, name);
+    if (hPtr != NULL) {
+        Volume *volPtr; 
+        Trace("volume \"%s\" already exists", name);
+        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
+        remove_volume(volPtr);
+    }
+    int isNew;
+    hPtr = Tcl_CreateHashEntry(&NanoVis::volumeTable, name, &isNew);
+    Volume* volPtr;
+    volPtr = new Volume(0.f, 0.f, 0.f, width, height, depth, 1., n_component,
+                data, vmin, vmax, nzero_min);
+    Tcl_SetHashValue(hPtr, volPtr);
+    volPtr->name(Tcl_GetHashKey(&NanoVis::volumeTable, hPtr));
     return volPtr;
 }
@@ -547 +539 @@
     Tcl_HashEntry *hPtr;
 
-    hPtr = Tcl_FindHashEntry(&tftable, name);
+    hPtr = Tcl_FindHashEntry(&tfTable, name);
     if (hPtr == NULL) {
         return NULL;
@@ -560 +552 @@
     int isNew;
     Tcl_HashEntry *hPtr;
-    TransferFunction *tf;
-
-    hPtr = Tcl_CreateHashEntry(&tftable, name, &isNew);
+    TransferFunction *tfPtr;
+
+    hPtr = Tcl_CreateHashEntry(&tfTable, name, &isNew);
     if (isNew) {
-        tf = new TransferFunction(n, data);
-        Tcl_SetHashValue(hPtr, (ClientData)tf);
+        tfPtr = new TransferFunction(n, data);
+        tfPtr->name(Tcl_GetHashKey(&tfTable, hPtr));
+        Tcl_SetHashValue(hPtr, tfPtr);
     } else {
         /* 
@@ -571 +564 @@
          * objects may be holding its pointer.  We must update it.
          */
-        tf = (TransferFunction *)Tcl_GetHashValue(hPtr);
-        tf->update(n, data);
-    }
-    return tf;
+        tfPtr = (TransferFunction *)Tcl_GetHashValue(hPtr);
+        tfPtr->update(n, data);
+    }
+    return tfPtr;
 }
 
@@ -916 +909 @@
 
     // init table of transfer functions
-    Tcl_InitHashTable(&tftable, TCL_STRING_KEYS);
+    Tcl_InitHashTable(&tfTable, TCL_STRING_KEYS);
 
     //check if performance query is supported
@@ -1542 +1535 @@
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
-    vector<Volume *>::iterator iter;
-    for (iter = volumes.begin(); iter != volumes.end(); ++iter) {
+    Tcl_HashEntry *hPtr;
+    Tcl_HashSearch iter;
+    for (hPtr = Tcl_FirstHashEntry(&volumeTable, &iter); hPtr != NULL;
+         hPtr = Tcl_NextHashEntry(&iter)) {
         Volume *volPtr;
 
-        volPtr = (*iter);
-        if (volPtr == NULL) {
-            continue;                   // Empty slot.
-        }
+        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
         if (xMin > volPtr->xAxis.min()) {
             xMin = volPtr->xAxis.min();
@@ -2555 +2547 @@
 
 void 
-NanoVis::remove_volume(size_t index)
-{
-    fprintf(stderr, "index=%d #volumes=%d\n", index, volumes.size());
-    assert(index < volumes.size());
-    Volume* volPtr;
-    volPtr = volumes[index];
-    if (volPtr == NULL)  {
-        return;                         // Empty slot 
-    }
-    delete volPtr;                      // Delete the volume and mark the 
-    volumes[index] = NULL;              // slot as empty.
+NanoVis::remove_volume(Volume *volPtr)
+{
+    Tcl_HashEntry *hPtr;
+    hPtr = Tcl_FindHashEntry(&volumeTable, volPtr->name());
+    if (hPtr != NULL) {
+        Tcl_DeleteHashEntry(hPtr);
+    }
+    delete volPtr;                      
 }