Changeset 7b8f6fc in tol

Timestamp:

Nov 28, 2016, 10:42:29 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

6f7a669

Parents:

0bf09a4

Message:

Refs #1933
Se redibuja el gráfico tras actualizar los ejes ($graph configure axis ...) ya que según parece con rbc esto no se hace automáticamente.
Se añade el método ClearCrosshairs.
Se soluciona un bug decompilando archivos desde la ventana derecha del inspector.
Se corrige la actualización del inspector según el item seleccionado en el árbol.

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

Location:

tolbase/lib/toltk

Files:

• bysgraph.tcl (modified) (2 diffs)
• bysgropt.tcl (modified) (1 diff)
• graph.tcl (modified) (4 diffs)
• tclIndex (modified) (1 diff)
• tolinspe__wtree2.tcl (modified) (6 diffs)

tolbase/lib/toltk/bysgraph.tcl

@@ -653 +653 @@
   # comprobamos que existan valores y aplicamos
   if {([info exists values_y]) && ([llength $values_y])} {
-
     set tmpOpt(var,yAxisMin) [lindex $values_y 0]
     set tmpOpt(var,yAxisMax) [lindex $values_y 1]
@@ -679 +678 @@
       $tmpOpt(var,x2AxisMin) $tmpOpt(var,x2AxisMax)
   }
-  #Aplicamos valores a loe ejes
-  GrapOptApplyAxisTicks    $this ${this}::options gr,$gr
+  #Aplicamos valores a los ejes
+  GrapOptApplyAxisTicks $this ${this}::options gr,$gr
 }
 

tolbase/lib/toltk/bysgropt.tcl

@@ -3759 +3759 @@
     }
     $g axis configure $axis $axis -min $min -max $max
+    #@! Redibuja el gráfico
+    event generate $g <Configure>
   }
 }

tolbase/lib/toltk/graph.tcl

@@ -85 +85 @@
 }
 
+proc rbc::ClearCrosshairs { graph } {
+    rbc::RemoveBindTag $graph crosshairs-$graph
+    $graph crosshairs off
+}
+
 proc rbc::InitStack { graph {mode zoom-frame} } {
     global zoomInfo
@@ -93 +98 @@
     set zoomInfo($graph,mode) $mode
 }
-
 
 proc rbc::SetZoomScale { graph scale } {
@@ -155 +159 @@
     $graph axis configure $axis -min $min -max $max
   }
+  #@! Redibuja el gráfico
+  event generate $graph <Configure>
   # This "update" forces the graph to be redrawn
   set this [::bayesGraph::getInstance $graph]
@@ -253 +259 @@
     $graph axis configure $axis -min $lower -max $upper
   }
+  #@! Redibuja el gráfico
+  event generate $graph <Configure>
   set zoomInfo($graph,A,x) $zoomInfo($graph,B,x)
   set zoomInfo($graph,A,y) $zoomInfo($graph,B,y)

tolbase/lib/toltk/tclIndex

@@ -795 +795 @@
 
 set auto_index(Rbc_ViewMode) [list source [file join $dir graph.tcl]]
+set auto_index(::rbc::ClearCrosshairs) [list source [file join $dir graph.tcl]]
 set auto_index(::rbc::SetZoomScale) [list source [file join $dir graph.tcl]]
 set auto_index(::rbc::ClearMode) [list source [file join $dir graph.tcl]]

tolbase/lib/toltk/tolinspe__wtree2.tcl

@@ -36 +36 @@
     set open 1
   }
-  if { [$wt_tree item state get $idx_file focus] } {
+  if { [$wt_tree item state get $idx_file selected] } {
     SelectObject
   }
@@ -55 +55 @@
     set open 1
   }
-  if { [$wt_tree item state get $idx focus] } {
+  if { [$wt_tree item state get $idx selected] } {
     SelectObject
   }
@@ -76 +76 @@
 
   #Tolcon_Trace "Abierto el nodo root-console"
-  if { [$wt_tree item state get $idx_con focus] } {
+  if { [$wt_tree item state get $idx_con selected] } {
     SelectObject
   }
@@ -376 +376 @@
             File {
               if {[llength $options_selected(File)] == 1} {
-                set objName [lindex [lindex $options_selected(File) 0] 1]
+                set objName [lindex [lindex $options_selected(File) 0] 2]               
                 $data_menu(main) add command -label [mc "View file"] \
                   -command [list ::TolInspector::ViewFile $objName]
@@ -388 +388 @@
                 foreach objInfo $options_selected(File) {
                   $data_menu(File,View) add command -label [lindex $objInfo 1] \
-                    -command [list ::TolInspector::ViewFile [lindex $objInfo 1]]
+                    -command [list ::TolInspector::ViewFile [lindex $objInfo 2]]
                 }
                 if $InRootFiles {
@@ -395 +395 @@
                   foreach objInfo $options_selected(File) {
                     $data_menu(File,Decompile) add command -label [lindex $objInfo 1] \
-                      -command [list ::TolInspector::DecompileFile [lindex $objInfo 1]]
+                      -command [list ::TolInspector::DecompileFile [lindex $objInfo 2]]
                   }
                 }