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

fix initialfile handling in load_file_dialog

This commit is contained in:
Stefan Frederik 2022-01-16 22:18:06 +01:00
parent 4379a68a19
commit 264b602b8d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xschem.tcl
View File

@ -1364,19 +1364,17 @@ proc edit_netlist {schname } {
# ext: .sch or .sym or .sch.sym or .sym.sch # ext: .sch or .sym or .sch.sym or .sym.sch
# #
proc save_file_dialog { msg ext global_initdir {initialf {}} {overwrt 1} } { proc save_file_dialog { msg ext global_initdir {initialf {}} {overwrt 1} } {
global save_initialfile
set save_initialfile $initialf
upvar #0 $global_initdir initdir upvar #0 $global_initdir initdir
set temp $initdir set temp $initdir
if { $save_initialfile ne {}} { if { $initialf ne {}} {
set initialdir [file dirname $save_initialfile] set initialdir [file dirname $initialf]
set save_initialfile [file tail $save_initialfile] set initialf [file tail $initialf]
} else { } else {
set initialdir $initdir set initialdir $initdir
set save_initialfile {} set initialf {}
} }
set initdir $initialdir set initdir $initialdir
set r [load_file_dialog $msg $ext $global_initdir 0 $overwrt] set r [load_file_dialog $msg $ext $global_initdir 0 $overwrt $initialf]
set initdir $temp set initdir $temp
return $r return $r
} }
@ -1512,12 +1510,12 @@ proc load_file_dialog_up {dir} {
} }
proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}} proc load_file_dialog {{msg {}} {ext {}} {global_initdir {INITIALINSTDIR}}
{loadfile {1}} {confirm_overwrt {1}}} { {loadfile {1}} {confirm_overwrt {1}} {initialf {}}} {
global myload_index1 myload_files2 myload_files1 myload_retval myload_dir1 pathlist OS global myload_index1 myload_files2 myload_files1 myload_retval myload_dir1 pathlist OS
global myload_default_geometry myload_sash_pos myload_yview tcl_version globfilter myload_dirs2 global myload_default_geometry myload_sash_pos myload_yview tcl_version globfilter myload_dirs2
global save_initialfile global save_initialfile
set_ne save_initialfile {} set save_initialfile $initialf
set globfilter * set globfilter *
set myload_retval {} set myload_retval {}
upvar #0 $global_initdir initdir upvar #0 $global_initdir initdir
@ -1917,7 +1915,7 @@ proc schpins_to_sympins {} {
set x0 [lindex $ii 2] set x0 [lindex $ii 2]
set y0 [lindex $ii 3] set y0 [lindex $ii 3]
if {$first} { if {$first} {
puts $fd "G { $x0 $y0 } " puts $fd "G {$x0 $y0 }"
set first 0 set first 0
} }
set pinx1 [expr {$x0-$pinhsize}] set pinx1 [expr {$x0-$pinhsize}]