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

fix occasional crashes due to graph_fullxzoom() getting sweep variable index in raw file before switching to graph-specific raw file

This commit is contained in:
stefan schippers 2023-11-29 01:26:45 +01:00
parent 83c692caa9
commit c069afcc40
3 changed files with 1947 additions and 1939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3874
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

4
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -195,6 +195,9 @@
<Component Id="cmp1071C99069CE6835CDBA246D9D5D210B" Guid="{8A50256C-0EDE-4F08-8222-6B3043DB4950}"> <Component Id="cmp1071C99069CE6835CDBA246D9D5D210B" Guid="{8A50256C-0EDE-4F08-8222-6B3043DB4950}">
<File Id="filA2670628434AA0F9255A403C652BBA8E" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\netlist_options.sym" /> <File Id="filA2670628434AA0F9255A403C652BBA8E" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\netlist_options.sym" />
</Component> </Component>
<Component Id="cmp8C03AA2ECC5A1F62EFF5D1CEEF725478" Guid="{7226B761-803B-46BD-935B-DC5334F773C3}">
<File Id="fil853CBBFC5325C9B4F94505B11CB35CBC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\ngspice_analog_delay.sym" />
</Component>
<Component Id="cmpDBD7997C2E32AB5D4A9CFE2301C1B9E8" Guid="{E35B29D9-7409-47F0-960F-3063591D4BE8}"> <Component Id="cmpDBD7997C2E32AB5D4A9CFE2301C1B9E8" Guid="{E35B29D9-7409-47F0-960F-3063591D4BE8}">
<File Id="filFE27318FA571F622717E8186B840ABAC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\ngspice_get_expr.sym" /> <File Id="filFE27318FA571F622717E8186B840ABAC" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\ngspice_get_expr.sym" />
</Component> </Component>
@ -5609,6 +5612,7 @@
<ComponentRef Id="cmp6CFF58EC20DE9A94567E92EEB4581B19" /> <ComponentRef Id="cmp6CFF58EC20DE9A94567E92EEB4581B19" />
<ComponentRef Id="cmp1C5188CE5D0575ED3B8191F0256A5A88" /> <ComponentRef Id="cmp1C5188CE5D0575ED3B8191F0256A5A88" />
<ComponentRef Id="cmp1071C99069CE6835CDBA246D9D5D210B" /> <ComponentRef Id="cmp1071C99069CE6835CDBA246D9D5D210B" />
<ComponentRef Id="cmp8C03AA2ECC5A1F62EFF5D1CEEF725478" />
<ComponentRef Id="cmpDBD7997C2E32AB5D4A9CFE2301C1B9E8" /> <ComponentRef Id="cmpDBD7997C2E32AB5D4A9CFE2301C1B9E8" />
<ComponentRef Id="cmpD848F0569DB3AD069EA0882CFC8AAB44" /> <ComponentRef Id="cmpD848F0569DB3AD069EA0882CFC8AAB44" />
<ComponentRef Id="cmp157B5219A7A2A7FADB3A03AC8C900547" /> <ComponentRef Id="cmp157B5219A7A2A7FADB3A03AC8C900547" />

8
src/draw.c
View File

@ -2030,22 +2030,22 @@ int graph_fullxzoom(int i, Graph_ctx *gr, int dataset)
{ {
xRect *r = &xctx->rect[GRIDLAYER][i]; xRect *r = &xctx->rect[GRIDLAYER][i];
if( sch_waves_loaded() >= 0) { if( sch_waves_loaded() >= 0) {
int need_redraw = 0; int idx, need_redraw = 0;
double xx1, xx2; double xx1, xx2;
int idx = get_raw_index(find_nth(get_tok_value(r->prop_ptr, "sweep", 0), ", ", "\"", 0, 1));
int dset = dataset == -1 ? 0 : dataset; int dset = dataset == -1 ? 0 : dataset;
char *custom_rawfile = NULL; /* "rawfile" attr. set in graph: load and switch to specified raw */ char *custom_rawfile = NULL; /* "rawfile" attr. set in graph: load and switch to specified raw */
char *sim_type = NULL; char *sim_type = NULL;
int k, save_datasets = -1, save_npoints = -1; int k, save_datasets = -1, save_npoints = -1;
Raw *raw = NULL; Raw *raw = NULL;
dbg(1, "graph_fullxzoom(): sweep idx=%d\n", idx);
if(idx < 0 ) idx = 0;
my_strdup2(_ALLOC_ID_, &custom_rawfile, get_tok_value(r->prop_ptr,"rawfile",0)); my_strdup2(_ALLOC_ID_, &custom_rawfile, get_tok_value(r->prop_ptr,"rawfile",0));
my_strdup2(_ALLOC_ID_, &sim_type, get_tok_value(r->prop_ptr,"sim_type",0)); my_strdup2(_ALLOC_ID_, &sim_type, get_tok_value(r->prop_ptr,"sim_type",0));
if((i == xctx->graph_master) && custom_rawfile[0]) { if((i == xctx->graph_master) && custom_rawfile[0]) {
extra_rawfile(1, custom_rawfile, sim_type[0] ? sim_type : xctx->raw->sim_type); extra_rawfile(1, custom_rawfile, sim_type[0] ? sim_type : xctx->raw->sim_type);
} }
idx = get_raw_index(find_nth(get_tok_value(r->prop_ptr, "sweep", 0), ", ", "\"", 0, 1));
dbg(1, "graph_fullxzoom(): sweep idx=%d\n", idx);
if(idx < 0 ) idx = 0;
if(i != xctx->graph_master ) { if(i != xctx->graph_master ) {
my_strdup2(_ALLOC_ID_, &custom_rawfile, my_strdup2(_ALLOC_ID_, &custom_rawfile,
get_tok_value(xctx->rect[GRIDLAYER][xctx->graph_master].prop_ptr,"rawfile",0)); get_tok_value(xctx->rect[GRIDLAYER][xctx->graph_master].prop_ptr,"rawfile",0));