Changeset 958 for trunk

Timestamp:

Mar 21, 2008, 1:27:06 PM (17 years ago)

Author:

gah

Message:

fix legend max value

Location:

trunk/vizservers/nanovis

Files:

• Command.cpp (modified) (2 diffs)
• dxReader.cpp (modified) (2 diffs)
• dxReader2.cpp (modified) (1 diff)

trunk/vizservers/nanovis/Command.cpp

@@ -931 +931 @@
         NanoVis::SetVolumeRanges();
     }
-    NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMin, w, h, label);
+    NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMax, w, h, label);
     return TCL_OK;
 }
@@ -1937 +1937 @@
     result = Tcl_Eval(interp, buf.bytes());
     if (result != TCL_OK) {
-        fprintf(stderr, "error in command: %s\n", 
-                Tcl_GetStringResult(interp));
+        fprintf(stderr, "error in command: %s\n", Tcl_GetStringResult(interp));
         fflush(stderr);
     }

trunk/vizservers/nanovis/dxReader.cpp

@@ -411 +411 @@
             volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data,
                       vmin, vmax, nzero_min);
+#ifdef notdef
             fprintf(stderr, "x nx=%d ddx=%g min=%g max=%g\n", nx, ddx,
                     x0, x0 + (nx * ddx));
             fflush(stderr);
-#ifdef notdef
             volPtr->xAxis.SetRange(x0, x0 + (nx * ddx));
             volPtr->yAxis.SetRange(y0, y0 + (ny * ddy));
             volPtr->zAxis.SetRange(z0, z0 + (nz * ddz));
-#endif
+#else 
             volPtr->xAxis.SetRange(-20.0, 108.0);
             volPtr->yAxis.SetRange(0.001, 102.2);
             volPtr->zAxis.SetRange(-21, 19);
+#endif
             volPtr->update_pending = true;
             delete [] data;
@@ -559 +560 @@
             volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data,
                         field.valueMin(), field.valueMax(), nzero_min);
+#ifdef notdef
             fprintf(stderr, "x min=%g max=%g\n",
                     field.rangeMin(Rappture::xaxis),
                     field.rangeMax(Rappture::xaxis));
             fflush(stderr);
+#endif
             volPtr->xAxis.SetRange(field.rangeMin(Rappture::xaxis),
                    field.rangeMax(Rappture::xaxis));

trunk/vizservers/nanovis/dxReader2.cpp

@@ -89 +89 @@
     volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data,
                                   dxObj.dataMin(), dxObj.dataMax(), dxObj.nzero_min());
-    /*
+#ifdef notdef
     volPtr->SetRange(AxisRange::X, x0, x0 + (nx * ddx));
     volPtr->SetRange(AxisRange::Y, y0, y0 + (ny * ddy));
     volPtr->SetRange(AxisRange::Z, z0, z0 + (nz * ddz));
-    */
+#endif
 
     volPtr->update_pending = true;