Changeset 2728 for trunk

Timestamp:

Dec 12, 2011 8:58:09 PM (12 years ago)

Author:

gah

Message:

 

Location:

trunk/gui

Files:

• scripts/resultviewer.tcl (modified) (4 diffs)
• scripts/vtkvolumeviewer.tcl (modified) (3 diffs)
• src/RpConvertDxToVtk.c (modified) (4 diffs)

trunk/gui/scripts/resultviewer.tcl

@@ -206 +206 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultViewer::_plotAdd {dataobj {settings ""}} {
-    puts stderr "ResultViewer _plotAdd info class [$dataobj info class]"
     switch -- [$dataobj info class] {
         ::Rappture::DataTable {
@@ -221 +220 @@
                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
                 set w $itk_interior.vtkviewer
-                catch { Rappture::VtkViewer $w $servers } errs
-                puts stderr errs=$errs
+                Rappture::VtkViewer $w $servers
                 set _mode2widget($mode) $w
             }
@@ -253 +251 @@
         ::Rappture::Field {
             set dims [lindex [lsort [$dataobj components -dimensions]] end]
-            puts stderr "ResultViewer in Field dims=$dims"
             switch -- $dims {
                 1D {
@@ -289 +286 @@
                     set mode "field3D"
                     if {![info exists _mode2widget($mode)]} {
-                        puts stderr "type=$type"
                         switch -- [$dataobj type] {
                             "vtk" {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1753 +1753 @@
         }
         default {
-            set clist $colors
+            set clist [split $colors :]
         }
     }
@@ -1805 +1805 @@
 
 itcl::body Rappture::VtkVolumeViewer::limits { dataobj } {
+    return
     array unset _limits $dataobj-*
     foreach comp [$dataobj components] {
@@ -2595 +2596 @@
     }
 }
+

trunk/gui/src/RpConvertDxToVtk.c

@@ -53 +53 @@
     const char *p;
     char mesg[2000];
+    float *array, scale, vmin, vmax;
 
     nValues = 0;
     p = *stringPtr;
+    array = malloc(sizeof(float) * nPoints);
+    if (array == NULL) {
+        return TCL_ERROR;
+    }
+    vmin = FLT_MAX, vmax = -FLT_MAX;
     for (i = 0; i < nPoints; i++) {
         double value;
@@ -72 +78 @@
         }
         p = nextPtr;
-        sprintf(mesg, "%.15g\n", value);
+        array[i] = value;
+        if (value < vmin) {
+            vmin = value;
+        } 
+        if (value > vmax) {
+            vmax = value;
+        }
+    }
+    scale = 1.0 / (vmax - vmin);
+    for (i = 0; i < nPoints; i++) {
+        sprintf(mesg, "%g\n", (array[i] - vmin) * scale);
         Tcl_AppendToObj(objPtr, mesg, -1);
     }
+    free(array);
     *stringPtr = p;
     return TCL_OK;
@@ -97 +114 @@
     char *name;
 
-    name = "myScalar";
+    name = "myScalars";
     nComponents = nPoints = 0;
     delta[0] = delta[1] = delta[2] = 0.0; /* Suppress compiler warning. */
@@ -109 +126 @@
     }
     string = Tcl_GetStringFromObj(objv[1], &length);
+    if (strncmp("<ODX>", string, 5) == 0) {
+        string += 5;
+        length -= 5;
+    }
     pointsObjPtr = Tcl_NewStringObj("", -1);
     for (p = string, pend = p + length; p < pend; /*empty*/) {