Changeset 3459 for trunk

Timestamp:

Mar 5, 2013, 7:25:47 PM (12 years ago)

Author:

ldelgass

Message:

Fix error on setting axis units (found in contour example: Mesh-grid-hybrid)

Location:

trunk

Files:

• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• packages/vizservers/nanovis/define.h (modified) (1 diff)
• packages/vizservers/nanovis/nanovis.cpp (modified) (3 diffs)
• packages/vizservers/vtkvis/RpVtkRendererCmd.cpp (modified) (1 diff)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1401 +1401 @@
             if { $units != "" } {
                 # May be a space in the axis units.
-                SendCmd [list axis units $axis $units]
+                SendCmd [list axis units z $units]
             }
             # Get the new limits because the field changed.

trunk/packages/vizservers/nanovis/define.h

@@ -25 +25 @@
     switch(status) {                                            \
     case GL_FRAMEBUFFER_COMPLETE_EXT:                           \
-        TRACE("framebuffer complete!");                         \
+        TRACE("Framebuffer complete");                          \
         break;                                                  \
     case GL_FRAMEBUFFER_UNSUPPORTED_EXT:                        \
-        TRACE("framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT");    \
+        ERROR("Framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT");    \
         assert(0);                                              \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:              \
-        TRACE("framebuffer INCOMPLETE_ATTACHMENT");             \
+        TRACE("Framebuffer INCOMPLETE_ATTACHMENT");             \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:      \
-        TRACE("framebuffer FRAMEBUFFER_MISSING_ATTACHMENT");    \
+        TRACE("Framebuffer FRAMEBUFFER_MISSING_ATTACHMENT");    \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:              \
-        TRACE("framebuffer FRAMEBUFFER_DIMENSIONS");            \
+        TRACE("Framebuffer FRAMEBUFFER_DIMENSIONS");            \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:                 \
-        TRACE("framebuffer INCOMPLETE_FORMATS");                \
+        TRACE("Framebuffer INCOMPLETE_FORMATS");                \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:             \
-        TRACE("framebuffer INCOMPLETE_DRAW_BUFFER");            \
+        TRACE("Framebuffer INCOMPLETE_DRAW_BUFFER");            \
         break;                                                  \
     case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:             \
-        TRACE("framebuffer INCOMPLETE_READ_BUFFER");            \
+        TRACE("Framebuffer INCOMPLETE_READ_BUFFER");            \
         break;                                                  \
     case GL_FRAMEBUFFER_BINDING_EXT:                            \
-        TRACE("framebuffer BINDING_EXT");                       \
+        TRACE("Framebuffer BINDING_EXT");                       \
         break;                                                  \
     default:                                                    \
-        ERROR("unknown framebuffer error %d", status);          \
+        ERROR("Unknown framebuffer error %d", status);          \
         /* programming error; will fail on all hardware */      \
         assert(0);                                              \

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -552 +552 @@
     stats.cmdTime += finish - start;
     stats.nCommands++;
-    TRACE("leaving executeCommand status=%d", result);
+    TRACE("Leave status=%d", result);
     return result;
 }
@@ -1709 +1709 @@
         //  here.
         //
-        TRACE("EOF=%d", feof(NanoVis::stdin));
         while (!feof(NanoVis::stdin)) {
             int c = fgetc(NanoVis::stdin);
@@ -1769 +1768 @@
     }
     if (feof(NanoVis::stdin)) {
+        TRACE("Exiting server on EOF from client");
         exitService(90);
     }

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -2304 +2304 @@
     } else if (numEntries < 1) {
         Tcl_AppendResult(interp, "bad colormap resolution value \"", Tcl_GetString(objv[2]),
-                         "\": should be a  positive integer or \"default\"", (char*)NULL);
+                         "\": should be a positive integer or \"default\"", (char*)NULL);
         return TCL_ERROR;
     }