Changeset 2715 for trunk

Timestamp:

Dec 5, 2011, 6:45:30 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• gui/apps/rappture-csh.env.in (modified) (1 diff)
• gui/scripts/numberresult.tcl (modified) (3 diffs)

trunk/configure

@@ -609 +609 @@
 TK_VERSION
 TK_XLIBSW
+TCL_SHLIB_LD
+TCL_SHLIB_CFLAGS
+TCL_SHLIB_LDFLAGS
+TCL_SHLIB_SUFFIX
 TK_LIB_SPEC
 TK_INC_SPEC
@@ -9798 +9802 @@
 
 
+
+
+
+
 ac_configure_args="--disable-threads --enable-shared"
 

trunk/configure.in

@@ -424 +424 @@
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SHLIB_LDFLAGS)
+AC_SUBST(TCL_SHLIB_CFLAGS)
+AC_SUBST(TCL_SHLIB_LD)
 AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)

trunk/gui/apps/rappture-csh.env.in

@@ -100 +100 @@
 endif
   
-
+if ( $?R_LIBS ) then
+  setenv R_LIBS "${libdir}/R:$R_LIBS"
+else
+  setenv R_LIBS "${libdir}/R"
+endif

trunk/gui/scripts/numberresult.tcl

@@ -957 +957 @@
         # - multiple axes? dim other axes
         # - pop up tooltip about data
-        #
-        if {$_hilite(elem) != "" && $_hilite(elem) != $elem} {
-            $g element deactivate $_hilite(elem)
-            $g crosshairs configure -hide yes
-            Rappture::Tooltip::tooltip cancel
-        }
+
+        $g element deactivate $_hilite(elem)
+        $g crosshairs configure -hide yes
+        Rappture::Tooltip::tooltip cancel
+
         $g element activate $elem
         set _hilite(elem) $elem
@@ -1042 +1041 @@
         # - take down tooltip
         #
-        if {"" != $_hilite(elem)} {
-            $g element deactivate $_hilite(elem)
-
-            set allx [$g x2axis use]
-            if {[llength $allx] > 0} {
-                lappend allx x  ;# fix main x-axis too
-                foreach axis $allx {
-                    $g axis configure $axis -color $itk_option(-foreground) \
-                        -titlecolor $itk_option(-foreground)
-                }
-            }
-
-            set ally [$g y2axis use]
-            if {[llength $ally] > 0} {
-                lappend ally y  ;# fix main y-axis too
-                foreach axis $ally {
-                    $g axis configure $axis -color $itk_option(-foreground) \
-                        -titlecolor $itk_option(-foreground)
-                }
-            }
-        }
+        $g element deactivate $_hilite(elem)
+
+        set allx [$g x2axis use]
+        if {[llength $allx] > 0} {
+            lappend allx x  ;           # fix main x-axis too
+            foreach axis $allx {
+                $g axis configure $axis -color $itk_option(-foreground) \
+                    -titlecolor $itk_option(-foreground)
+            }
+        }
+
+        set ally [$g y2axis use]
+        if {[llength $ally] > 0} {
+            lappend ally y  ;           # fix main y-axis too
+            foreach axis $ally {
+                $g axis configure $axis -color $itk_option(-foreground) \
+                    -titlecolor $itk_option(-foreground)
+            }
+        }
 
         $g crosshairs configure -hide yes
@@ -1211 +1208 @@
                 set dy [expr {abs($y-$_axis(click-y))}]
                 if {$dx < 2 && $dy < 2} {
-                    _axis edit $axis
+                    Axis edit $axis
                 }
             } else {