Changeset 1111 for trunk/packages/vizservers/nanovis/Command.cpp

Timestamp:

Aug 13, 2008, 1:33:28 PM (16 years ago)

Author:

gah

Message:

nanovis/heightmap update

File:

• trunk/packages/vizservers/nanovis/Command.cpp (modified) (17 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -33 +33 @@
  *          the vector. 1) Use a list instead of a vector. 2) carry
  *          an id field that's a number that gets incremented each new volume.
- *        x Create R2, matrix, etc. libraries. (done)
- *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
+ *        x Create R2, matrix, etc. libraries. (done) *        o Add bookkeeping for volumes, heightmaps, flows, etc. to track
  *          1) id #  2) simulation # 3) include/exclude.  The include/exclude
  *          is to indicate whether the item should contribute to the overall
@@ -90 +89 @@
 // in nanovis.cpp
 extern vector<PointSet*> g_pointSet;
+extern int debug_flag;
 
 extern PlaneRenderer* plane_render;
@@ -655 +655 @@
     char buffer[8096];
 
-    clearerr(stdin);
+    clearerr(NanoVis::stdin);
     while (nBytes > 0) {
         unsigned int chunk;
@@ -662 +662 @@
         chunk = (sizeof(buffer) < (unsigned int) nBytes) ?
             sizeof(buffer) : nBytes;
-        nRead = fread(buffer, sizeof(char), chunk, stdin);
-        if (ferror(stdin)) {
+        nRead = fread(buffer, sizeof(char), chunk, NanoVis::stdin);
+        if (ferror(NanoVis::stdin)) {
             Tcl_AppendResult(interp, "while reading data stream: ",
                              Tcl_PosixError(interp), (char*)NULL);
             return TCL_ERROR;
         }
-        if (feof(stdin)) {
+        if (feof(NanoVis::stdin)) {
             Tcl_AppendResult(interp, "premature EOF while reading data stream",
                              (char*)NULL);
@@ -925 +925 @@
         NanoVis::SetVolumeRanges();
     }
-    NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMax, w, h, label);
+    NanoVis::render_legend(tf, 
+                           NanoVis::grid->yAxis.min(), 
+                           NanoVis::grid->yAxis.max(), w, h, label);
     return TCL_OK;
 }
@@ -1332 +1334 @@
         volPtr = NanoVis::volume[n];
         sprintf(info, "nv>data id %d min %g max %g vmin %g vmax %g\n",
-                n, volPtr->wAxis.Min(), volPtr->wAxis.Max(),
+                n, volPtr->wAxis.min(), volPtr->wAxis.max(),
                 Volume::valueMin, Volume::valueMax);
         write(0, info, strlen(info));
@@ -1715 +1717 @@
                 volPtr->height / (float)volPtr->width,
                 volPtr->depth  / (float)volPtr->width,
-                volPtr->wAxis.Max());
+                volPtr->wAxis.max());
             NanoVis::initParticle();
         }
@@ -1723 +1725 @@
                 1.0f / volPtr->aspect_ratio_height,
                 1.0f / volPtr->aspect_ratio_depth,
-                volPtr->wAxis.Max());
+                volPtr->wAxis.max());
             NanoVis::licRenderer->set_offset(NanoVis::lic_slice_z);
         }
@@ -1930 +1932 @@
     result = Tcl_Eval(interp, buf.bytes());
     if (result != TCL_OK) {
-        fprintf(stderr, "error in command: %s\n", Tcl_GetStringResult(interp));
-        fflush(stderr);
+        fprintf(NanoVis::logfile, "error in command: %s\n", 
+                Tcl_GetStringResult(interp));
+        fflush(NanoVis::logfile);
     }
     return result;
@@ -2234 +2237 @@
         case 2: axisPtr = &NanoVis::grid->zAxis; break;
         }
-        axisPtr->SetName(Tcl_GetString(objv[3]));
-        axisPtr->SetUnits(Tcl_GetString(objv[4]));
+        axisPtr->name(Tcl_GetString(objv[3]));
+        axisPtr->units(Tcl_GetString(objv[4]));
     }
     return TCL_OK;
@@ -2528 +2531 @@
     HeightMap* hmPtr;
     hmPtr = new HeightMap();
+
     hmPtr->setHeight(xMin, yMin, xMax, yMax, xNum, yNum, zValues);
     hmPtr->setColorMap(NanoVis::get_transfunc("default"));
@@ -2533 +2537 @@
     hmPtr->setLineContourVisible(true);
     NanoVis::heightMap.push_back(hmPtr);
-    delete [] zValues;
     return TCL_OK;
 }
@@ -2572 +2575 @@
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
-        fprintf(stdin, "WARNING: bad default transfer function\n");
-        fprintf(stdin, Tcl_GetStringResult(interp));
+        fprintf(NanoVis::logfile, "WARNING: bad default transfer function\n");
+        fprintf(NanoVis::logfile, Tcl_GetStringResult(interp));
     }
 }
@@ -2601 +2604 @@
         //
         while (1) {
-            char c = getchar();
+            int c = fgetc(NanoVis::stdin);
+            char ch;
             if (c <= 0) {
                 if (npass == 0) {
@@ -2609 +2613 @@
                 }
             }
-            Tcl_DStringAppend(&cmdbuffer, &c, 1);
-
-            if (c=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
+            ch = (char)c;
+            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
+
+            if (ch=='\n' && Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer))) {
                 break;
             }
         }
-
         // no command? then we're done for now
         if (Tcl_DStringLength(&cmdbuffer) == 0) {
@@ -2623 +2627 @@
         // back to original flags during command evaluation...
         fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
+        if (debug_flag) {
+            fprintf(NanoVis::logfile, "%s\n", Tcl_DStringValue(&cmdbuffer));
+        }
         status = Tcl_Eval(interp, Tcl_DStringValue(&cmdbuffer));
         Tcl_DStringSetLength(&cmdbuffer, 0);
@@ -2635 +2642 @@
         const char *string;
         int nBytes;
-        string = Tcl_GetStringFromObj(Tcl_GetObjResult(_interp), &nBytes);
-
+
+        string = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &nBytes);
         struct iovec iov[3];
-        iov[0].iov_base = "NanoVis Server Error: ";
-        iov[0].iov_len = strlen(iov[0].iov_base);
-        iov[1].iov_base = string;
+        iov[0].iov_base = (char *)"NanoVis Server Error: ";
+        iov[0].iov_len = strlen((char *)iov[0].iov_base);
+        iov[1].iov_base = (char *)string;
         iov[1].iov_len = nBytes;
-        iov[2].iov_base = '\n';
+        iov[2].iov_base = (char *)'\n';
         iov[2].iov_len = 1;
         writev(0, iov, 3);