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

go_back(): if a write of modified schematic is requested before going up but write fails (for example due to permission issues) then issue a warning and go ahead anyway. Previously xschem got stuck in the lower hierarchy with no way to escape. If xschem load is done with `noundoreset` option do not change some context data (xctx->currsch, xctx->sch_path, xctx->portmap, xctx->sch_inst_number, ...). Various fixes/enhancements in cellview and traversal procedures.

This commit is contained in:
stefan schippers 2025-01-02 22:38:40 +01:00
parent 45382d1b1d
commit 294a10bd5a
4 changed files with 111 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions.c
View File

@ -2403,7 +2403,10 @@ void go_back(int confirm, int set_title) /* 20171006 add confirm */
save_ok = save_schematic(xctx->sch[xctx->currsch]); save_ok = save_schematic(xctx->sch[xctx->currsch]);
} }
} }
if(save_ok==0) return; if(save_ok==0) {
fprintf(errfp, "go_back(): file opening for write failed! %s \n", xctx->current_name);
tclvareval("alert_ {file opening for write failed! ", xctx->current_name, "} {}", NULL);
}
unselect_all(1); unselect_all(1);
if(!tclgetboolvar("keep_symbols")) remove_symbols(); if(!tclgetboolvar("keep_symbols")) remove_symbols();
from_embedded_sym=0; from_embedded_sym=0;

2
src/save.c
View File

@ -3456,7 +3456,6 @@ int load_schematic(int load_symbols, const char *fname, int reset_undo, int aler
my_strdup2(_ALLOC_ID_, &xctx->sch[xctx->currsch], name); my_strdup2(_ALLOC_ID_, &xctx->sch[xctx->currsch], name);
/* local relative reference */ /* local relative reference */
my_strncpy(xctx->current_name, rel_sym_path(name), S(xctx->current_name)); my_strncpy(xctx->current_name, rel_sym_path(name), S(xctx->current_name));
/* local filename specified but coming (push, pop) from web object ... */ /* local filename specified but coming (push, pop) from web object ... */
} else if(is_from_web(xctx->current_dirname) && xschem_web_dirname[0]) { } else if(is_from_web(xctx->current_dirname) && xschem_web_dirname[0]) {
/* ... but not local file from web download --> reset current_dirname */ /* ... but not local file from web download --> reset current_dirname */
@ -3468,7 +3467,6 @@ int load_schematic(int load_symbols, const char *fname, int reset_undo, int aler
my_snprintf(msg, S(msg), "get_directory {%s}", fname); my_snprintf(msg, S(msg), "get_directory {%s}", fname);
my_strncpy(xctx->current_dirname, tcleval(msg), S(xctx->current_dirname)); my_strncpy(xctx->current_dirname, tcleval(msg), S(xctx->current_dirname));
} }
/* local file name */ /* local file name */
my_strdup2(_ALLOC_ID_, &xctx->sch[xctx->currsch], fname); my_strdup2(_ALLOC_ID_, &xctx->sch[xctx->currsch], fname);
/* local relative reference */ /* local relative reference */

16
src/scheduler.c
View File

@ -2829,7 +2829,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
unselect_all(1); unselect_all(1);
/* no implicit undo: if needed do it before loading */ /* no implicit undo: if needed do it before loading */
/* if(!undo_reset) xctx->push_undo(); */ /* if(!undo_reset) xctx->push_undo(); */
xctx->currsch = 0; if(undo_reset) xctx->currsch = 0;
remove_symbols(); remove_symbols();
if(!nofullzoom) { if(!nofullzoom) {
xctx->zoom=CADINITIALZOOM; xctx->zoom=CADINITIALZOOM;
@ -2840,12 +2840,14 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
dbg(1, "scheduler: undo_reset=%d\n", undo_reset); dbg(1, "scheduler: undo_reset=%d\n", undo_reset);
ret = load_schematic(load_symbols, f, undo_reset, !force); ret = load_schematic(load_symbols, f, undo_reset, !force);
dbg(1, "xschem load: ret=%d\n", ret); dbg(1, "xschem load: ret=%d\n", ret);
tclvareval("update_recent_file {", f, "}", NULL); if(undo_reset) {
my_strdup(_ALLOC_ID_, &xctx->sch_path[xctx->currsch], "."); tclvareval("update_recent_file {", f, "}", NULL);
if(xctx->portmap[xctx->currsch].table) str_hash_free(&xctx->portmap[xctx->currsch]); my_strdup(_ALLOC_ID_, &xctx->sch_path[xctx->currsch], ".");
str_hash_init(&xctx->portmap[xctx->currsch], HASHSIZE); if(xctx->portmap[xctx->currsch].table) str_hash_free(&xctx->portmap[xctx->currsch]);
xctx->sch_path_hash[xctx->currsch] = 0; str_hash_init(&xctx->portmap[xctx->currsch], HASHSIZE);
xctx->sch_inst_number[xctx->currsch] = 1; xctx->sch_path_hash[xctx->currsch] = 0;
xctx->sch_inst_number[xctx->currsch] = 1;
}
if(nofullzoom) { if(nofullzoom) {
if(!nodraw) draw(); if(!nodraw) draw();
} else zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97); } else zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97);

179
src/xschem.tcl
View File

@ -1759,8 +1759,27 @@ proc simconf_add {tool} {
incr sim($tool,n) incr sim($tool,n)
} }
############ cellview
# this proc prints symbol bindings (default binding or "schematic" attr in symbol) # this proc prints symbol bindings (default binding or "schematic" attr in symbol)
# of all symbols used in current and sub schematics. # of all symbols used in current and sub schematics.
proc cellview_setlabels {w sch} {
if {[$w get] ne $sch} {
if { [file exists [abs_sym_path [$w get]]] } {
$w configure -bg PaleGreen
} else {
# puts "$sch --- [$sf.f$i.s get]"
$w configure -bg red
}
} else {
if { [file exists [abs_sym_path [$w get]]] } {
$w configure -bg [option get . background {}]
} else {
$w configure -bg red
}
}
}
proc cellview {} { proc cellview {} {
global keep_symbols global keep_symbols
@ -1804,38 +1823,25 @@ proc cellview {} {
if {![file exists $abs_sch]} { if {![file exists $abs_sch]} {
$sf.f$i.s configure -bg red $sf.f$i.s configure -bg red
} elseif {$default_sch ne $sch} { } elseif {$default_sch ne $sch} {
$sf.f$i.s configure -bg green $sf.f$i.s configure -bg PaleGreen
} }
} else {
$sf.f$i.s configure -fg red
} }
balloon $sf.f$i.s $abs_sch balloon $sf.f$i.s $abs_sch
button $sf.f$i.b -text Open -padx 4 -borderwidth 1 -pady 0 -font $font \ button $sf.f$i.b -text Sch -padx 4 -borderwidth 1 -pady 0 -font $font \
-command " -command "
if { {$spice_sym_def} eq {}} { if { [list $spice_sym_def] eq {}} {
xschem load_new_window \[$sf.f$i.s get\] xschem load_new_window \[$sf.f$i.s get\]
} else { } else {
viewdata {$spice_sym_def} editdata [list $spice_sym_def] {Symbol spice_sym_def attribute}
}" }"
if {$spice_sym_def eq {}} { if {$spice_sym_def eq {}} {
$sf.f$i.s insert 0 $sch $sf.f$i.s insert 0 $sch
} else { } else {
$sf.f$i.s insert 0 {<<spice_sym_def>>} $sf.f$i.s insert 0 {defined in symbol spice_sym_def}
} }
bind $sf.f$i.s <KeyRelease> " bind $sf.f$i.s <KeyRelease> "cellview_setlabels %W [list $sch]"
if {\[$sf.f$i.s get\] ne {$sch}} {
if { \[file exists \[abs_sym_path \[$sf.f$i.s get\]\]\] } {
$sf.f$i.s configure -bg green
} else {
puts \"$sch --- \[$sf.f$i.s get\]\"
$sf.f$i.s configure -bg red
}
} else {
if { \[file exists \[abs_sym_path \[$sf.f$i.s get\]\]\] } {
$sf.f$i.s configure -bg [option get . background {}]
} else {
$sf.f$i.s configure -bg red
}
}
"
pack $sf.f$i.l $sf.f$i.s -side left -fill x -expand 1 pack $sf.f$i.l $sf.f$i.s -side left -fill x -expand 1
pack $sf.f$i.b -side left pack $sf.f$i.b -side left
} }
@ -1850,47 +1856,58 @@ proc cellview {} {
set maxsize [expr {[winfo height ${sf}] + [winfo height .cv.top] + [winfo height .cv.bottom]}] set maxsize [expr {[winfo height ${sf}] + [winfo height .cv.top] + [winfo height .cv.bottom]}]
wm maxsize .cv 9999 $maxsize wm maxsize .cv 9999 $maxsize
bind .cv.center.f <Configure> {sframeyview .cv.center} bind .cv.center.f <Configure> {sframeyview .cv.center}
bind .cv <ButtonPress-4> { sframeyview .cv.center scroll -0.2} bind .cv <ButtonPress-4> { sframeyview .cv.center scroll -0.1}
bind .cv <ButtonPress-5> { sframeyview .cv.center scroll 0.2} bind .cv <ButtonPress-5> { sframeyview .cv.center scroll 0.1}
bind .cv <Escape> {destroy .cv}
xschem reload_symbols ;# purge all symbols used in below hierarchies xschem reload_symbols ;# purge all symbols used in below hierarchies
} }
############ /cellview
############ traversal ############ traversal
proc traversal_update_schematic {w parent_sch instname default_sch} {
if {$parent_sch eq {}} {return}
puts "traversal_update_schematic: $w $parent_sch $instname--> [$w get]"
set current [xschem get current_name]
xschem load $parent_sch noundoreset nodraw
set sch [xschem getprop instance $instname schematic]
if { $sch ne [$w get]} {
if { [$w get] eq $default_sch} {
xschem setprop instance $instname schematic fast ;# remove schematic attr on instance
} else {
xschem setprop instance $instname schematic [$w get] fast ;# set schematic attr on instance
}
xschem set_modify 1
xschem save
}
xschem load $current noundoreset nodraw
}
proc traversal_setlabels {w parent_sch sch instname default_sch inst_spice_sym_def sym_spice_sym_def} { proc traversal_setlabels {w parent_sch sch instname default_sch inst_spice_sym_def sym_spice_sym_def} {
global traversal_cnt global traversal_cnt
set sf .cv.center.f.scrl set sf .trav.center.f.scrl
puts "traversal_setlabels $w $parent_sch $sch $instname" # puts "traversal_setlabels $w $parent_sch $sch $instname"
traversal_update_schematic $w $parent_sch $instname $default_sch
# update schematic
if {$parent_sch ne {}} {
set current [xschem get current_name]
puts "traversal_update_schematic: $w parent: $parent_sch $instname def: $default_sch $sch --> [$w get]"
if { $sch ne [$w get] } {
puts "update attr"
xschem load $parent_sch noundoreset nodraw
set sch [xschem getprop instance $instname schematic]
if { $sch ne [$w get]} {
if { [$w get] eq $default_sch} {
xschem setprop instance $instname schematic fast ;# remove schematic attr on instance
} else {
xschem setprop instance $instname schematic [$w get] fast ;# set schematic attr on instance
}
xschem set_modify 1
xschem save
set sch [$w get]
puts "sch set to: $sch"
}
xschem load $current noundoreset nodraw
bind $w <KeyRelease> "
traversal_setlabels $w [list $parent_sch] [list $sch] [list $instname] [list $default_sch] \
[list $inst_spice_sym_def] [list $sym_spice_sym_def]
"
}
}
# /update schematic
if {[$w get] ne $default_sch} { if {[$w get] ne $default_sch} {
if { $sym_spice_sym_def ne {}} { if { $sym_spice_sym_def ne {}} {
$w configure -fg green $w configure -fg PaleGreen
$w configure -bg [option get . background {}] $w configure -bg [option get . background {}]
} elseif {$inst_spice_sym_def ne {}} { } elseif {$inst_spice_sym_def ne {}} {
$w configure -fg red $w configure -fg red
$w configure -bg [option get . background {}] $w configure -bg [option get . background {}]
} elseif { [file exists [abs_sym_path [$w get]]] } { } elseif { [file exists [abs_sym_path [$w get]]] } {
$w configure -fg [option get . foreground {}] $w configure -fg [option get . foreground {}]
$w configure -bg green $w configure -bg PaleGreen
} else { } else {
$w configure -fg [option get . foreground {}] $w configure -fg [option get . foreground {}]
$w configure -bg red $w configure -bg red
@ -1920,37 +1937,37 @@ proc traversal {{only_subckts 0} {all_hierarchy 1}} {
set font fixed set font fixed
} }
toplevel .cv toplevel .trav
wm geometry .cv 1200x400 wm geometry .trav 1200x400
frame .cv.top frame .trav.top
label .cv.top.inst -text {INSTANCE} -width 25 -bg grey60 -anchor w -padx 4 -font $font label .trav.top.inst -text {INSTANCE} -width 25 -bg grey60 -anchor w -padx 4 -font $font
label .cv.top.sym -text {SYMBOL} -width 30 -bg grey60 -anchor w -padx 4 -font $font label .trav.top.sym -text {SYMBOL} -width 30 -bg grey60 -anchor w -padx 4 -font $font
label .cv.top.sch -text SCHEMATIC -width 45 -bg grey60 -anchor w -padx 4 -font $font label .trav.top.sch -text SCHEMATIC -width 45 -bg grey60 -anchor w -padx 4 -font $font
label .cv.top.pad -text { } -bg grey60 -font $font label .trav.top.pad -text { } -bg grey60 -font $font
pack .cv.top.inst -side left -fill x -expand 1 pack .trav.top.inst -side left -fill x -expand 1
pack .cv.top.sym .cv.top.sch -side left -fill x pack .trav.top.sym .trav.top.sch -side left -fill x
pack .cv.top.pad -side left -fill x pack .trav.top.pad -side left -fill x
frame .cv.center frame .trav.center
set sf [sframe .cv.center] set sf [sframe .trav.center]
hier_traversal 0 $only_subckts $all_hierarchy hier_traversal 0 $only_subckts $all_hierarchy
xschem set no_draw 0 xschem set no_draw 0
xschem set no_undo 0 xschem set no_undo 0
set keep_symbols $save_keep set keep_symbols $save_keep
frame .cv.bottom frame .trav.bottom
label .cv.bottom.status -text {STATUS LINE} label .trav.bottom.status -text {STATUS LINE}
pack .cv.bottom.status -fill x -expand yes pack .trav.bottom.status -fill x -expand yes
pack .cv.top -side top -fill x -expand no pack .trav.top -side top -fill x -expand no
pack .cv.center -side top -fill both -expand yes pack .trav.center -side top -fill both -expand yes
pack .cv.bottom -side top -fill x -expand no pack .trav.bottom -side top -fill x -expand no
sframeyview .cv.center place sframeyview .trav.center place
set maxsize [expr {[winfo height ${sf}] + [winfo height .cv.top] + [winfo height .cv.bottom]}] set maxsize [expr {[winfo height ${sf}] + [winfo height .trav.top] + [winfo height .trav.bottom]}]
wm maxsize .cv 9999 $maxsize wm maxsize .trav 9999 $maxsize
bind .cv.center.f <Configure> {sframeyview .cv.center} bind .trav.center.f <Configure> {sframeyview .trav.center}
bind .cv <ButtonPress-4> { sframeyview .cv.center scroll -0.1} bind .trav <ButtonPress-4> { sframeyview .trav.center scroll -0.1}
bind .cv <ButtonPress-5> { sframeyview .cv.center scroll 0.1} bind .trav <ButtonPress-5> { sframeyview .trav.center scroll 0.1}
bind .cv <Escape> {destroy .cv} bind .trav <Escape> {destroy .trav}
} }
# recursive procedure # recursive procedure
@ -1963,7 +1980,7 @@ proc hier_traversal {{level 0} {only_subckts 0} {all_hierarchy 1}} {
} }
set parent_sch [xschem get current_name] set parent_sch [xschem get current_name]
# puts $parent_sch # puts $parent_sch
set sf .cv.center.f.scrl set sf .trav.center.f.scrl
set done_print 0 set done_print 0
set schpath [xschem get sch_path] set schpath [xschem get sch_path]
set instances [xschem get instances] set instances [xschem get instances]
@ -2017,17 +2034,17 @@ proc hier_traversal {{level 0} {only_subckts 0} {all_hierarchy 1}} {
" "
button $sf.f$traversal_cnt.bsch -text {Sch} -padx 4 -borderwidth 1 -pady 0 -font $font \ button $sf.f$traversal_cnt.bsch -text {Sch} -padx 4 -borderwidth 1 -pady 0 -font $font \
-command " -command "
if { {$sym_spice_sym_def} eq {} && {$inst_spice_sym_def} eq {}} { if { [list $sym_spice_sym_def] eq {} && [list $inst_spice_sym_def] eq {}} {
xschem load_new_window \[$sf.f$traversal_cnt.s get\] xschem load_new_window \[$sf.f$traversal_cnt.s get\]
} elseif {{$sym_spice_sym_def} ne {}} { } elseif {[list $sym_spice_sym_def] ne {}} {
editdata {$sym_spice_sym_def} {Symbol spice_sym_def attribute} editdata [list $sym_spice_sym_def] {Symbol spice_sym_def attribute}
} else { } else {
editdata {$inst_spice_sym_def} {Instance spice_sym_def attribute} editdata [list $inst_spice_sym_def] {Instance spice_sym_def attribute}
}" }"
if { $sym_spice_sym_def eq {} && $inst_spice_sym_def eq {}} { if { $sym_spice_sym_def eq {} && $inst_spice_sym_def eq {}} {
bind $sf.f$traversal_cnt.s <KeyRelease> " bind $sf.f$traversal_cnt.s <KeyRelease> "
traversal_setlabels %W {$parent_sch} $sch_tail {$instname} {$default_sch} \ traversal_setlabels %W [list $parent_sch] [list $sch_tail] [list $instname] [list $default_sch] \
{$inst_spice_sym_def} {$sym_spice_sym_def} [list $inst_spice_sym_def] [list $sym_spice_sym_def]
" "
} }
traversal_setlabels $sf.f$traversal_cnt.s {} $sch_tail $instname $default_sch \ traversal_setlabels $sf.f$traversal_cnt.s {} $sch_tail $instname $default_sch \
@ -7656,7 +7673,7 @@ proc set_sim_netlist_waves_buttons {} {
if {![info exists $netlist_var] || [set $netlist_var] eq $simulate_bg} { if {![info exists $netlist_var] || [set $netlist_var] eq $simulate_bg} {
$top_path.menubar entryconfigure Netlist -background $simulate_bg $top_path.menubar entryconfigure Netlist -background $simulate_bg
} else { } else {
$top_path.menubar entryconfigure -background [set $netlist_var] $top_path.menubar entryconfigure Netlist -background [set $netlist_var]
} }
if {![info exists $sim_var] || [set $sim_var] eq $simulate_bg} { if {![info exists $sim_var] || [set $sim_var] eq $simulate_bg} {