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

do not rely on raw file existence to decide if a raw is loaded. Added a function raw_is_loaded for that

This commit is contained in:
stefan schippers 2024-02-23 01:51:35 +01:00
parent 2556cce2c2
commit 23092fc963
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/xschem.tcl
View File

@ -2467,6 +2467,25 @@ proc graph_set_linewidth {graph_sel} {
} }
} }
proc raw_is_loaded {rawfile type} {
set loaded 0
set r [catch "uplevel #0 {subst $rawfile}" res]
if {$r == 0} {
set rawfile $res
} else {
return $loaded
}
set rawlist [lrange [xschem raw info] 2 end]
foreach {n f t} $rawlist {
if {$rawfile eq $f && $type eq $t} {
set loaded 1
break
}
}
return $loaded
}
proc graph_edit_properties {n} { proc graph_edit_properties {n} {
global graph_bus graph_sort graph_digital graph_selected graph_sel_color global graph_bus graph_sort graph_digital graph_selected graph_sel_color
global graph_unlocked graph_schname graph_logx graph_logy cadlayers graph_rainbow global graph_unlocked graph_schname graph_logx graph_logy cadlayers graph_rainbow
@ -2546,7 +2565,7 @@ proc graph_edit_properties {n} {
if { [info tclversion] > 8.4} { if { [info tclversion] > 8.4} {
bind .graphdialog.center.right.list <<ComboboxSelected>> { bind .graphdialog.center.right.list <<ComboboxSelected>> {
xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast
if {[file_exists [.graphdialog.center.right.rawentry get]]} { if {[raw_is_loaded [.graphdialog.center.right.rawentry get] [.graphdialog.center.right.list get]]} {
graph_fill_listbox graph_fill_listbox
} }
} }
@ -2566,7 +2585,7 @@ proc graph_edit_properties {n} {
bind .graphdialog.center.right.list <KeyRelease> { bind .graphdialog.center.right.list <KeyRelease> {
xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast
if {[file_exists [.graphdialog.center.right.rawentry get]]} { if {[raw_is_loaded [.graphdialog.center.right.rawentry get] [.graphdialog.center.right.list get]]} {
graph_fill_listbox graph_fill_listbox
} }
} }
@ -2579,7 +2598,7 @@ proc graph_edit_properties {n} {
.graphdialog.center.right.rawentry insert 0 [string map [list $netlist_dir {$netlist_dir}] [select_raw]] .graphdialog.center.right.rawentry insert 0 [string map [list $netlist_dir {$netlist_dir}] [select_raw]]
xschem setprop rect 2 $graph_selected rawfile [.graphdialog.center.right.rawentry get] fast xschem setprop rect 2 $graph_selected rawfile [.graphdialog.center.right.rawentry get] fast
xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast
if {[file_exists [.graphdialog.center.right.rawentry get]]} { if {[raw_is_loaded [.graphdialog.center.right.rawentry get] [.graphdialog.center.right.list get]]} {
graph_fill_listbox graph_fill_listbox
} }
@ -2588,7 +2607,7 @@ proc graph_edit_properties {n} {
bind .graphdialog.center.right.rawentry <KeyRelease> { bind .graphdialog.center.right.rawentry <KeyRelease> {
xschem setprop rect 2 $graph_selected rawfile [.graphdialog.center.right.rawentry get] fast xschem setprop rect 2 $graph_selected rawfile [.graphdialog.center.right.rawentry get] fast
xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast xschem setprop rect 2 $graph_selected sim_type [.graphdialog.center.right.list get] fast
if {[file_exists [.graphdialog.center.right.rawentry get]]} { if {[raw_is_loaded [.graphdialog.center.right.rawentry get] [.graphdialog.center.right.list get]]} {
graph_fill_listbox graph_fill_listbox
} }
} }