Changeset 2762 for trunk

Timestamp:

Jan 12, 2012, 3:45:04 PM (13 years ago)

Author:

gah

Message:

fix for right-click in streamlines viewer, about command now uses path to find rappture.

Location:

trunk/gui

Files:

• apps/about.in (modified) (1 diff)
• scripts/barchartresult.tcl (modified) (5 diffs)
• scripts/vtkstreamlinesviewer.tcl (modified) (4 diffs)
• src/RpConvertDxToVtk.c (modified) (7 diffs)

trunk/gui/apps/about.in

@@ -20 +20 @@
 # ======================================================================
 #\
-. rappture.env \
+dir=`dirname $0` \
+. $dir/rappture.env \
 exec wish "$0" $*
 # ----------------------------------------------------------------------

trunk/gui/scripts/barchartresult.tcl

@@ -912 +912 @@
     set tip ""
     if {$state == "at"} {
+        set state 0
         if {[$g element closest $x $y info -interpolate yes]} {
             # for dealing with xy line plots
             set elem $info(name)
-
+            
             # Some elements are generated dynamically and therefore will
             # not have a dataobj associated with them.
@@ -923 +924 @@
                 foreach {mapx mapy} [_getAxes $_elem2dataobj($elem)] break
             }
-
+            
             # search again for an exact point -- this time don't interpolate
             set tip ""
             array unset info
             if {[$g element closest $x $y info -interpolate no]
-                  && $info(name) == $elem} {
-
+                && $info(name) == $elem} {
+                
                 set x [$g axis transform $mapx $info(x)]
                 set y [$g axis transform $mapy $info(y)]
@@ -952 +953 @@
             # for dealing with xy scatter plot
             set elem $info(name)
-
+            
             # Some elements are generated dynamically and therefore will
             # not have a dataobj associated with them.
@@ -960 +961 @@
                 foreach {mapx mapy} [_getAxes $_elem2dataobj($elem)] break
             }
-
+            
             set tip ""
             set x [$g axis transform $mapx $info(x)]
             set y [$g axis transform $mapy $info(y)]
-                
-                if {[info exists _elem2dataobj($elem)]} {
-                    set dataobj $_elem2dataobj($elem)
-                    set yunits [$dataobj hints yunits]
-                    set xunits [$dataobj hints xunits]
-                } else {
-                    set xunits ""
-                    set yunits ""
-                }
-                set tip [$g element cget $elem -label]
-                set yval [_axis format y dummy $info(y)]
-                append tip "\n$yval$yunits"
-                set xval [_axis format x dummy $info(x)]
-                append tip " @ $xval$xunits"
-                set tip [string trim $tip]
-                set state 1
-            } else {
-                set state 0
-            }
-        }
-    }
-
-    if {$state} {
+            
+            if {[info exists _elem2dataobj($elem)]} {
+                set dataobj $_elem2dataobj($elem)
+                set yunits [$dataobj hints yunits]
+                set xunits [$dataobj hints xunits]
+            } else {
+                set xunits ""
+                set yunits ""
+            }
+            set tip [$g element cget $elem -label]
+            set yval [_axis format y dummy $info(y)]
+            append tip "\n$yval$yunits"
+            set xval [_axis format x dummy $info(x)]
+            append tip " @ $xval$xunits"
+            set tip [string trim $tip]
+            set state 1
+        }
+    } else {
+        set state 0
+    }
+
+    if { $state } {
         #
         # Highlight ON:
@@ -1490 +1490 @@
 itcl::body Rappture::BarchartResult::_getLineMarkerOptions {style} {
     array set lineOptions {
-        "-color"  "-color"
+        "-color"  "-outline"
         "-dashes" "-dashes"
         "-linecolor" "-foreground"

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -80 +80 @@
     protected method Rotate {option x y}
     protected method SendCmd {string}
-    protected method SendCmdNoWait {string}
+    protected method SendCmdNoSplash {string}
     protected method Zoom {option}
 
@@ -890 +890 @@
 
 #
-# SendCmdNoWait
-#
-#       Send commands off to the rendering server.  If we're currently
-#       sending data objects to the server, buffer the commands to be 
-#       sent later.
-#
-itcl::body Rappture::VtkStreamlinesViewer::SendCmdNoWait {string} {
+# SendCmdNoSplash
+#
+#       Send commands off to the rendering server.  This method
+#       doesn't initiate the slash screen. 
+#
+itcl::body Rappture::VtkStreamlinesViewer::SendCmdNoSplash {string} {
     if { $_buffering } {
         append _outbuf $string "\n"
@@ -1285 +1284 @@
 itcl::body Rappture::VtkStreamlinesViewer::Pick {x y} {
     foreach tag [CurrentDatasets -visible] {
-        SendCmd "dataset getscalar pixel $x $y $tag"
+        SendCmdNoSplash "dataset getscalar pixel $x $y $tag"
     } 
 }
@@ -1606 +1605 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmdNoSplash \
                 "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
             break;

trunk/gui/src/RpConvertDxToVtk.c

@@ -46 +46 @@
 
 static int
-GetPoints(Tcl_Interp *interp, int nPoints, char **stringPtr, 
+GetPoints(Tcl_Interp *interp, int nPoints, int *counts, char **stringPtr, 
           const char *endPtr, Tcl_Obj *objPtr) 
 {
@@ -54 +54 @@
     char mesg[2000];
     float *array, scale, vmin, vmax;
+    int iX, iY, iZ;
 
     nValues = 0;
@@ -62 +63 @@
     }
     vmin = FLT_MAX, vmax = -FLT_MAX;
+    iX = iY = iZ = 0;
     for (i = 0; i < nPoints; i++) {
         double value;
         char *nextPtr;
-                
+        int loc;
+
         if (p >= endPtr) {
             Tcl_AppendResult(interp, "unexpected EOF in reading points",
@@ -78 +81 @@
         }
         p = nextPtr;
-        array[i] = value;
+        loc = iZ*counts[0]*counts[1] + iY*counts[0] + iX;
+        if (++iZ >= counts[2]) {
+            iZ = 0;
+            if (++iY >= counts[1]) {
+                iY = 0;
+                ++iX;
+            }
+        }
+        array[loc] = value;
         if (value < vmin) {
             vmin = value;
@@ -175 +186 @@
             fprintf(stderr, "found delta %g %g %g\n", ddx, ddy, ddx);
 #endif
+        } else if (sscanf(line, "object %*d class regulararray count %d", 
+                          count[2]) == 1) {
+            
         } else if (sscanf(line, "object %*d class array type %*s shape 3"
                 " rank 1 items %d data follows", &nPoints) == 1) {
@@ -191 +205 @@
                 return TCL_ERROR;
             }
-            if (GetPoints(interp, nPoints, &p, pend, pointsObjPtr) != TCL_OK) {
+            if (GetPoints(interp, nPoints, count, &p, pend, pointsObjPtr) 
+                != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -207 +222 @@
                 return TCL_ERROR;
             }
-            if (GetPoints(interp, nPoints, &p, pend, pointsObjPtr) != TCL_OK) {
+            if (GetPoints(interp, nPoints, count, &p, pend, pointsObjPtr) 
+                != TCL_OK) {
                 return TCL_ERROR;
             }