Changeset 1478 for trunk/packages/vizservers/nanovis/FlowCmd.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/FlowCmd.cpp (modified) (16 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -186 +186 @@
     
     glPushMatrix();
-    Vector3 *originPtr = volPtr->get_location();
-    glTranslatef(originPtr->x, originPtr->y, originPtr->z);
+    Vector3 origin = volPtr->location();
+    glTranslatef(origin.x, origin.y, origin.z);
 
     double sx, sy, sz;
@@ -272 +272 @@
     _interp = interp;
     _hashPtr = hPtr;
-    _volDataID = -1;                    /* Indicates that no volume slot has
-                                         * been allocated for this vector. */
     _sv.sliceVisible = 1;
     _sv.tfPtr = NanoVis::get_transfunc("default");
     _volPtr = NULL;
+    _volId = -1;
     _cmdToken = Tcl_CreateObjCommand(interp, (char *)_name, 
         (Tcl_ObjCmdProc *)FlowInstObjCmd, this, FlowInstDeleteProc);
@@ -296 +295 @@
     }
      if (_volPtr != NULL) {
-        _volPtr->unref();
-        _volPtr = NULL;
-        NanoVis::remove_volume(_volDataID);
-        NanoVis::vol_renderer->remove_volume(_volDataID);
+         assert((size_t)_volId == _volPtr->dataID());
+         fprintf(stderr, "from ~FlowCmd volId=%d\n", _volId);
+         NanoVis::remove_volume(_volId);
+         _volPtr = NULL;
     }
 
@@ -497 +496 @@
 
 void
-FlowCmd::InitVectorField(void)
-{
-    if (_volPtr != NULL) {
-        _volPtr->unref();
-        _volPtr = NULL;
-        NanoVis::remove_volume(_volDataID);
-        NanoVis::vol_renderer->remove_volume(_volDataID);
-    }
-    // Remove the associated vector field.
-    if (_fieldPtr != NULL) {
-        delete _fieldPtr;
-        _fieldPtr = NULL;
-    }
-    
-}
-
-void
 FlowCmd::InitializeParticles(void)
 {
@@ -528 +510 @@
 {
     if (_volPtr != NULL) {
-        _volPtr->unref();
+        assert((size_t)_volId == _volPtr->dataID());
+        fprintf(stderr, "from ScaleVectorField volId=%d\n", _volId);
+        NanoVis::remove_volume(_volId);
         _volPtr = NULL;
-        NanoVis::remove_volume(_volDataID);
-        NanoVis::vol_renderer->remove_volume(_volDataID);
     }
     float *vdata;
@@ -546 +528 @@
     _volPtr = volPtr;
 
+    // Remove the associated vector field.
+    if (_fieldPtr != NULL) {
+        delete _fieldPtr;
+    }
     _fieldPtr = new NvVectorField();
     if (_fieldPtr == NULL) {
@@ -556 +542 @@
     depth  = NanoVis::zMax - NanoVis::zMin;
 
-    Vector3 *locationPtr = _volPtr->get_location();
+    Vector3 loc = _volPtr->location();
     /*This is wrong. Need to compute origin. */
-    NanoVis::xOrigin = locationPtr->x;
-    NanoVis::yOrigin = locationPtr->y;
-    NanoVis::zOrigin = locationPtr->z;
-
-    _fieldPtr->setVectorField(_volPtr, *locationPtr, 
+    NanoVis::xOrigin = loc.x;
+    NanoVis::yOrigin = loc.y;
+    NanoVis::zOrigin = loc.z;
+
+    _fieldPtr->setVectorField(_volPtr, loc, 
         1.0f, height / width, depth  / width, NanoVis::magMax);
 
     if (NanoVis::licRenderer != NULL) {
-        NanoVis::licRenderer->setVectorField(_volPtr->id, 
-                *locationPtr,
+        NanoVis::licRenderer->setVectorField(_volPtr->id, loc,
                 1.0f / _volPtr->aspect_ratio_width,
                 1.0f / _volPtr->aspect_ratio_height,
@@ -632 +617 @@
 FlowCmd::MakeVolume(float *data)
 {
-    if (_volDataID < 0) {
-        _volDataID = NanoVis::generate_data_identifier();
-        Trace("VolumeDataID is %d\n", _volDataID);
-    }
     Volume *volPtr;
-    volPtr = NanoVis::load_volume(_volDataID, _dataPtr->xNum(), 
-        _dataPtr->yNum(), _dataPtr->zNum(), 4, data, 
-        NanoVis::magMin, NanoVis::magMax, 0);
+    /* Reuse the volume index. The first time it's -1, which means to generate
+     * a new volume slot. */
+    volPtr = NanoVis::load_volume(_volId, _dataPtr->xNum(), _dataPtr->yNum(), 
+        _dataPtr->zNum(), 4, data, NanoVis::magMin, NanoVis::magMax, 0);
+    /* Save the volume index.  This only matters the first time through. */
+    _volId = volPtr->dataID();
     volPtr->xAxis.SetRange(_dataPtr->xMin(), _dataPtr->xMax());
     volPtr->yAxis.SetRange(_dataPtr->yMin(), _dataPtr->yMax());
@@ -645 +629 @@
     volPtr->wAxis.SetRange(NanoVis::magMin, NanoVis::magMax);
 
-    /*volPtr->update_pending = false;*/
     Vector3 physicalMin(NanoVis::xMin, NanoVis::yMin, NanoVis::zMin);
     Vector3 physicalMax(NanoVis::xMax, NanoVis::yMax, NanoVis::zMax);
@@ -653 +636 @@
     // volPtr->set_n_slice(512- _volIndex);
     // TBD..
-    volPtr->set_n_slice(256);
+    volPtr->n_slices(256);
     volPtr->disable_cutplane(0);
     volPtr->disable_cutplane(1);
     volPtr->disable_cutplane(2);
 
-    NanoVis::vol_renderer->add_volume(volPtr, _sv.tfPtr);
-    volPtr->data(_sv.showVolume);
+    // Automatically set the volume with the previously configured values.
+    volPtr->transferFunction(_sv.tfPtr);
+    volPtr->data_enabled(_sv.showVolume);
     volPtr->outline(_sv.showOutline);
     volPtr->opacity_scale(_sv.opacity);
     volPtr->specular(_sv.specular);
     volPtr->diffuse(_sv.diffuse);
-
+    Trace("volume is now %d %d\n", _sv.showVolume, volPtr->visible());
+    volPtr->visible(_sv.showVolume);
     float dx0 = -0.5;
     float dy0 = -0.5*volPtr->height/volPtr->width;
     float dz0 = -0.5*volPtr->depth/volPtr->width;
-    volPtr->move(Vector3(dx0, dy0, dz0));
+    volPtr->location(Vector3(dx0, dy0, dz0));
     Volume::update_pending = true;
     return volPtr;
@@ -785 +770 @@
         return TCL_ERROR;
     }
+    Rappture::Unirect3d *dataPtr;
+    dataPtr = new Rappture::Unirect3d(nComponents);
+
     FlowCmd *flowPtr = (FlowCmd *)clientData;
     size_t length = buf.size();
     char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        Rappture::Unirect3d *dataPtr;
-        dataPtr = new Rappture::Unirect3d(nComponents);
         if (!dataPtr->ImportDx(result, nComponents, length - 4, bytes + 4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -798 +784 @@
         flowPtr->SetData(dataPtr);
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        Rappture::Unirect3d *dataPtr;
-        dataPtr = new Rappture::Unirect3d(nComponents);
         if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
             delete dataPtr;
@@ -812 +796 @@
             return TCL_ERROR;
         }
-        Rappture::Unirect3d *dataPtr;
-        dataPtr = new Rappture::Unirect3d(nComponents);
         dataPtr->Convert(u2dPtr);
         flowPtr->SetData(dataPtr);
@@ -819 +801 @@
     } else {
         fprintf(stderr, "header is %.14s\n", buf.bytes());
-        Rappture::Unirect3d *dataPtr;
         dataPtr = new Rappture::Unirect3d(nComponents);
         if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
@@ -833 +814 @@
         size_t length;
 
-        length = sprintf(info, "nv>data tag %s id 0 min %g max %g vmin %g vmax %g\n",
-                         flowPtr->name(), NanoVis::magMin,
-                         NanoVis::magMax, NanoVis::xMin, NanoVis::xMax);
+        length = sprintf(info, "nv>data tag %s min %g max %g\n",
+                flowPtr->name(), dataPtr->magMin(), dataPtr->magMax());
         nWritten  = write(0, info, length);
         assert(nWritten == (ssize_t)strlen(info));
@@ -1030 +1010 @@
     /* 
      * Step 2.  Generate the vector field from each data set. 
-     *          Delete the currently generated fields. 
      */
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
          flowPtr = NextFlow(&iter)) {
         if (!flowPtr->isDataLoaded()) {
-            continue;
-        }
-        flowPtr->InitVectorField();
-        if (!flowPtr->visible()) {
-            continue;
-        }
-        flowPtr->InitializeParticles();
+            continue;                   // Flow exists, but no data has
+                                        // been loaded yet.
+        }
+        if (flowPtr->visible()) {
+            flowPtr->InitializeParticles();
+        }
         if (!flowPtr->ScaleVectorField()) {
             return false;
         }
+        // FIXME: This doesn't work when there is more than one flow.
         licRenderer->set_offset(flowPtr->GetRelativePosition());
     }