Changeset 1469 for trunk/packages/vizservers

Timestamp:

May 27, 2009, 6:16:36 PM (15 years ago)

Author:

gah

Message:

change unirect?d parsing for flows to not call Tcl command

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (14 diffs)
• FlowCmd.h (modified) (1 diff)
• NvParticleRenderer.cpp (modified) (1 diff)
• Unirect.cpp (modified) (1 diff)
• Unirect.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -115 +115 @@
 }
 
+FlowParticles::~FlowParticles(void) 
+{
+    if (_rendererPtr != NULL) {
+        delete _rendererPtr;
+    }
+    if (_hashPtr != NULL) {
+        Tcl_DeleteHashEntry(_hashPtr);
+    }
+    Rappture::FreeSwitches(_switches, &_sv, 0);
+}
+
 void
 FlowParticles::Render(void) 
@@ -187 +198 @@
     float x0, y0, z0, x1, y1, z1;
     x0 = y0 = z0 = 0.0f;
-    x1 = y1 = z1 = 1.0f;
+    x1 = y1 = z1 = 0.0f;
     if (max.y  > min.y) {
         y0 = (_sv.corner1.y - min.y) / (max.y - min.y);
@@ -661 +672 @@
 }
 
+
 static int
 FlowDataFileOp(ClientData clientData, Tcl_Interp *interp, int objc,
@@ -692 +704 @@
     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)) {
@@ -702 +713 @@
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
         Rappture::Unirect3d *dataPtr;
-        Tcl_CmdInfo cmdInfo;
-
-        /* Set the clientdata field of the unirect3d command to contain
-         * the local data structure. */
         dataPtr = new Rappture::Unirect3d(nComponents);
-        if (!Tcl_GetCommandInfo(interp, "unirect3d", &cmdInfo)) {
-            return TCL_ERROR;
-        }
-        cmdInfo.objClientData = (ClientData)dataPtr;    
-        Tcl_SetCommandInfo(interp, "unirect3d", &cmdInfo);
-        Tcl_Obj *objPtr;
-        objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
-        int result;
-        Tcl_IncrRefCount(objPtr);
-        result = Tcl_GlobalEvalObj(interp, objPtr);
-        Tcl_DecrRefCount(objPtr);
-        if (result != TCL_OK) {
+        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
         }
-        if (!dataPtr->isInitialized()) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
         flowPtr->SetData(dataPtr);
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Rappture::Unirect2d *dataPtr;
-        Tcl_CmdInfo cmdInfo;
-
-        /* Set the clientdata field of the unirect3d command to contain
-         * the local data structure. */
-        dataPtr = new Rappture::Unirect2d();
-        if (!Tcl_GetCommandInfo(interp, "unirect2d", &cmdInfo)) {
+        Rappture::Unirect2d *u2dPtr;
+        u2dPtr = new Rappture::Unirect2d(nComponents);
+        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete u2dPtr;
             return TCL_ERROR;
         }
-        cmdInfo.objClientData = (ClientData)dataPtr;    
-        Tcl_SetCommandInfo(interp, "unirect2d", &cmdInfo);
-        Tcl_Obj *objPtr;
-        objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
-        int result;
-        Tcl_IncrRefCount(objPtr);
-        result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
-        Tcl_DecrRefCount(objPtr);
-        if (result != TCL_OK) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-        if (!dataPtr->isInitialized()) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-        Rappture::Unirect3d *d3Ptr = new Rappture::Unirect3d(nComponents);
-        d3Ptr->Convert(dataPtr);
-        flowPtr->SetData(d3Ptr);
-        delete dataPtr;
+        Rappture::Unirect3d *dataPtr;
+        dataPtr = new Rappture::Unirect3d(nComponents);
+        dataPtr->Convert(u2dPtr);
+        flowPtr->SetData(dataPtr);
+        delete u2dPtr;
     } else {
+        fprintf(stderr, "header is %.14s\n", buf.bytes());
         Rappture::Unirect3d *dataPtr;
-
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
         dataPtr = new Rappture::Unirect3d(nComponents);
         if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
@@ -816 +789 @@
     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)) {
@@ -826 +798 @@
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
         Rappture::Unirect3d *dataPtr;
-        Tcl_CmdInfo cmdInfo;
-
-        /* Set the clientdata field of the unirect3d command to contain
-         * the local data structure. */
         dataPtr = new Rappture::Unirect3d(nComponents);
-        if (!Tcl_GetCommandInfo(interp, "unirect3d", &cmdInfo)) {
-            return TCL_ERROR;
-        }
-        cmdInfo.objClientData = (ClientData)dataPtr;    
-        Tcl_SetCommandInfo(interp, "unirect3d", &cmdInfo);
-        Tcl_Obj *objPtr;
-        objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
-        int result;
-        Tcl_IncrRefCount(objPtr);
-        result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
-        Tcl_DecrRefCount(objPtr);
-        if (result != TCL_OK) {
+        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
         }
-        if (!dataPtr->isInitialized()) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
         flowPtr->SetData(dataPtr);
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Rappture::Unirect2d *dataPtr;
-        Tcl_CmdInfo cmdInfo;
-
-        /* Set the clientdata field of the unirect3d command to contain
-         * the local data structure. */
-        dataPtr = new Rappture::Unirect2d();
-        if (!Tcl_GetCommandInfo(interp, "unirect2d", &cmdInfo)) {
+        Rappture::Unirect2d *u2dPtr;
+        u2dPtr = new Rappture::Unirect2d(nComponents);
+        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete u2dPtr;
             return TCL_ERROR;
         }
-        cmdInfo.objClientData = (ClientData)dataPtr;    
-        Tcl_SetCommandInfo(interp, "unirect2d", &cmdInfo);
-        Tcl_Obj *objPtr;
-        objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
-        int result;
-        Tcl_IncrRefCount(objPtr);
-        result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
-        Tcl_DecrRefCount(objPtr);
-        if (result != TCL_OK) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-        if (!dataPtr->isInitialized()) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
-        Rappture::Unirect3d *d3Ptr = new Rappture::Unirect3d(nComponents);
-        d3Ptr->Convert(dataPtr);
-        flowPtr->SetData(d3Ptr);
-        delete dataPtr;
+        Rappture::Unirect3d *dataPtr;
+        dataPtr = new Rappture::Unirect3d(nComponents);
+        dataPtr->Convert(u2dPtr);
+        flowPtr->SetData(dataPtr);
+        delete u2dPtr;
     } else {
+        fprintf(stderr, "header is %.14s\n", buf.bytes());
         Rappture::Unirect3d *dataPtr;
-
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
         dataPtr = new Rappture::Unirect3d(nComponents);
         if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
@@ -1029 +963 @@
     }
     Tcl_SetHashValue(hPtr, flowPtr);
-    EventuallyRedraw(MAP_FLOWS);
     return TCL_OK;
 }
@@ -1417 +1350 @@
         return TCL_ERROR;
     }
-    NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
+    NanoVis::EventuallyRedraw();
     return TCL_OK;
 }
@@ -1439 +1372 @@
     }
     particlesPtr->Configure();
-    NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
+    NanoVis::EventuallyRedraw();
     Tcl_SetObjResult(interp, objv[3]);
     return TCL_OK;
@@ -1475 +1408 @@
         }
     }
-    NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
+    NanoVis::EventuallyRedraw();
     return TCL_OK;
 }
@@ -1560 +1493 @@
         return TCL_ERROR;
     }
-    NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
+    NanoVis::EventuallyRedraw();
     Tcl_SetObjResult(interp, objv[3]);
     return TCL_OK;
@@ -1749 +1682 @@
     }
     Tcl_SetObjResult(interp, objv[2]);
-    NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
+    NanoVis::EventuallyRedraw();
     return TCL_OK;
 }
@@ -1831 +1764 @@
     }
     int i;
+    NanoVis::AdvectFlows();
     for (i = 0; i < nSteps; i++) {
+        Trace("advect step=%d\n", i);
         NanoVis::licRenderer->convolve();
         NanoVis::AdvectFlows();

trunk/packages/vizservers/nanovis/FlowCmd.h

@@ -39 +39 @@
 
     FlowParticles(const char *name, Tcl_HashEntry *hPtr);
-    ~FlowParticles(void) {
-        Rappture::FreeSwitches(_switches, &_sv, 0);
-        if (_rendererPtr != NULL) {
-            delete _rendererPtr;
-        }
-        if (_hashPtr != NULL) {
-            Tcl_DeleteHashEntry(_hashPtr);
-        }
-    }
+    ~FlowParticles(void);
     void SetColor(FlowColor &color) {
         _sv.color = color;

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -147 +147 @@
             index = i + psys_height*j;
             particle = (rand() % 256) > 150; 
-            if(particle) 
-            {
+            if(particle) {
                 //assign any location (x,y,z) in range [0,1]
-                switch (_slice_axis)
-                {
+                switch (_slice_axis) {
                 case 0 :
-                        p[4*index] = _slice_pos;
-                        p[4*index+1]= j/float(psys_height);
-                        p[4*index+2]= i/float(psys_width);
-                        break;
+                    p[4*index] = _slice_pos;
+                    p[4*index+1]= j/float(psys_height);
+                    p[4*index+2]= i/float(psys_width);
+                    break;
                 case 1 :
-                        p[4*index]= j/float(psys_height);
-                        p[4*index+1] = _slice_pos;
-                        p[4*index+2]= i/float(psys_width);
-                        break;
+                    p[4*index]= j/float(psys_height);
+                    p[4*index+1] = _slice_pos;
+                    p[4*index+2]= i/float(psys_width);
+                    break;
                 case 2 :
-                        p[4*index]= j/float(psys_height);
-                        p[4*index+1]= i/float(psys_width);
-                        p[4*index+2] = _slice_pos;
-                        break;
+                    p[4*index]= j/float(psys_height);
+                    p[4*index+1]= i/float(psys_width);
+                    p[4*index+2] = _slice_pos;
+                    break;
                 default :
-                        p[4*index] = 0;
-                        p[4*index+1]= 0;
-                        p[4*index+2]= 0;
-                        p[4*index+3]= 0;
+                    p[4*index] = 0;
+                    p[4*index+1]= 0;
+                    p[4*index+2]= 0;
+                    p[4*index+3]= 0;
                 }
                 
                 //shorter life span, quicker iterations
                 p[4*index+3]= rand() / ((float) RAND_MAX) * 0.5  + 0.5f; 
-            }
-            else
-            {
+            } else {
                 p[4*index] = 0;
                 p[4*index+1]= 0;

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -35 +35 @@
     *stringPtr = p;
     return line;
+}
+
+int
+Rappture::Unirect2d::ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+{
+    Tcl_Obj *objPtr;
+    objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
+    Tcl_Obj **objv;
+    int objc;
+    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
+        return NULL;
+    }
+    int result;
+    result = LoadData(interp, objc, objv);
+    Tcl_DecrRefCount(objPtr);
+    if ((result != TCL_OK) || (!isInitialized())) {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+int
+Rappture::Unirect3d::ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+{
+    Tcl_Obj *objPtr;
+    objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
+    Tcl_Obj **objv;
+    int objc;
+    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
+        return NULL;
+    }
+    int result;
+    result = LoadData(interp, objc, objv);
+    Tcl_DecrRefCount(objPtr);
+    if ((result != TCL_OK) || (!isInitialized())) {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
 }
 

trunk/packages/vizservers/nanovis/Unirect.h

@@ -170 +170 @@
     }
     int LoadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
+    int ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
 
     bool ImportDx(Rappture::Outcome &result, size_t nComponents, 
@@ -276 +277 @@
     }
     int LoadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
+    int ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
     bool isInitialized(void) {
         return _initialized;