Changeset 840

Timestamp:

Jan 3, 2008, 1:18:59 PM (17 years ago)

Author:

gah

Message:

changes for surface plot

Location:

trunk/vizservers/nanovis

Files:

• Command.cpp (modified) (9 diffs)
• HeightMap.cpp (modified) (1 diff)

trunk/vizservers/nanovis/Command.cpp

@@ -1040 +1040 @@
              const char *argv[])
 {
-    fprintf(stderr, "in heightmap command\n");
-    fflush(stderr);
     if (argc < 2) {
         srand((unsigned)time(NULL));
@@ -1091 +1089 @@
         return TCL_OK;
     } else if ((c == 'd') && (strcmp(argv[1],"data") == 0)) {
-        fprintf(stderr, "heightmap data\n");
-    fflush(stderr);
         //bytes
         char c;
@@ -1118 +1114 @@
             int nBytes;
 
-            fprintf(stderr, "in data follows\n");
-    fflush(stderr);
             if (Tcl_GetInt(interp, argv[3], &nBytes) != TCL_OK) {
                 return TCL_ERROR;
             }
-            fprintf(stderr, "expecting %d bytes\n", nBytes);
-    fflush(stderr);
             if (FillBufferFromStdin(interp, buf, nBytes) != TCL_OK) {
                 return TCL_ERROR;
@@ -1131 +1123 @@
                 fprintf(stderr, "error in command: %s\n", 
                         Tcl_GetStringResult(interp));
-    fflush(stderr);
+                fflush(stderr);
                 return TCL_ERROR;
             }
@@ -1307 +1299 @@
         }
     } else if ((c == 'a') && (strcmp(argv[1],"axiscolor") == 0)) {
-        float r, g, b;
+        float r, g, b, a;
         if ((GetFloat(interp, argv[2], &r) != TCL_OK) ||
             (GetFloat(interp, argv[3], &g) != TCL_OK) ||
@@ -1313 +1305 @@
             return TCL_ERROR;
         }
+        a = 1.0f;
+        if ((argc == 6) && (GetFloat(interp, argv[5], &a) != TCL_OK)) {
+            return TCL_ERROR;
+        }           
         if (g_grid) {
-            g_grid->setAxisColor(r, g, b, 1.0f);
+            g_grid->setAxisColor(r, g, b, a);
         }
     } else if ((c == 'l') && (strcmp(argv[1],"linecolor") == 0)) {
-        float r, g, b;
+        float r, g, b, a;
         if ((GetFloat(interp, argv[2], &r) != TCL_OK) ||
             (GetFloat(interp, argv[3], &g) != TCL_OK) ||
@@ -1323 +1319 @@
             return TCL_ERROR;
         }
+        a = 1.0f;
+        if ((argc == 6) && (GetFloat(interp, argv[5], &a) != TCL_OK)) {
+            return TCL_ERROR;
+        }           
         if (g_grid) {
-            g_grid->setGridLineColor(r, g, b, 1.0f);
+            g_grid->setGridLineColor(r, g, b, a);
         }
     } else if ((c == 'm') && (strcmp(argv[1],"minmax") == 0)) {
@@ -1993 +1993 @@
     float *zValues;
 
-    fprintf(stderr, "in unirect2d command\n");
-    fflush(stderr);
     if ((argc & 0x01) == 0) {
         Tcl_AppendResult(interp, 
@@ -2066 +2064 @@
         return TCL_ERROR;
     }
-    fprintf(stderr, "xnum=%d, ynum=%d, znum=%d\n", xNum, yNum, zNum);
-    fflush(stderr);
     if (zNum != (xNum * yNum)) {
         Tcl_AppendResult(interp, "wrong number of z values must be xnum*ynum",

trunk/vizservers/nanovis/HeightMap.cpp

@@ -87 +87 @@
             cgGLEnableProfile(CG_PROFILE_FP30);
 
-            fprintf(stderr, "set texture param id=%d\n", _colorMap->id);
-            fflush(stderr);
                         cgGLSetTextureParameter(_tf, _colorMap->id);
                         cgGLEnableTextureParameter(_tf);