Changeset 87b1c46 in tol for tolbase/lib/toltk/graph.tcl

Timestamp:

Nov 15, 2016, 9:03:42 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

4592f76

Parents:

06f7d3d

Message:

Refs #1933
Se sustituye BLT por RBC.
Se prescinde de otros widgets no usados, dependientes de BLT. (Véanse loadByswidget.tcl y pkgIndex.tcl)

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

File:

• tolbase/lib/toltk/graph.tcl (modified) (15 diffs)

tolbase/lib/toltk/graph.tcl

@@ -1 +1 @@
 #/////////////////////////////////////////////////////////////////////////////
 # FILE    : graph.tcl
-# PURPOSE : This file is part of BLT Toolkit
+# PURPOSE : This file is part of RBC Toolkit
 #/////////////////////////////////////////////////////////////////////////////
 
-# force blt load
-
-if { [info command "_blt_InitStack"] eq "" } {
-  blt::graph .__g__
-  Blt_ZoomStack .__g__
+# force rbc load
+
+if { [info command "_rbc_InitStack"] eq "" } {
+  rbc::graph .__g__
+  Rbc_ZoomStack .__g__
   destroy .__g__
-  rename blt::InitStack _blt_InitStack
+  rename rbc::InitStack _rbc_InitStack
 }
 
@@ -25 +25 @@
 }
 
-if { [ catch { blt::busy patched } ] } {
-  rename ::blt::busy _blt_busy
-  interp alias {} ::blt::busy {} Busy_Patched
-  puts "interp alias {} ::blt::busy {} Busy_Patched"
+if { [ catch { rbc::busy patched } ] } {
+  rename ::rbc::busy _rbc_busy
+  interp alias {} ::rbc::busy {} Busy_Patched
+  puts "interp alias {} ::rbc::busy {} Busy_Patched"
 }
 
@@ -39 +39 @@
 #   scroll
 
-proc Blt_ViewMode { graph mode } {
-  global zoomInfo
-
-  if { ![blt::ClearMode $graph $mode] } return
+proc Rbc_ViewMode { graph mode } {
+  global zoomInfo
+
+  if { ![rbc::ClearMode $graph $mode] } return
 
   set zoomInfo($graph,mode) $mode
@@ -48 +48 @@
   if { [string equal $mode "scroll"] } {
     # limpio el stack
-    blt::InitStack $graph $mode
-    bind scroll-$graph <ButtonPress-1> { blt::SetScrollPoint %W %x %y }
-    bind scroll-$graph <ButtonRelease-1> { blt::SetScrollPoint %W %x %y }
+    rbc::InitStack $graph $mode
+    bind scroll-$graph <ButtonPress-1> { rbc::SetScrollPoint %W %x %y }
+    bind scroll-$graph <ButtonRelease-1> { rbc::SetScrollPoint %W %x %y }
     # este evento posiblemente ya no hara falta
     bind scroll-$graph <ButtonPress-3> { 
       if { [%W inside %x %y] } { 
-        blt::ResetScroll %W 
-      }
-    }
-    blt::AddBindTag $graph scroll-$graph
+        rbc::ResetScroll %W 
+      }
+    }
+    rbc::AddBindTag $graph scroll-$graph
   } elseif { [regexp "zoom-*" $mode] } {
     puts "mode = $mode"
-    bind zoom-$graph <ButtonPress-1> { blt::SetZoomPoint %W %x %y }
+    bind zoom-$graph <ButtonPress-1> { rbc::SetZoomPoint %W %x %y }
     if { [string equal $mode zoom-frame] } { 
-      bind zoom-$graph <ButtonRelease-1> { blt::SetZoomPoint %W %x %y }
+      bind zoom-$graph <ButtonRelease-1> { rbc::SetZoomPoint %W %x %y }
     } else {
       bind zoom-$graph <ButtonRelease-1> ""
@@ -68 +68 @@
     bind zoom-$graph <ButtonPress-3> { 
       if { [%W inside %x %y] } { 
-        blt::ResetZoom %W 
-      }
-    }
-    blt::AddBindTag $graph zoom-$graph
-  }
-}
-
-proc blt::RemoveBindTag { widget args } {
+        rbc::ResetZoom %W 
+      }
+    }
+    rbc::AddBindTag $graph zoom-$graph
+  }
+}
+
+proc rbc::RemoveBindTag { widget args } {
   set oldTagList [bindtags $widget]
   foreach tag $args {
@@ -85 +85 @@
 }
 
-proc blt::InitStack { graph {mode zoom-frame} } {
+proc rbc::InitStack { graph {mode zoom-frame} } {
     global zoomInfo
   
-    _blt_InitStack $graph
+    _rbc_InitStack $graph
     # this is to allow zoom in, out scroll
   
@@ -95 +95 @@
 
 
-proc blt::SetZoomScale { graph scale } {
+proc rbc::SetZoomScale { graph scale } {
   global zoomInfo
 
@@ -101 +101 @@
 }
 
-proc blt::ClearMode { graph newmode } {
+proc rbc::ClearMode { graph newmode } {
   global zoomInfo
 
@@ -111 +111 @@
     if { [string equal $zoomInfo($graph,mode) "scroll"] } {
       eval $graph marker delete [$graph marker names "scroll*"]
-      blt::RemoveBindTag $graph "scroll-region-$graph" "scroll-$graph"
+      rbc::RemoveBindTag $graph "scroll-region-$graph" "scroll-$graph"
     } else {
       eval $graph marker delete [$graph marker names "zoom*"]
-      blt::RemoveBindTag $graph "select-region-$graph" "zoom-$graph"
-    }
-  } else {
-    blt::InitStack $graph ""
+      rbc::RemoveBindTag $graph "select-region-$graph" "zoom-$graph"
+    }
+  } else {
+    rbc::InitStack $graph ""
   }
   return 1
 }
 
-proc blt::ZoomScale { graph } {
+proc rbc::ZoomScale { graph } {
   global zoomInfo
 
@@ -166 +166 @@
 }
 
-proc blt::SetZoomPoint { graph x y } {
+proc rbc::SetZoomPoint { graph x y } {
   global zoomInfo zoomMod
   if { ![info exists zoomInfo($graph,corner)] } {
-    blt::InitStack $graph
-  }
-  blt::GetCoords $graph $x $y $zoomInfo($graph,corner)
-
-  #puts  blt::SetZoomPoint
+    rbc::InitStack $graph
+  }
+  rbc::GetCoords $graph $x $y $zoomInfo($graph,corner)
+
+  #puts  rbc::SetZoomPoint
 
   if { [string compare $zoomInfo($graph,mode) "zoom-frame"] } {
-    blt::ZoomScale $graph
+    rbc::ZoomScale $graph
     return
   }
@@ -186 +186 @@
   }
   bind select-region-$graph <${modifier}Motion> { 
-    blt::GetCoords %W %x %y B
-    #blt::MarkPoint $graph B
-    blt::Box %W
+    rbc::GetCoords %W %x %y B
+    #rbc::MarkPoint $graph B
+    rbc::Box %W
   }
   if { $zoomInfo($graph,corner) == "A" } {
@@ -196 +196 @@
         # First corner selected, start watching motion events
 
-        #blt::MarkPoint $graph A
-        blt::ZoomTitleNext $graph 
-
-        blt::AddBindTag $graph select-region-$graph
+        #rbc::MarkPoint $graph A
+        rbc::ZoomTitleNext $graph 
+
+        rbc::AddBindTag $graph select-region-$graph
         set zoomInfo($graph,corner) B
   } else {
         # Delete the modal binding
-        blt::RemoveBindTag $graph select-region-$graph
-        blt::PushZoom $graph 
+        rbc::RemoveBindTag $graph select-region-$graph
+        rbc::PushZoom $graph 
         set zoomInfo($graph,corner) A
   }
 }
 
-proc blt::SetScrollPoint { graph x y } {
+proc rbc::SetScrollPoint { graph x y } {
     global zoomInfo
 
-    blt::GetCoords $graph $x $y A
+    rbc::GetCoords $graph $x $y A
     bind scroll-region-$graph <Any-Motion> { 
-        blt::GetCoords %W %x %y B
-        #blt::MarkPoint $graph B
-        blt::Scroll %W
+        rbc::GetCoords %W %x %y B
+        #rbc::MarkPoint $graph B
+        rbc::Scroll %W
     }
     if { $zoomInfo($graph,corner) == "A" } {
@@ -224 +224 @@
         # First corner selected, start watching motion events
 
-        #blt::MarkPoint $graph A
-        blt::ScrollTitle $graph 
-
-        blt::AddBindTag $graph scroll-region-$graph
+        #rbc::MarkPoint $graph A
+        rbc::ScrollTitle $graph 
+
+        rbc::AddBindTag $graph scroll-region-$graph
         set zoomInfo($graph,corner) B
     } else {
@@ -235 +235 @@
 }
 
-proc blt::Scroll { graph } {
+proc rbc::Scroll { graph } {
   global zoomInfo
 
@@ -257 +257 @@
 }
 
-proc blt::ResetScroll { graph } {
+proc rbc::ResetScroll { graph } {
   global zoomInfo
 
   eval $graph marker delete [$graph marker names "scroll*"]
-  blt::RemoveBindTag $graph scroll-region-$graph
+  rbc::RemoveBindTag $graph scroll-region-$graph
   set zoomInfo($graph,corner) A  
 }
 
-proc blt::ScrollTitle { graph } {
+proc rbc::ScrollTitle { graph } {
     if { [$graph cget -invertxy] } {
         set coords "-Inf -Inf"