Changeset e0578ae in tol


Ignore:
Timestamp:
Nov 3, 2016, 9:58:35 AM (10 years ago)
Author:
Pedro Gea <pgea@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
0731938
Parents:
6207115
Message:

Refs #1933
Se modifica la definición de las columnas de los ::wtree

+ La del inspector (panel izquierdo): LNodeDef, LNode, Li<Field>
+ La del listado de objetos (panel derecho): RNodeDef, RNode, Ri<Field>

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

Location:
tolbase/lib/toltk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • tolbase/lib/toltk/tclIndex

    r6207115 re0578ae  
    329329set auto_index(::TolInspector::OneLine) [list source [file join $dir tolinspe__main.tcl]]
    330330set auto_index(::TolInspector::TrimContent) [list source [file join $dir tolinspe__main.tcl]]
    331 set auto_index(::TolInspector::WNodeDef) [list source [file join $dir tolinspe__wtree1.tcl]]
    332 set auto_index(::TolInspector::WNode) [list source [file join $dir tolinspe__wtree1.tcl]]
    333 set auto_index(::TolInspector::WiIndex) [list source [file join $dir tolinspe__wtree1.tcl]]
    334 set auto_index(::TolInspector::WiName) [list source [file join $dir tolinspe__wtree1.tcl]]
    335 set auto_index(::TolInspector::WiContent) [list source [file join $dir tolinspe__wtree1.tcl]]
    336 set auto_index(::TolInspector::WiPath) [list source [file join $dir tolinspe__wtree1.tcl]]
    337 set auto_index(::TolInspector::WiDescription) [list source [file join $dir tolinspe__wtree1.tcl]]
    338 set auto_index(::TolInspector::WiReference) [list source [file join $dir tolinspe__wtree1.tcl]]
    339 set auto_index(::TolInspector::WiTolReference) [list source [file join $dir tolinspe__wtree1.tcl]]
     331set auto_index(::TolInspector::LNodeDef) [list source [file join $dir tolinspe__wtree1.tcl]]
     332set auto_index(::TolInspector::LNode) [list source [file join $dir tolinspe__wtree1.tcl]]
     333set auto_index(::TolInspector::LiIndex) [list source [file join $dir tolinspe__wtree1.tcl]]
     334set auto_index(::TolInspector::LiName) [list source [file join $dir tolinspe__wtree1.tcl]]
     335set auto_index(::TolInspector::LiReference) [list source [file join $dir tolinspe__wtree1.tcl]]
     336set auto_index(::TolInspector::RNodeDef) [list source [file join $dir tolinspe__wtree1.tcl]]
     337set auto_index(::TolInspector::RNode) [list source [file join $dir tolinspe__wtree1.tcl]]
     338set auto_index(::TolInspector::RiIndex) [list source [file join $dir tolinspe__wtree1.tcl]]
     339set auto_index(::TolInspector::RiName) [list source [file join $dir tolinspe__wtree1.tcl]]
     340set auto_index(::TolInspector::RiContent) [list source [file join $dir tolinspe__wtree1.tcl]]
     341set auto_index(::TolInspector::RiPath) [list source [file join $dir tolinspe__wtree1.tcl]]
     342set auto_index(::TolInspector::RiDescription) [list source [file join $dir tolinspe__wtree1.tcl]]
     343set auto_index(::TolInspector::RiReference) [list source [file join $dir tolinspe__wtree1.tcl]]
    340344set auto_index(::TolInspector::InsertChild) [list source [file join $dir tolinspe__wtree1.tcl]]
    341345set auto_index(::TolInspector::InsertItem) [list source [file join $dir tolinspe__wtree1.tcl]]

  • tolbase/lib/toltk/tolinspe__main.tcl

    r6207115 re0578ae  
    245245  # creation of the left tree
    246246  set wt_tree [::wtree $sw1.wt -table 0 -filter no \
    247     -background white -showroot 1 -selectmode single -showheader 1 \
     247    -background white -showroot 1 -selectmode single -showheader 0 \
    248248    -highlightbackground gray75 -highlightcolor black \
    249249    -highlightthickness 0 -font $toltk_options(fonts,Label) \
    250     -columns [::TolInspector::WNodeDef 1] ]
    251   #@> poner showheader a 0
     250    -columns [::TolInspector::LNodeDef] ]
    252251   
    253252  # configuration of the left tree
    254   #$wt_tree column configure "range 1 end" -visible no
    255   #$wt_tree column configure tail -visible no
     253  $wt_tree column configure "range 1 end" -visible no
    256254  $wt_tree column configure first -expand yes -weight 1
    257255  $wt_tree column configure all -itembackground ""       
    … …  
    263261  set img [::Bitmap::get Objects]
    264262  #@ Se pone el style a mano, no sé la manera natural de hacer esto con wtree
    265   $wt_tree item style set root [WiName 1] [$wt_tree column cget [WiName 1] -itemstyle]
    266   $wt_tree item text root [WiName 1] [mc "Tol Objects"]
    267   $wt_tree item image root [WiName 1] $img
     263  $wt_tree item style set root [LiName] [$wt_tree column cget [LiName] -itemstyle]
     264  $wt_tree item text root [LiName] [mc "Tol Objects"]
     265  $wt_tree item image root [LiName] $img
    268266
    269267  # creation of the node father "Grammars"
    270268  set img [::Bitmap::get Grammars] 
    271   set wt_row [::TolInspector::WNode 1 "" Root $img [mc "Grammars"] "" "" "" "root-grammars" "Grammar"]
     269  set wt_row [::TolInspector::LNode "" Root $img [mc "Grammars"] "Grammar"]
    272270  $wt_tree insert $wt_row -at child -relative root -tags "root-grammars"
    273271  # Inserts in the node of grammars a node by each grammar that exists in Tol
    … …  
    276274  # creation of the node father "Packages"
    277275  set img [::Bitmap::get "package"] 
    278   set wt_row [::TolInspector::WNode 1 "" Root $img [mc "Packages"] "" "" "" "root-packages" "Package"]   
     276  set wt_row [::TolInspector::LNode "" Root $img [mc "Packages"] "Package"]   
    279277  $wt_tree insert $wt_row -at child -relative root -tags "root-packages" -button yes
    280278
    281279  # creation of the node father "Included Files"
    282280  set img [::Bitmap::get "Files"]
    283   set wt_row [::TolInspector::WNode 1 "" Root $img [mc "Included Files"] "" "" "" "root-files" "File"]   
     281  set wt_row [::TolInspector::LNode "" Root $img [mc "Included Files"] "File"]   
    284282  $wt_tree insert $wt_row -at child -relative root -tags "root-files" -button yes
    285283     
    286284  # creation of the node father "Console Objects" 
    287285  set img [::Bitmap::get "Console"]
    288   set wt_row [::TolInspector::WNode 1 "" Root $img [mc "Console Objects"] "" "" "" "root-console" "Console"] 
     286  set wt_row [::TolInspector::LNode "" Root $img [mc "Console Objects"] "Console"] 
    289287  $wt_tree insert $wt_row -at child -relative root -tags "root-console" -button yes
    290288     
    … …  
    339337    -highlightbackground gray75 -highlightcolor black \
    340338    -highlightthickness 0 -font $toltk_options(fonts,Label) \
    341     -columns [::TolInspector::WNodeDef 0] ]
     339    -columns [::TolInspector::RNodeDef] ]
    342340  # configuration of the tree of variables
    343   $wt_vars column configure all -itembackground ""     
     341  $wt_vars column configure [RiGrammar] -visible no
     342  $wt_vars column configure [RiReference] -visible no
     343  $wt_vars column configure all -itembackground ""
    344344  $wt_vars notify bind $wt_vars <Expand-before> "::TolInspector::OpenVariable %I"
    345345  $wt_vars notify bind $wt_vars <Selection> "::TolInspector::SelectItem $wt_vars"
    … …  
    353353    -highlightbackground gray75 -highlightcolor black \
    354354    -highlightthickness 0 -font $toltk_options(fonts,Label) \
    355     -columns [::TolInspector::WNodeDef 0] ]
     355    -columns [::TolInspector::RNodeDef] ]
    356356  # configuration of the tree of functions
     357  $wt_funcs column configure [RiGrammar] -visible no
     358  $wt_funcs column configure [RiReference] -visible no
    357359  $wt_funcs column configure all -itembackground ""     
    358360  $wt_funcs notify bind $wt_funcs <Selection> "::TolInspector::SelectItem $wt_funcs"     

  • tolbase/lib/toltk/tolinspe__tolgui.tcl

    r6207115 re0578ae  
    1 #/////////////////////////////////////////////////////////////////////////////
    21
    32#/////////////////////////////////////////////////////////////////////////////

  • tolbase/lib/toltk/tolinspe__wtree1.tcl

    r6207115 re0578ae  
    1 #/////////////////////////////////////////////////////////////////////////////
    2 
    3 proc ::TolInspector::WNodeDef { istree } {
    4   if { $istree } {
    5     return [list \
    6       [list {image text} -label Name] \
    7       [list text -label Index] \
    8       [list text -label Grammar] \
    9       [list text -label Content] \
    10       [list text -label Description] \
    11       [list text -label Path] \
    12       [list text -label Reference] \
    13       [list text -label "TOL Reference"] \
    14     ] 
    15   } else {
    16     return [list \
    17       [list text -label Index] \
    18       [list text -label Grammar] \
    19       [list {image text} -label Name] \
    20       [list text -label Content] \
    21       [list text -label Description] \
    22       [list text -label Path] \
    23       [list text -label Reference] \
    24       [list text -label "TOL Reference"] \
    25     ]
    26   }
    27 }
    28 
    29 proc ::TolInspector::WNode {istree index grammar icon name content description path reference tolreference} {
    30   if { $istree } {
    31     return [list \
    32       [list $icon $name] \
    33       [list $index] \
    34       [list $grammar] \
    35       [list $content] \
    36       [list $description] \
    37       [list $path] \
    38       [list $reference] \
    39       [list $tolreference] \
    40     ]
    41   } else {
    42     return [list \
    43       [list $index] \
    44       [list $grammar] \
    45       [list $icon $name] \
    46       [list $content] \
    47       [list $description] \
    48       [list $path] \
    49       [list $reference] \
    50       [list $tolreference] \
    51     ]
    52   }
    53 }
    54 
    55 proc ::TolInspector::WiName         { istree } { if {$istree} { return 0 } else { return 2 } }
    56 proc ::TolInspector::WiIndex        { istree } { if {$istree} { return 1 } else { return 0 } }
    57 proc ::TolInspector::WiGrammar      { istree } { if {$istree} { return 2 } else { return 1 } }
    58 proc ::TolInspector::WiContent      { istree } { if {$istree} { return 3 } else { return 3 } }
    59 proc ::TolInspector::WiDescription  { istree } { if {$istree} { return 4 } else { return 4 } }
    60 proc ::TolInspector::WiPath         { istree } { if {$istree} { return 5 } else { return 5 } }
    61 proc ::TolInspector::WiReference    { istree } { if {$istree} { return 6 } else { return 6 } }
    62 proc ::TolInspector::WiTolReference { istree } { if {$istree} { return 7 } else { return 7 } }
     1
     2#/////////////////////////////////////////////////////////////////////////////
     3proc ::TolInspector::LNodeDef { } {
     4#/////////////////////////////////////////////////////////////////////////////
     5  return [list \
     6    [list {image text} -label Name] \
     7    [list text -label Index] \
     8    [list text -label Grammar] \
     9    [list text -label Reference]
     10  ]
     11}
     12
     13#/////////////////////////////////////////////////////////////////////////////
     14proc ::TolInspector::LNode {index grammar icon name reference} {
     15#/////////////////////////////////////////////////////////////////////////////
     16  return [list \
     17    [list $icon $name] \
     18    [list $index] \
     19    [list $grammar] \
     20    [list $reference] \
     21  ]
     22}
     23
     24proc ::TolInspector::LiName         { } { return 0 }
     25proc ::TolInspector::LiIndex        { } { return 1 }
     26proc ::TolInspector::LiGrammar      { } { return 2 }
     27proc ::TolInspector::LiReference    { } { return 3 }
     28
     29#/////////////////////////////////////////////////////////////////////////////
     30proc ::TolInspector::RNodeDef { } {
     31#/////////////////////////////////////////////////////////////////////////////
     32  return [list \
     33    [list text -label Index] \
     34    [list text -label Grammar] \
     35    [list {image text} -label Name] \
     36    [list text -label Content] \
     37    [list text -label Description] \
     38    [list text -label Path] \
     39    [list text -label Reference] \
     40  ]
     41}
     42
     43#/////////////////////////////////////////////////////////////////////////////
     44proc ::TolInspector::RNode {index grammar icon name content description path reference} {
     45#/////////////////////////////////////////////////////////////////////////////
     46  return [list \
     47    [list $index] \
     48    [list $grammar] \
     49    [list $icon $name] \
     50    [list $content] \
     51    [list $description] \
     52    [list $path] \
     53    [list $reference] \
     54  ]
     55}
     56
     57proc ::TolInspector::RiIndex        { } { return 0 }
     58proc ::TolInspector::RiGrammar      { } { return 1 }
     59proc ::TolInspector::RiName         { } { return 2 }
     60proc ::TolInspector::RiContent      { } { return 3 }
     61proc ::TolInspector::RiDescription  { } { return 4 }
     62proc ::TolInspector::RiPath         { } { return 5 }
     63proc ::TolInspector::RiReference    { } { return 6 }
    6364
    6465#/////////////////////////////////////////////////////////////////////////////
    … …  
    183184  #? }
    184185   
    185   #@ ::TolInspector::WNode istree
    186   #@   index grammar icon name
    187   #@   content description path
    188   #@   reference tolreference
    189   set wt_row [::TolInspector::WNode 0 \
    190     $arguments(index) $grammar $icon_grammar $name \
    191     $data3 $brief_desc $path \
    192     "" $tolref ]
     186  #@ ::TolInspector::LNode index grammar
     187  #@   icon name content description path reference
     188  set wt_row [::TolInspector::RNode $arguments(index) $grammar \
     189    $icon_grammar $name $data3 $brief_desc $path $tolref]
    193190 
    194191  set idx [$wt insert $wt_row -at child -relative root]
    195   $wt item element configure $idx [WiIndex 0] eTXT -fill $fcolor ,\
    196     [WiName 0] eTXT -fill $fcolor , [WiContent 0] eTXT -fill $fcolor ,\
    197     [WiDescription 0] eTXT -fill $fcolor , [WiPath 0] eTXT -fill $fcolor
     192  $wt item element configure $idx \
     193    [RiIndex] eTXT -fill $fcolor , \
     194    [RiName] eTXT -fill $fcolor , \
     195    [RiContent] eTXT -fill $fcolor , \
     196    [RiDescription] eTXT -fill $fcolor , \
     197    [RiPath] eTXT -fill $fcolor
    198198 
    199199  incr arguments(index)
    … …  
    247247  #@  + parent_node es usado por InsertSubset para saber dónde insertar
    248248  set arguments(parent_node) $node
    249   set tolReference [$wt_tree item text $node [WiTolReference 1]]
     249  set tolReference [$wt_tree item text $node [LiReference]]
    250250 
    251251  if { [llength $tolReference] == 1 } {
    … …  
    284284    # takes an icon with the same name that the grammar
    285285    set img [ ::Bitmap::get NameBlock ]
    286     set wt_row [::TolInspector::WNode 1 $order NameBlock $img $pkg "" "" "" "package-$order" "NameBlock $pkg"]       
     286    set wt_row [::TolInspector::LNode $order NameBlock $img $pkg "NameBlock $pkg"]       
    287287    $wt_tree insert $wt_row -at child -relative "root-packages" \
    288288      -tags "package-$order" -button yes
    … …  
    304304    # takes an icon with the same name that the grammar
    305305    set img [::Bitmap::get $g] 
    306     set wt_row [::TolInspector::WNode 1 $id Grammar $img $g $g "" "" "grammar-$id" "Grammar $g"]     
     306    set wt_row [::TolInspector::LNode $id Grammar $img $g "Grammar $g"]     
    307307    $wt_tree insert $wt_row -at child -relative "root-grammars" \
    308308      -tags "grammar-$id" -button no
    … …  
    329329    # Tail del fichero. Podría hacerse configurable por el usuario
    330330    set label [file tail $f]
    331     set wt_row [::TolInspector::WNode 1 $index File $img $label $label "" $f "file-$index" [list File $f]]     
     331    set wt_row [::TolInspector::LNode $index File $img $label [list File $f]]     
    332332    #@ la columna FileName se incorpora en la columna 4
    333333    $wt_tree insert $wt_row -at child -relative "root-files" \
    … …  
    364364        }
    365365      }
    366       set wt_row [::TolInspector::WNode 1 $index $grammar $icon $name "" "" "" "console-$index" "Console $index"]     
     366      set wt_row [::TolInspector::LNode $index $grammar $icon $name "Console $index"]     
    367367      #@ la columna FileName de ht_tree se incorpora en la columna 4
    368368      $wt_tree insert $wt_row -at child -relative "root-console" \
    … …  
    436436    #puts [list InsertSubset, indices {lindex $args 5} = $indices]
    437437   
    438 #noaun set obj_ref [lappend [$wt_tree item text $parent_node [WiTolReference 1] $indices] ]
     438#noaun set obj_ref [lappend [$wt_tree item text $parent_node [LiReference] $indices] ]
    439439#noaun Tolcon_Trace "Inserto un nodo nuevo. $obj_ref"
    440440    set index [lindex $indices end]
    441     set tolRefe [eval list [$wt_tree item text $parent_node [WiTolReference 1]] $index]
    442     set wt_row [::TolInspector::WNode 1 $index $grammar $icon $label "" "" "" "" $tolRefe]
     441    set tolRefe [eval list [$wt_tree item text $parent_node [LiReference]] $index]
     442    set wt_row [::TolInspector::LNode $index $grammar $icon $label $tolRefe]
    443443
    444444    if {$label eq ""} {
    … …  
    449449
    450450    set idnew [ $wt_tree insert $wt_row -at end -relative $parent_node -button $has_button]
    451     $wt_tree item element configure $idnew [WiName 1] eTXT -fill $fcolor
     451    $wt_tree item element configure $idnew [LiName] eTXT -fill $fcolor
    452452  }
    453453  } msg
    … …  
    472472  }
    473473 
    474   set tolReference [$wt_tree item text $node [WiTolReference 1]]
     474  set tolReference [$wt_tree item text $node [LiReference]]
    475475 
    476476  Busy
    … …  
    633633  set selAnchor [$wt_tree selection get 0]
    634634 
    635   set grammar [$wt_tree item text $selAnchor [WiName 1] ]
     635  set grammar [$wt_tree item text $selAnchor [LiName] ]
    636636  if { [string compare $grammar "Anything"] } {
    637637    #@ Por aquí si no es Anything
    … …  
    734734 
    735735  set treeParent [$wt_tree selection get 0]
    736   set treeParent_tolRef [$wt_tree item text $treeParent [WiTolReference 1]]
     736  set treeParent_tolRef [$wt_tree item text $treeParent [LiReference]]
    737737 
    738738  set treeNode -1
    739739  if { [llength $treeParent_tolRef] > 1 } {
    740     set grammar [$wt_vars item text $node [WiGrammar 0]]
     740    set grammar [$wt_vars item text $node [RiGrammar]]
    741741    if {$grammar eq "Set" || $grammar eq "NameBlock"} {
    742742      $wt_tree item expand $treeParent
    743743      #@ Se localiza el nodo seleccionado en el árbol (wt_tree)
    744       set index [$wt_vars item text $node [WiIndex 0]]     
     744      set index [$wt_vars item text $node [RiIndex]]     
    745745      foreach node_i [$wt_tree item children $treeParent] {
    746         set index_i [$wt_tree item text $node_i [WiIndex 1]]
     746        set index_i [$wt_tree item text $node_i [LiIndex]]
    747747        if { [string equal $index $index_i] } {
    748748          set treeNode $node_i
    … …  
    793793    if { [string length $entry] } {
    794794      # almost one entry of wt_* selected
    795       set name   [$wt item text $entry [WiName 0]] ;# name of item
    796   Tolcon_Trace "SelectItem $name"     
    797       set itemid [$wt item text $entry [WiIndex 0]] ;# id of item
    798   Tolcon_Trace "SelectItem $itemid"         
    799       set path   [$wt item text $entry [WiPath 0]] ;# path of file of item
    800       set objRef [$wt item text $entry [WiTolReference 0]] ;# info of item
    801       set value [$wt item text $entry [WiContent 0]]
     795      set name   [$wt item text $entry [RiName]] ;# name of item     
     796      set itemid [$wt item text $entry [RiIndex]] ;# id of item       
     797      set path   [$wt item text $entry [RiPath]] ;# path of file of item
     798      set objRef [$wt item text $entry [RiReference]] ;# info of item
     799      set value [$wt item text $entry [RiContent]]
    802800      if { [string equal \"\n\" $value] } {
    803801        # hasn't value       
    … …  
    806804        set value [string trim $value]
    807805      }
    808       set desc [$wt item text $entry [WiDescription 0]]
    809       set grammar [$wt item text $entry [WiGrammar 0]]
    810       set icon [$wt item image $entry [WiName 0] ]
     806      set desc [$wt item text $entry [RiDescription]]
     807      set grammar [$wt item text $entry [RiGrammar]]
     808      set icon [$wt item image $entry [RiName]]
    811809      #(pgea) lista de argumentos que recibe ::TolConsole::OnInfo
    812810      set args [list $icon $grammar $name $value $path $desc $objRef]

  • tolbase/lib/toltk/tolinspe__wtree2.tcl

    r6207115 re0578ae  
    1818
    1919  foreach var $vars_selected {
    20     set name [$wt item text $var [WiName 0]]
     20    set name [$wt item text $var [RiName]]
    2121    #puts "name=$name"
    2222    #Quitamos el objeto de la consola de tol
    … …  
    9292 
    9393  set parent [$wt_tree selection get 0]
    94   set parent_tolReference [$wt_tree item text $parent [WiTolReference 1]]
     94  set parent_tolReference [$wt_tree item text $parent [LiReference]]
    9595 
    9696  set InRootConsole [string equal $parent_tolReference "Console"]
    … …  
    106106    if { [lsearch $vars_selected $node_act] >= 0 } {
    107107      foreach var $vars_selected {
    108         set itemid  [$wt_vars item text $var [WiIndex 0]]
    109         set path    [$wt_vars item text $var [WiPath 0]]
    110         set grammar [$wt_vars item text $var [WiGrammar 0]]
    111         set objName [$wt_vars item text $var [WiName 0]]
    112         set object [$wt_vars item text $var [WiTolReference 0]] 
     108        set itemid  [$wt_vars item text $var [RiIndex]]
     109        set path    [$wt_vars item text $var [RiPath]]
     110        set grammar [$wt_vars item text $var [RiGrammar]]
     111        set objName [$wt_vars item text $var [RiName]]
     112        set object [$wt_vars item text $var [RiReference]] 
    113113       
    114114        #puts "OBJECT=$objName, PATH=$path"
    … …  
    469469    if { [lsearch $vars_selected $node_act] >= 0 } {
    470470      foreach var $vars_selected {
    471         set itemid  [$wt_funcs item text $var [WiIndex 0]]
    472         set path    [$wt_funcs item text $var [WiPath 0]]
    473         set grammar [$wt_funcs item text $var [WiGrammar 0]]
    474         set objName [$wt_funcs item text $var [WiName 0]]
    475         set object [$wt_funcs item text $var [WiTolReference 0]]   
     471        set itemid  [$wt_funcs item text $var [RiIndex]]
     472        set path    [$wt_funcs item text $var [RiPath]]
     473        set grammar [$wt_funcs item text $var [RiGrammar]]
     474        set objName [$wt_funcs item text $var [RiName]]
     475        set object [$wt_funcs item text $var [RiReference]]   
    476476        # La única gramática seleccionable en wt_funcs es Code
    477477        lappend code_selected [list $object $objName $path]
    … …  
    534534  if { ![string length $selection] } { return }
    535535 
    536   set tolReference [$wt_tree item text $selection [WiTolReference 1]]
     536  set tolReference [$wt_tree item text $selection [LiReference]]
    537537  if { [llength $tolReference] == 2 } {
    538538    set InRootFiles [string equal [lindex $tolReference 0] "File"]
    … …  
    553553      if { $index == 0 } return
    554554      # if user selects a root or a grammar doesn't nothing     
    555       set tolReference [$wt_tree item text $index [WiTolReference 1]]
     555      set tolReference [$wt_tree item text $index [LiReference]]
    556556      if { [llength $tolReference] == 1 } return
    557557     
    558558      # label of object showed in the tree
    559       set objName [$wt_tree item text [WiName 1]]
    560       set object [$wt_tree item text [WiTolReference 1]]
     559      set objName [$wt_tree item text [LiName]]
     560      set object [$wt_tree item text [LiReference]]
    561561     
    562562      if {$InRootFiles} {
    563         set objName [$wt_tree item text $index [WiPath 1]]
     563        set objName [lindex $tolReference 1]
    564564      }   
    565565      # TICKET: #1438
    … …  
    633633
    634634  foreach var $vars_selected {
    635     set reference [$wt item text $var [WiTolReference 0]]
     635    set reference [$wt item text $var [RiReference]]
    636636    #Tolcon_Trace "GetObjectFromAddress(\"[::tol::info address $reference]\")"
    637637    ::tol::console eval "GetObjectFromAddress(\"[::tol::info address $reference]\")"
    … …  
    650650  set names ""
    651651  foreach var $vars_selected {   
    652     lappend names [$wt item text $var [WiName 0]]
     652    lappend names [$wt item text $var [RiName]]
    653653  }
    654654  ::TolConsole::ToEvalWindow [ListToStr $names]
Note: See TracChangeset for help on using the changeset viewer.