Changeset 3063 for branches

Timestamp:

Jun 27, 2012 9:58:34 AM (12 years ago)

Author:

ldelgass

Message:

Use ifdef/ifndef for config flags consistently (rather than using 0/1 values for
some defines). Rename ISO_TEST to reflect what it really does (controls
downsampling behavior).

Location:

branches/nanovis2/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (5 diffs)
• EventPlayer.cpp (modified) (1 diff)
• config.h (modified) (3 diffs)
• dxReader.cpp (modified) (10 diffs)
• nanovis.cpp (modified) (6 diffs)
• protocol-nanovis.txt (modified) (2 diffs)

branches/nanovis2/packages/vizservers/nanovis/Command.cpp

@@ -54 +54 @@
 #include "Trace.h"
 
-#if PLANE_CMD
+#ifdef PLANE_CMD
 #include "PlaneRenderer.h"
 #endif
@@ -101 +101 @@
 static Tcl_ObjCmdProc GridCmd;
 static Tcl_ObjCmdProc LegendCmd;
-#if PLANE_CMD
+#ifdef PLANE_CMD
 static Tcl_ObjCmdProc PlaneCmd;
 #endif
@@ -2111 +2111 @@
 }
 
-#if PLANE_CMD
+#ifdef PLANE_CMD
 static int 
 PlaneAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
@@ -2231 +2231 @@
 }
 
-#endif  /*PLANE_CMD*/
+#endif /*PLANE_CMD*/
 
 /*
@@ -2298 +2298 @@
     Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   NULL, NULL);
     Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
-#if PLANE_CMD
+#ifdef PLANE_CMD
     Tcl_CreateObjCommand(interp, "plane",       PlaneCmd,       NULL, NULL);
 #endif

branches/nanovis2/packages/vizservers/nanovis/EventPlayer.cpp

@@ -121 +121 @@
     }
 
-#if DO_RLE
+#ifdef DO_RLE
     int sizes[2];
     status = read(socket_fd, &sizes, sizeof(sizes));

branches/nanovis2/packages/vizservers/nanovis/config.h

@@ -37 +37 @@
 #define USE_HALF_FLOAT
 
-#define XINETD                          /* Enable render server. */
-//#define EVENTLOG                      /* Enable event logging. */
-//#define DO_RLE                        /* Do run length compression. */
+/*
+ * Enable render server
+ */
+#define XINETD
 
-#define KEEPSTATS               1
+/*
+ * Enable event logging
+ */
+//#define EVENTLOG
+
+/*
+ * Do run length compression
+ */
+//#define DO_RLE
+
+/*
+ * Keep statistics
+ */
+#define KEEPSTATS
 
 /*
@@ -48 +62 @@
 #define WANT_TRACE
 
-/* 
- * The following define controls whether the new or old load_volume_stream 
- * implementation is used to load DX data. The difference is that the old
- * implementation doesn't do any interpolation of the points to a coarser
- * mesh.  Setting ISO_TEST to 1 will cause the old implementation to be
- * used, which makes isosurfaces work correctly (FIXME: is this still 
- * true?)
- *
- * [In the future, we'll use the OpenDX library reader and determine at
- * runtime if mesh decimation is required]
+/*
+ * Controls whether DX data is downsampled.
  */
-#define ISO_TEST                0
+#define DOWNSAMPLE_DATA
 
 /*
@@ -65 +71 @@
  * volume
  */
-#define FILTER_GRADIENTS        0
+#define FILTER_GRADIENTS
 
 /* 
- * The following define controls whether the plane* commands are 
- * registered in the interpreter.  Right now it's off.  [Are these
- * commands still required?]
+ * Controls whether the plane* commands are registered in the 
+ * interpreter. [Are these commands still required?]
  */
-#define PLANE_CMD               0
+//#define PLANE_CMD
 
 #endif 

branches/nanovis2/packages/vizservers/nanovis/dxReader.cpp

@@ -231 +231 @@
     double vmax = -DBL_MAX;
     if (isrect) {
-#if ISO_TEST
-        data = new float[nx *  ny *  nz * 4];
-        memset(data, 0, nx*ny*nz*4);
-#else // !ISO_TEST
+#ifdef DOWNSAMPLE_DATA
         Rappture::Mesh1D xgrid(x0, x0 + lx, nx);
         Rappture::Mesh1D ygrid(y0, y0 + ly, ny);
         Rappture::Mesh1D zgrid(z0, z0 + lz, nz);
         Rappture::FieldRect3D field(xgrid, ygrid, zgrid);
-#endif // ISO_TEST
+#else // !DOWNSAMPLE_DATA
+        data = new float[nx *  ny *  nz * 4];
+        memset(data, 0, nx*ny*nz*4);
+#endif // DOWNSAMPLE_DATA
         double dval[6];
         int nread = 0;
@@ -260 +260 @@
                 }
 #endif
-#if ISO_TEST
+#ifdef DOWNSAMPLE_DATA
+                int nindex = iz*nx*ny + iy*nx + ix;
+                field.define(nindex, dval[p]);
+#else // !DOWNSAMPLE_DATA
                 int nindex = (iz*nx*ny + iy*nx + ix) * 4;
                 data[nindex] = dval[p];
@@ -272 +275 @@
                     nzero_min = dval[p];
                 }
-#else // !ISO_TEST
-                int nindex = iz*nx*ny + iy*nx + ix;
-                field.define(nindex, dval[p]);
-#endif // ISO_TEST
+#endif // DOWNSAMPLE_DATA
                 nread++;
                 if (++iz >= nz) {
@@ -294 +294 @@
         }
 
-#if ISO_TEST
+#ifndef DOWNSAMPLE_DATA
         double dv = vmax - vmin;
         if (dv == 0.0) {
@@ -313 +313 @@
         computeSimpleGradient(data, nx, ny, nz,
                               dx, dy, dz);
-#else // !ISO_TEST
+#else // DOWNSAMPLE_DATA
         // figure out a good mesh spacing
         int nsample = 30;
         double dmin = pow((lx*ly*lz)/((nsample-1)*(nsample-1)*(nsample-1)), 0.333);
 
-        nx = (int)ceil(lx/dmin);
-        ny = (int)ceil(ly/dmin);
-        nz = (int)ceil(lz/dmin);
+        nx = (int)ceil(lx/dmin) + 1;
+        ny = (int)ceil(ly/dmin) + 1;
+        nz = (int)ceil(lz/dmin) + 1;
 
 #ifndef HAVE_NPOT_TEXTURES
@@ -342 +342 @@
 
         int ngen = 0;
-#if FILTER_GRADIENTS
+#ifdef FILTER_GRADIENTS
         // Sobel filter expects a single float at
         // each node
@@ -369 +369 @@
                         nzero_min = v;
                     }
-#if FILTER_GRADIENTS
+#ifdef FILTER_GRADIENTS
                     // NOT normalized, -1 => out of bounds
                     v = (isnan(v)) ? -1.0 : v;
@@ -382 +382 @@
             }
         }
-#if FILTER_GRADIENTS
+#ifdef FILTER_GRADIENTS
         // computeGradient returns a new array with gradients
         // filled in, so data is now 4 floats per node
@@ -394 +394 @@
 #endif // FILTER_GRADIENTS
 
-#endif // ISO_TEST
+#endif // DOWNSAMPLE_DATA
     } else {
         Rappture::Mesh1D zgrid(z0, z0 + (nz-1)*dz, nz);
@@ -439 +439 @@
         double dmin = pow((lx*ly*lz)/((nsample-1)*(nsample-1)*(nsample-1)), 0.333);
 
-        nx = (int)ceil(lx/dmin);
-        ny = (int)ceil(ly/dmin);
-        nz = (int)ceil(lz/dmin);
+        nx = (int)ceil(lx/dmin) + 1;
+        ny = (int)ceil(ly/dmin) + 1;
+        nz = (int)ceil(lz/dmin) + 1;
 #ifndef HAVE_NPOT_TEXTURES
         // must be an even power of 2 for older cards

branches/nanovis2/packages/vizservers/nanovis/nanovis.cpp

@@ -121 +121 @@
 
 PlaneRenderer *NanoVis::planeRenderer = NULL;
-#if PLANE_CMD
+#ifdef PLANE_CMD
 // pointers to 2D planes, currently handle up 10
 int NanoVis::numPlanes = 10;
@@ -225 +225 @@
         delete colorTableRenderer;
     }
-#if PLANE_CMD
+#ifdef PLANE_CMD
     for (int i = 0; i < numPlanes; i++) {
         TRACE("Deleting plane[%d]", i);
@@ -288 +288 @@
 }
 
-#if KEEPSTATS
+#ifdef KEEPSTATS
 
 static int
@@ -406 +406 @@
 #endif
 
-#if KEEPSTATS
+#ifdef KEEPSTATS
     writeStats("nanovis", code);
 #endif
@@ -871 +871 @@
 }
 
-#if DO_RLE
+#ifdef DO_RLE
 char rle[512*512*3];
 int rleSize;
@@ -1877 +1877 @@
         doExit(90);
     }
-#if DO_RLE
+#ifdef DO_RLE
     do_rle();
     int sizes[2] = {  offsets_size*sizeof(offsets[0]), rle_size };

branches/nanovis2/packages/vizservers/nanovis/protocol-nanovis.txt

@@ -163 +163 @@
 
 
---- Colormaped Plane (if PLANE_CMD=1 in config.h) ---
+--- Colormaped Plane (if PLANE_CMD is defined in config.h) ---
 plane active <planeIdx>
       Set the active plane [0,9], or -1 to disable
@@ -173 +173 @@
       Enable a plane for rendering using the given transfer
       function.  Plane must first be added.
---- End Colormaped Plane (if PLANE_CMD=1 in config.h) ---
+--- End Colormaped Plane (if PLANE_CMD is defined in config.h) ---
 
 ================================================================================