Changeset af3f4af in tol

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

Location:

tolbase/lib/toltk

Files:

• bysgraph.tcl (modified) (1 diff)
• sergraph.tcl (modified) (5 diffs)

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" 

tolbase/lib/toltk/sergraph.tcl

@@ -10 +10 @@
 namespace eval ::SeriesGraph {
   variable tmpOpt
+}
+
+proc ::SeriesGraph::ShowSerieInfo { Instance graph x y } {
+  upvar \#0 ${Instance}::widgets widgets
+  upvar \#0 ${Instance}::data data
+  
+  if ![$graph element closest $x $y info -interpolate yes] {
+    beep
+    return
+  }
+  parray info
+}
+
+proc ::SeriesGraph::BindSerieInfo { Instance } {
+  upvar \#0 ${Instance}::widgets widgets
+  upvar \#0 ${Instance}::data data
+
+  set graph $widgets(gr,0)
+  bind closest-point-$graph <Control-ButtonPress-2>  \
+      [ string map [list %I $Instance] {
+        ::SeriesGraph::ShowSerieInfo %I %W %x %y
+      } ]
+  blt::AddBindTag $graph closest-point-$graph
+  
 }
 
@@ -38 +62 @@
   upvar \#0 ${Instance}::widgets widgets
   upvar \#0 ${Instance}::data data
+
+  #::SeriesGraph::BindSerieInfo $Instance
+  #Blt_ClosestPoint $widgets(gr,0)
 
   set data(namespace)            SeriesGraph
@@ -125 +152 @@
           $grpath line configure l$i-$j -label ""
         } else {
-          $grpath line configure l$i-0 -label [$sergrp serie $i name]
+          set nameSerie [$sergrp serie $i name]
+          $grpath line configure l$i-0 -label $nameSerie
+          set data(labels,l$i) $nameSerie
         }
         incr j
@@ -308 +337 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-proc ::SeriesGraph::GetLabel { this bltg tick y} {
+proc ::SeriesGraph::GetLabel { this bltg name tick y} {
 # 
 #/////////////////////////////////////////////////////////////////////////////  
@@ -314 +343 @@
   set gr $data(gr,active)
 
-  if [string is int $tick] {
-    set str ""
-    catch {
-      set str [$data(gr,$gr,sergrp) dating $tick]
-    }
-    set label "t = $str, z = $y"
-  } else  {
-    set label "t = $tick, z = $y"
-  }
-  return $label
+  set t [ expr {round($tick)} ]
+  if { [ catch { $data(gr,$gr,sergrp) dating $t } labelTick ] } {
+    set labelTick $tick
+  }
+  if { [ regexp {(l[0-9])+(-[0-9])*} $name ==> codeLine ] } {
+    set nameLine $data(labels,$codeLine)
+  } else {
+    set nameLine "NO LINE"    
+  }
+  return "$nameLine: ($labelTick,$y)"
 }