Changeset 3423

Timestamp:

Mar 3, 2013 5:21:57 PM (11 years ago)

Author:

ldelgass

Message:

Make check for divide-by-near-zero in heightmap data scale match client. Trim
whitespace from end of commands before logging them to the trace log.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpHeightMap.cpp (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpHeightMap.cpp

@@ -148 +148 @@
     }
     double datRange = _dataRange[1] - _dataRange[0];
-    if (datRange < 1.0e-10) {
+    if (datRange < 1.0e-16) {
         _dataScale = 1.0;
     } else {

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -81 +81 @@
 {
     int result;
-
-    TRACE("command %lu: '%s'", g_stats.nCommands+1, Tcl_DStringValue(dsPtr));
+#ifdef WANT_TRACE
+    char *str = Tcl_DStringValue(dsPtr);
+    std::string cmd(str);
+    cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
+    TRACE("command %lu: '%s'", g_stats.nCommands+1, cmd.c_str());
+#endif
     lastCmdStatus = TCL_OK;
     result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr),