luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added execute(exitcode,id) will not be deleted at end of sim. proc graph_tag_nodes works with or without graphdialog open. If it is open it will tag nodes therein, if not it merely returns start and end indexes of nodes in its txt argument

This commit is contained in:
stefan schippers 2023-11-17 21:36:34 +01:00
parent 41f66117e9
commit 2dac7f1735
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/xschem.tcl
View File

@ -216,7 +216,8 @@ proc set_ne { var val } {
# $execute(data,$id) contains the stdout of the pipeline (output data) # $execute(data,$id) contains the stdout of the pipeline (output data)
# $execute(cmd,$id) contains the pipeline command # $execute(cmd,$id) contains the pipeline command
# $execute(win_path,$id) contains the xctx->current_win_path that started the command # $execute(win_path,$id) contains the xctx->current_win_path that started the command
# when subprocess ends all execute(...,$id) data is cleared # $execute(exitcode,id) contains the exit code. This variable will not be deleted at the end
# when subprocess ends all execute(...,$id) data is cleared (except execute(exitcode,id)
# #
# The following post-mortem data is available for last finished process: # The following post-mortem data is available for last finished process:
# execute(cmd,last) : the command # execute(cmd,last) : the command
@ -281,6 +282,7 @@ proc execute_fileevent {id} {
if {$report} {viewdata "Completed: $execute(cmd,$id)\ndata:\n$execute(data,$id)"} if {$report} {viewdata "Completed: $execute(cmd,$id)\ndata:\n$execute(data,$id)"}
} }
set execute(exitcode,last) $exit_status set execute(exitcode,last) $exit_status
set execute(exitcode,$id) $exit_status
if {[info exists execute(callback,$id)] && $execute(callback,$id) ne {}} { if {[info exists execute(callback,$id)] && $execute(callback,$id) ne {}} {
# puts $execute(callback,$id) # puts $execute(callback,$id)
# puts $execute(win_path,$id) # puts $execute(win_path,$id)
@ -2266,46 +2268,53 @@ proc graph_change_wave_color {{wave {}}} {
} }
} }
# set txt [xschem getprop rect 2 $n node 2]
# set txt [.graphdialog.center.right.text1 get 1.0 {end - 1 chars}]
# return first and last indexes of nodes in txt
proc graph_tag_nodes {txt} { proc graph_tag_nodes {txt} {
global graph_selected graph_sel_color global graph_selected graph_sel_color
# delete old tags # delete old tags
eval .graphdialog.center.right.text1 tag delete [ .graphdialog.center.right.text1 tag names] if { [winfo exists .graphdialog.center.right.text1] } {
eval .graphdialog.center.right.text1 tag delete [ .graphdialog.center.right.text1 tag names]
set col [xschem getprop rect 2 $graph_selected color]
set col [string trim $col " \n"]
}
set regx {(?:tcleval\(\n*)?("[^"]+"|[^ \t\n)]+)(?:\))?} set regx {(?:tcleval\(\n*)?("[^"]+"|[^ \t\n)]+)(?:\))?}
set tt {} set tt {}
set cc {} set cc {}
set start 0 set start 0
set col [xschem getprop rect 2 $graph_selected color]
set col [string trim $col " \n"]
while {[regexp -indices -start $start $regx $txt idxall idx]} { while {[regexp -indices -start $start $regx $txt idxall idx]} {
lappend tt [lindex $idx 0] lappend tt [lindex $idx 0]
set start [expr {[lindex $idx 1] + 1}] set start [expr {[lindex $idx 1] + 1}]
lappend cc $start lappend cc $start
} }
set n 0 if { [winfo exists .graphdialog.center.right.text1] } {
if { $tt ne {} } { set n 0
foreach t $tt c $cc { if { $tt ne {} } {
set col_idx [lindex $col $n] foreach t $tt c $cc {
# add missing colors set col_idx [lindex $col $n]
if {$col_idx eq {}} { # add missing colors
set col_idx $graph_sel_color if {$col_idx eq {}} {
lappend col $graph_sel_color set col_idx $graph_sel_color
lappend col $graph_sel_color
}
set b [lindex $tctx::colors $col_idx]
.graphdialog.center.right.text1 tag add t$n "1.0 + $t chars" "1.0 + $c chars"
if { [info tclversion] > 8.4} {
.graphdialog.center.right.text1 tag configure t$n -background $b -selectbackground grey40
} else {
.graphdialog.center.right.text1 tag configure t$n -background $b
}
incr n
} }
set b [lindex $tctx::colors $col_idx] # remove excess colors
.graphdialog.center.right.text1 tag add t$n "1.0 + $t chars" "1.0 + $c chars" set col [lrange $col 0 [expr {$n - 1}]]
if { [info tclversion] > 8.4} { } else {
.graphdialog.center.right.text1 tag configure t$n -background $b -selectbackground grey40 set col {}
} else {
.graphdialog.center.right.text1 tag configure t$n -background $b
}
incr n
} }
# remove excess colors xschem setprop rect 2 $graph_selected color $col fast
set col [lrange $col 0 [expr {$n - 1}]]
} else {
set col {}
} }
xschem setprop rect 2 $graph_selected color $col fast
return [list $tt $cc] return [list $tt $cc]
} }