Skip to content

halshow: show pins and parameters in one tree #4147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
grandixximo wants to merge 1 commit into
base: master
Choose a base branch
from
+98 −41
Draft

halshow: show pins and parameters in one tree #4147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 98 additions & 41 deletions tcl/bin/halshow.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ proc readIni {} {

set ::initPhase true
set ::autoSaveWatchlist 1
set ::separateParams 0
set ::use_prefs true
proc saveIni {} {
# The flag 'initPhase' prevents saving on the first FocusIn event
Expand Down Expand Up @@ -91,6 +92,7 @@ proc saveIni {} {
puts $fc "set ::ifmts $::ifmts"
puts $fc "set ::alwaysOnTop $::alwaysOnTop"
puts $fc "set ::autoSaveWatchlist $::autoSaveWatchlist"
puts $fc "set ::separateParams $::separateParams"
close $fc
}
}
Expand Down Expand Up @@ -254,6 +256,9 @@ set viewmenu [menu $menubar.view -tearoff 0]
$viewmenu add command -label [msgcat::mc "Expand Signals"] \
-command {showNode {sig}}
$viewmenu add separator
$viewmenu add checkbutton -label [msgcat::mc "Separate parameters"] \
-variable ::separateParams -command {refreshHAL}
$viewmenu add separator
$viewmenu add command -label [msgcat::mc "Reload tree view"] \
-command {refreshHAL}

Expand Down Expand Up @@ -425,14 +430,16 @@ proc addSubTree {item} {
set list [eval hal "show $item"]
regexp ".*(?=\\s)" $item type
addToWatchFromSel $type $list
# merged tree branches hold params too
if {!$::separateParams && $type == "pin"} {
addToWatchFromSel param [hal show param [lindex $item 1]]
}
}
}

#----------tree widget handlers----------
# a global var -- ::treenodes -- holds the names of existing nodes
# ::nodenames are the text applied to the toplevel tree nodes
# they could be internationalized here but the international name
# must contain no whitespace. I'm not certain how to do that.
set ::nodenames {Components Pins Parameters Signals Functions Threads}

# ::searchnames is the real name to be used to reference
Expand All @@ -449,8 +456,10 @@ proc refreshHAL {} {
}
}
}
# clean out the old tree
$::treew delete $::searchnames
# clean out the old tree (param top node absent in merged mode)
foreach node $::searchnames {
catch {$::treew delete $node}
}
# reread hal and make new nodes
listHAL
# read opennodes and set tree state if they still exist
Expand All @@ -462,59 +471,81 @@ proc refreshHAL {} {
showHAL $::oldvar
}

# remove items that do not match the filter regex
proc filterList {lst} {
if {!($::fe_active && $::txt_filt != "")} {
return $lst
}
set out ""
foreach path $lst {
if {$::search_full_path} {
if {[regexp $::txt_filt $path]} {
lappend out $path
}
} else {
foreach item [split $path "."] {
if {[regexp $::txt_filt $item]} {
lappend out $path
break
}
}
}
}
return $out
}

# listhal gets $searchname stuff
# and calls makeNodeX with list of stuff found.
# pins and params share one tree unless ::separateParams is set
proc listHAL {} {
set i 0
set i -1
foreach node $::searchnames {
writeNode "$i root $node [lindex $::nodenames $i] 1"
set ${node}str [hal list $node]

# remove items from tree that do not match the regex
if {$::fe_active && $::txt_filt != ""} {
set temp [split [string trim [set ${node}str]] " "]
set ${node}str ""
foreach path $temp {
if {$::search_full_path} {
if {[regexp $::txt_filt $path]} {
lappend ${node}str $path
}
} else {
set items [split $path "."]
foreach item $items {
if {[regexp $::txt_filt $item]} {
lappend ${node}str $path
break
}
}
}
}
incr i
if {$node == "param" && !$::separateParams} {continue}
set name [lindex $::nodenames $i]
if {$node == "pin" && !$::separateParams} {
set name "Pins & Parameters"
}
writeNode [list $i root $node $name 1]
set items [filterList [hal list $node]]

switch -- $node {
pin {-}
param {
makeNodeP $node [set ${node}str]
pin {
set pairs {}
foreach p $items {lappend pairs [list $p pin]}
if {!$::separateParams} {
foreach p [filterList [hal list param]] {
lappend pairs [list $p param]
}
set pairs [lsort -index 0 $pairs]
}
makeNodeP $node $pairs
}
param -
sig {
makeNodeP $node [set ${node}str]
set pairs {}
foreach p $items {lappend pairs [list $p $node]}
makeNodeP $node $pairs
}
comp {-}
funct {-}
comp -
funct -
thread {
makeNodeOther $node [set ${node}str]
makeNodeOther $node $items
}
default {}
}
incr i
}
}

proc makeNodeP {which pstring} {
# pairs is a list of {name leaftype} elements; the leaf node id keeps
# the real type ("pin+x.y" / "param+x.y") so type-dependent handlers
# (show, watch, popup) keep working in the merged tree
proc makeNodeP {which pairs} {
# make an array to hold position counts
array set pcounts {1 1}
# consider each listed element
foreach p $pstring {
foreach pair $pairs {
lassign $pair p leaftype
set elementlist [split $p "." ]
set lastnode [llength $elementlist]
set i 1
Expand All @@ -526,6 +557,9 @@ proc makeNodeP {which pstring} {
set parent $snode; set snode "$snode.$element"
}
set leaf [expr {$i == $lastnode}]
if {$leaf} {
set snode "$leaftype+$p"
}
set j $pcounts($i)
if {! [$::treew exists "$snode"] } {
writeNode [list $j $parent $snode $element $leaf]
Expand Down Expand Up @@ -556,8 +590,13 @@ proc makeNodeOther {which otherstring} {
# writeNode handles tree node insertion for makeNodeX
# builds a global list -- ::treenodes -- but not leaves
proc writeNode {arg} {
scan $arg {%i %s %s %s %i} j base node name leaf
$::treew insert end $base $node -text $name
lassign $arg j base node name leaf
if {$leaf > 0 && [string match "param+*" $node]} {
# param leaves get the watch-tab param color
$::treew insert end $base $node -text $name -fill #6e3400
} else {
$::treew insert end $base $node -text $name
}

if {$::txt_filt != ""} {
# strip/extract leading type
Expand Down Expand Up @@ -604,6 +643,10 @@ proc openTreePath {path_in highlight_n} {
foreach item $items_reduced {
if {$i==0} {
set path $item
# merged tree keeps param intermediates under the pin top node
if {$path == "param" && ![$::treew exists param]} {
set path "pin"
}
} elseif {$i==1} {
set path [string cat $path "+" $item]
} else {
Expand All @@ -617,6 +660,9 @@ proc openTreePath {path_in highlight_n} {
}
incr i 1
}
if {![$::treew exists $path_in]} {
regsub {^param\+} $path_in {pin+} path_in
}
catch {$::treew selection add $path_in}
}

Expand All @@ -625,14 +671,17 @@ proc showNode {which} {
open {-}
close {
foreach type $::searchnames {
$::treew ${which}tree $type
catch {$::treew ${which}tree $type}
}
}
pin {-}
param {-}
sig {
foreach type $::searchnames {
$::treew closetree $type
catch {$::treew closetree $type}
}
if {$which == "param" && ![$::treew exists param]} {
set which pin
}
$::treew opentree $which
$::treew see $which
Expand Down Expand Up @@ -787,6 +836,11 @@ proc showHAL {which} {
set searchbase [lindex $thislist 0]
set searchstring [lindex $thislist 1]
set thisret [hal show $searchbase $searchstring]
# merged tree branches hold params too
if {!$::separateParams && $searchbase == "pin" \
&& ![catch {$::treew nodes $which} children] && [llength $children]} {
append thisret "\n" [hal show param $searchstring]
}
displayThis $thisret
}

Expand Down Expand Up @@ -1432,6 +1486,9 @@ if {[llength $::argv] > 0} {
# This overrides the default settings above.
if {$::use_prefs} {
readIni
if {$::separateParams} {
refreshHAL
}
if {$::ratio == 0} {
hideListview false
}
Expand Down
Loading