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

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/nanovis.cpp (modified) (11 diffs)

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -17 +17 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <fstream>
@@ -106 +107 @@
 int NanoVis::updir = Y_POS;
 NvCamera* NanoVis::cam = NULL;
-NanoVis::VolumeMap NanoVis::volumeMap;
-int  NanoVis::_last_data_id = 0;
+vector<Volume *>  NanoVis::volumes;
 vector<HeightMap*> NanoVis::heightMap;
-VolumeRenderer* NanoVis::vol_renderer = 0;
-PointSetRenderer* NanoVis::pointset_renderer = 0;
+VolumeRenderer* NanoVis::vol_renderer = NULL;
+PointSetRenderer* NanoVis::pointset_renderer = NULL;
 vector<PointSet*> NanoVis::pointSet;
-PlaneRenderer* NanoVis::plane_render = 0;
+PlaneRenderer* NanoVis::plane_render = NULL;
 Texture2D* NanoVis::plane[10];
 NvColorTableRenderer* NanoVis::color_table_renderer = NULL;
@@ -426 +426 @@
     if (path == NULL) {
         fprintf(stderr, "can't find program \"%s\"\n", fileName);
-        assert(path != NULL);
-    }
-    printf("cg program compiling: %s\n", path);
+        Trace("can't find program \"%s\"\n", fileName);
+    }
+    Trace("cg program compiling: %s\n", path);
     fflush(stdout);
     CGprogram program;
@@ -434 +434 @@
                                       entryPoint, NULL);
     cgGLLoadProgram(program);
-
     CGerror LastError = cgGetError();
-    if (LastError)
-        {
-            printf("Error message: %s\n", cgGetLastListing(context));
-        }
-
+    if (LastError) {
+        printf("Error message: %s\n", cgGetLastListing(context));
+        Trace("Error message: %s\n", cgGetLastListing(context));
+    }
+    Trace("successfully compiled program: %s\n", path);
     delete [] path;
-
     return program;
 }
@@ -514 +512 @@
  */
 Volume *
-NanoVis::load_volume(int volDataID, int width, int height, int depth,
+NanoVis::load_volume(int dataID, int width, int height, int depth,
                      int n_component, float* data, double vmin,
                      double vmax, double nzero_min)
 {
-    NanoVis::VolumeMap::iterator iter  = volumeMap.find(volDataID);
-    if (iter != volumeMap.end())
-    {
-        Volume* vol = iter->second;
-        if (vol != NULL) 
-        {
-            iter->second = NULL;
-
-            if (vol->pointsetIndex != -1) 
-            {
-                // TBD
-                /*
-                if (((unsigned  int) vol->pointsetIndex) < pointSet.size() &&
-                    pointSet[vol->pointsetIndex] != NULL) {
-                    delete pointSet[vol->pointsetIndex];
-                    pointSet[vol->pointsetIndex] = 0;
-                }
-                */
-            }
-        }
-        vol->unref();
-    }
-
-    Volume* newVol = new Volume(0.f, 0.f, 0.f, width, height, depth, 1.,
-                               n_component, data, vmin, vmax, nzero_min);
-    newVol->setDataID(volDataID);
-    volumeMap[volDataID] = newVol;
-    
-    
-    fprintf(stderr, "VOLID=%d, # of volumes=%d\n", volDataID, volumeMap.size());
-    return newVol;
+    // 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());
+    return volPtr;
 }
 
@@ -1241 +1230 @@
         srcRowPtr += bytesPerRow;
     }
-    writev(0, iov, nRecs);
+    if (writev(0, iov, nRecs) < 0) {
+        fprintf(stderr, "write failed: %s\n", strerror(errno));
+    }
     free(iov);
     stats.nFrames++;
@@ -1281 +1272 @@
     iov[1].iov_base = (char *)data;
     iov[1].iov_len = dlen;
-    writev(0, iov, nRecs);
+    if (writev(0, iov, nRecs) < 0) {
+        fprintf(stderr, "write failed: %s\n", strerror(errno));
+    }
     free(iov);
     // stats.nFrames++;
@@ -1547 +1540 @@
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
-    NanoVis::VolumeMap::iterator iter;
-    for (iter = volumeMap.begin(); iter != volumeMap.end(); ++iter)
-    {
-        Volume *volPtr = iter->second;
-
+    vector<Volume *>::iterator iter;
+    for (iter = volumes.begin(); iter != volumes.end(); ++iter) {
+        Volume *volPtr;
+
+        volPtr = (*iter);
         if (volPtr == NULL) {
-            continue;
-        }
-        if (!volPtr->visible()) {
-            continue;
+            continue;                   // Empty slot.
         }
         if (xMin > volPtr->xAxis.min()) {
@@ -1879 +1869 @@
             volPtr->disable_cutplane(1);
             volPtr->disable_cutplane(2);
-            
-            NanoVis::vol_renderer->add_volume(volPtr,
-                NanoVis::get_transfunc("default"));
+            volPtr->transferFunction(NanoVis::get_transfunc("default"));
+
             float dx0 = -0.5;
             float dy0 = -0.5*volPtr->height/volPtr->width;
@@ -2278 +2267 @@
         iov[2].iov_len = 1;
         iov[2].iov_base = (char *)'\n';
-        writev(0, iov, 3);
+        if (writev(0, iov, 3) < 0) {
+            fprintf(stderr, "write failed: %s\n", strerror(errno));
+        }
         if (debug_flag) {
             fprintf(stderr, "leaving xinetd_listen\n");
@@ -2557 +2548 @@
 }
 
-int NanoVis::generate_data_identifier()
-{
-    return _last_data_id++;
-}
-
-void NanoVis::remove_volume(int volDataID)
-{
-
-    NanoVis::VolumeMap::iterator iter  = volumeMap.find(volDataID);
-    if (iter != volumeMap.end())
-    {
-        (*iter).second->unref();
-        volumeMap.erase(iter);
-    }
-}
+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.
+}