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

extra_rawfile: added null sim_type (type) check in table_read

This commit is contained in:
stefan schippers 2024-02-27 23:32:53 +01:00
parent 0ab7affda2
commit 2f1b819755
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/save.c
View File

@ -1041,7 +1041,7 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->extra_raw_n++;
}
/* **************** table_read ************* */
if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && !strcmp(type, "table")) {
if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && (type && !strcmp(type, "table"))) {
tclvareval("subst {", file, "}", NULL);
my_strncpy(f, tclresult(), S(f));
dbg(1, "extra_rawfile: table_read: f=%s\n", f);

16
src/xschem.tcl
View File

@ -2557,8 +2557,9 @@ proc graph_edit_properties {n} {
# center right frame
label .graphdialog.center.right.lab1 -text { Signals in graph }
label .graphdialog.center.right.lab2 -text { Sim type:}
if { [info tclversion] > 8.4} {
ttk::combobox .graphdialog.center.right.list -values {dc ac tran op sp spectrum noise table} -width 4
ttk::combobox .graphdialog.center.right.list -values {dc ac tran op sp spectrum noise table} -width 9
} else {
entry .graphdialog.center.right.list -width 4
}
@ -2620,19 +2621,20 @@ proc graph_edit_properties {n} {
scrollbar .graphdialog.center.right.yscroll -command {.graphdialog.center.right.text1 yview}
scrollbar .graphdialog.center.right.xscroll -orient horiz -command {.graphdialog.center.right.text1 xview}
grid .graphdialog.center.right.lab1 .graphdialog.center.right.list .graphdialog.center.right.rawbut \
.graphdialog.center.right.rawentry -
grid .graphdialog.center.right.lab1 .graphdialog.center.right.lab2 .graphdialog.center.right.list \
.graphdialog.center.right.rawbut .graphdialog.center.right.rawentry -
grid configure .graphdialog.center.right.rawentry -sticky ew
grid .graphdialog.center.right.text1 - - - .graphdialog.center.right.yscroll -sticky nsew
grid .graphdialog.center.right.xscroll - - - - -sticky ew
grid .graphdialog.center.right.text1 - - - - .graphdialog.center.right.yscroll -sticky nsew
grid .graphdialog.center.right.xscroll - - - - - -sticky ew
grid rowconfig .graphdialog.center.right 0 -weight 0
grid rowconfig .graphdialog.center.right 1 -weight 1 -minsize 3c
grid rowconfig .graphdialog.center.right 2 -weight 0
grid columnconfig .graphdialog.center.right 0 -weight 0
grid columnconfig .graphdialog.center.right 1 -weight 0
grid columnconfig .graphdialog.center.right 2 -weight 0
grid columnconfig .graphdialog.center.right 3 -weight 1
grid columnconfig .graphdialog.center.right 4 -weight 0
grid columnconfig .graphdialog.center.right 3 -weight 0
grid columnconfig .graphdialog.center.right 4 -weight 1
grid columnconfig .graphdialog.center.right 5 -weight 0
# bottom frame
button .graphdialog.bottom.cancel -text Cancel -command {