Changeset af3f4af in tol for tolbase/lib/toltk/bysgraph.tcl

Timestamp:

Feb 21, 2011, 11:03:45 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

003b0ec

Parents:

cf594ab

Message:

refs #466, show the name of the closest line in a timeserie graph

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3221 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/toltk/bysgraph.tcl (modified) (1 diff)

tolbase/lib/toltk/bysgraph.tcl

@@ -543 +543 @@
   upvar \#0 ${this}::widgets widgets
   upvar \#0 ${this}::data data
-  if [$widgets(gr,$numGraph) inside $x $y] {
-    set t [expr round([$widgets(gr,$numGraph) axis invtransform x $x])]
-    set z [format "%.2f" [$widgets(gr,$numGraph) axis invtransform y $y]]
-    if [info exists ${this}::data(proc,OnGetLabel)] {
-      set label [$data(proc,OnGetLabel) $this $widgets(gr,$numGraph) $t $z]
+
+  set graph $widgets(gr,$numGraph)
+  if { [ $graph inside $x $y ] } {
+    #set t [expr round([$widgets(gr,$numGraph) axis invtransform x $x])]
+    set t [ $graph axis invtransform x $x ]
+    set z [ format "%.2f" [ $graph axis invtransform y $y ] ]
+    if { [ info exists ${this}::data(proc,OnGetLabel) ] } {
+      if { [$graph element closest $x $y infoLine -interpolate yes] } {
+        set nameLine $infoLine(name)
+      } else {
+        set nameLine ""
+      }
+      set label [$data(proc,OnGetLabel) \
+                     $this $graph $nameLine $t $z]
     } else {
       set label "X = $t, Y = $z"