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

xschem raw read: allow to read raw file with unspecified type (will get the first section found in file)

This commit is contained in:
stefan schippers 2024-02-27 23:42:19 +01:00
parent 2f1b819755
commit 5fe6fa4639
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/save.c
View File

@ -1073,15 +1073,17 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->raw = xctx->extra_raw_arr[xctx->extra_idx]; xctx->raw = xctx->extra_raw_arr[xctx->extra_idx];
} }
/* **************** read ************* */ /* **************** read ************* */
} else if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file && type) { } else if(what == 1 && xctx->extra_raw_n < MAX_RAW_N && file /* && type*/) {
tclvareval("subst {", file, "}", NULL); tclvareval("subst {", file, "}", NULL);
my_strncpy(f, tclresult(), S(f)); my_strncpy(f, tclresult(), S(f));
if(!my_strcasecmp(type, "spectrum")) type = "ac"; if(type) {
if(!my_strcasecmp(type, "sp")) type = "ac"; if(!my_strcasecmp(type, "spectrum")) type = "ac";
if(!my_strcasecmp(type, "sp")) type = "ac";
}
for(i = 0; i < xctx->extra_raw_n; i++) { for(i = 0; i < xctx->extra_raw_n; i++) {
if(xctx->extra_raw_arr[i]->sim_type && if(xctx->extra_raw_arr[i]->sim_type &&
!strcmp(xctx->extra_raw_arr[i]->rawfile, f) && !strcmp(xctx->extra_raw_arr[i]->rawfile, f) &&
!strcmp(xctx->extra_raw_arr[i]->sim_type, type) (!type || !strcmp(xctx->extra_raw_arr[i]->sim_type, type) )
) break; ) break;
} }
if(i >= xctx->extra_raw_n) { /* file not already loaded: read it and switch to it */ if(i >= xctx->extra_raw_n) { /* file not already loaded: read it and switch to it */
@ -1097,7 +1099,7 @@ int extra_rawfile(int what, const char *file, const char *type, double sweep1, d
xctx->extra_raw_n++; xctx->extra_raw_n++;
} else { } else {
ret = 0; /* not found so did not switch */ ret = 0; /* not found so did not switch */
dbg(0, "extra_rawfile() read: %s not found or no %s analysis\n", f, type); dbg(0, "extra_rawfile() read: %s not found or no %s analysis\n", f, type ? type : "<unspecified>");
xctx->raw = save; /* restore */ xctx->raw = save; /* restore */
xctx->extra_prev_idx = xctx->extra_idx; xctx->extra_prev_idx = xctx->extra_idx;
} }