Changeset 1458 for trunk/packages

Timestamp:

May 19, 2009, 2:44:49 PM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (7 diffs)
• FlowCmd.h (modified) (3 diffs)
• Unirect.cpp (modified) (7 diffs)
• Unirect.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -72 +72 @@
 Rappture::SwitchSpec FlowParticles::_switches[] = {
     {Rappture::SWITCH_CUSTOM, "-axis", "string",
-     offsetof(FlowParticlesValues, position.axis), 0, 0, &axisSwitch},
+        offsetof(FlowParticlesValues, position.axis), 0, 0, &axisSwitch},
     {Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",
-     offsetof(FlowParticlesValues, color), 0, 0,  &colorSwitch},
+        offsetof(FlowParticlesValues, color), 0, 0,  &colorSwitch},
     {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
-     offsetof(FlowParticlesValues, isHidden), 0},
+        offsetof(FlowParticlesValues, isHidden), 0},
     {Rappture::SWITCH_CUSTOM, "-position", "number",
-        offsetof(FlowValues, slicePos), 0, 0, &positionSwitch},
+        offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch},
     {Rappture::SWITCH_END}
 };
@@ -84 +84 @@
 Rappture::SwitchSpec FlowBox::_switches[] = {
     {Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",
-     offsetof(FlowBoxValues, color), 0, 0,  &colorSwitch},
+        offsetof(FlowBoxValues, color), 0, 0,  &colorSwitch},
     {Rappture::SWITCH_CUSTOM, "-corner1", "{x y z}",
-     offsetof(FlowBoxValues, corner1), 0, 0, &pointSwitch},
+        offsetof(FlowBoxValues, corner1), 0, 0, &pointSwitch},
     {Rappture::SWITCH_CUSTOM, "-corner2", "{x y z}",
-     offsetof(FlowBoxValues, corner2), 0, 0, &pointSwitch},
+        offsetof(FlowBoxValues, corner2), 0, 0, &pointSwitch},
     {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
-     offsetof(FlowBoxValues, isHidden), 0},
+        offsetof(FlowBoxValues, isHidden), 0},
     {Rappture::SWITCH_FLOAT, "-linewidth", "number",
-     offsetof(FlowBoxValues, lineWidth), 0},
+        offsetof(FlowBoxValues, lineWidth), 0},
     {Rappture::SWITCH_END}
 };
@@ -118 +118 @@
 FlowParticles::Render(void) 
 {
-    Trace("rendering particles %s\n", _name);
-    Trace("rendering particles %s axis=%d\n", _name, _sv.position.axis);
-    Trace("rendering particles %s position=%g\n", _name, _sv.position.value);
-    Trace("rendering particles %s position=%g\n", _name, 
-          FlowCmd::GetRelativePosition(&_sv.position));
-
     _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
     _rendererPtr->setAxis(_sv.position.axis);
@@ -691 +685 @@
 
         dataPtr = new Rappture::Unirect3d(nComponents);
-        if (!dataPtr->ImportDx(result, nComponents, buf.size(), 
-                (char *)buf.bytes())) {
+        if (!dataPtr->ImportDx(result, nComponents, length-4, bytes+4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;
@@ -710 +703 @@
         cmdInfo.objClientData = (ClientData)dataPtr;    
         Tcl_SetCommandInfo(interp, "unirect3d", &cmdInfo);
-        if (Tcl_Eval(interp, (const char *)buf.bytes()+11) != TCL_OK) {
+        if (Tcl_Eval(interp, (const char *)bytes+11) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
@@ -731 +724 @@
         cmdInfo.objClientData = (ClientData)dataPtr;    
         Tcl_SetCommandInfo(interp, "unirect2d", &cmdInfo);
-        if (Tcl_Eval(interp, (const char *)buf.bytes()+11) != TCL_OK) {
+        if (Tcl_Eval(interp, (const char *)bytes+11) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
@@ -746 +739 @@
         Rappture::Unirect3d *dataPtr;
 
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
+        fprintf(stderr, "header is %.14s\n", bytes);
         dataPtr = new Rappture::Unirect3d(nComponents);
-        if (!dataPtr->ImportDx(result, nComponents, buf.size(), 
-                (char *)buf.bytes())) {
+        if (!dataPtr->ImportDx(result, nComponents, length,  bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;

trunk/packages/vizservers/nanovis/FlowCmd.h

@@ -15 +15 @@
 
 struct FlowParticlesValues {
-    int isHidden;                       /* Indicates if particle injection
-                                         * plane is active or not. */
     FlowPosition position;              /* Position on axis of particle
                                          * plane */
     FlowColor color;                    /* Color of particles */
+    int isHidden;                       /* Indicates if particle injection
+                                         * plane is active or not. */
 };
 
@@ -96 +96 @@
 
 struct FlowBoxValues {
-    int isHidden;                       /* Indicates if particle injection
-                                         * plance is active or not. */
     float position;                     /* Position on axis of particle
                                          * plane */
@@ -104 +102 @@
     FlowColor color;                    /* Color of particles */
     float lineWidth;
+    int isHidden;                       /* Indicates if particle injection
+                                         * plance is active or not. */
 };
 

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -242 +242 @@
     }
     _initialized = true;
+#ifdef notdef
     { 
         FILE *f;
@@ -255 +256 @@
         fclose(f);
     }
+#endif
     return TCL_OK;
 }
@@ -407 +409 @@
                 "wrong number of values: must be xnum*ynum*components", 
                          (char *)NULL);
-        fprintf(stderr, "x=%d y=%d c=%d, nv=%d\n", 
-                _xNum, _yNum, _nComponents, _nValues);
         return TCL_ERROR;
     }
@@ -444 +444 @@
 
 bool
-Rappture::Unirect3d::ImportDx(Rappture::Outcome &result, int nComponents,
-        size_t length, char *string) 
+Rappture::Unirect3d::ImportDx(Rappture::Outcome &result, size_t nComponents,
+                              size_t length, char *string) 
 {
-    size_t nx, ny, nz, npts;
+    int nx, ny, nz, npts;
     double x0, y0, z0, dx, dy, dz, ddx, ddy, ddz;
     char *p, *endPtr;
@@ -483 +483 @@
         } else if (sscanf(line, "object %*d class array type %*s shape 3"
                 " rank 1 items %d data follows", &npts) == 1) {
+            if (npts < 0) {
+                result.addError("bad # points %d", npts);
+                return false;
+            }   
             printf("#points=%d\n", npts);
             if (npts != nx*ny*nz) {
@@ -559 +563 @@
     }
     // make sure that we read all of the expected points
-    if (_nValues != npts) {
+    if (_nValues != (size_t)npts) {
         result.addError("inconsistent data: expected %d points"
                         " but found %d points", npts, _nValues);
@@ -588 +592 @@
 
 bool
-Rappture::Unirect3d::Resample(Rappture::Outcome &result, int nSamples)
+Rappture::Unirect3d::Resample(Rappture::Outcome &result, size_t nSamples)
 {
     Rappture::Mesh1D xgrid(_xMin, _xMax, _xNum);

trunk/packages/vizservers/nanovis/Unirect.h

@@ -171 +171 @@
     int LoadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
 
-    bool ImportDx(Rappture::Outcome &result, int nComponents, 
+    bool ImportDx(Rappture::Outcome &result, size_t nComponents, 
                   size_t length, char *string);
     bool Convert(Unirect2d *dataPtr);
-    bool Resample(Rappture::Outcome &context, int nSamples = 30);
+    bool Resample(Rappture::Outcome &context, size_t nSamples = 30);
     bool isInitialized(void) {
         return _initialized;