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

move initialization of s=0 outside the loop in backannotate_at_cursor_b_pos(). If only_probes is set do not display graphs and images.

This commit is contained in:
Stefan Frederik 2022-09-20 17:59:01 +02:00
parent af475e00df
commit c695c435d2
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/callback.c
View File

@ -200,6 +200,7 @@ static void backannotate_at_cursor_b_pos(xRect *r, Graph_ctx *gr)
double prev_x, prev_prev_x;
int cnt=0, wrap;
register SPICE_DATA *gv = xctx->graph_values[sweep_idx];
int s=0;
first = -1;
prev_prev_x = prev_x = 0;
last = ofs;
@ -211,14 +212,17 @@ static void backannotate_at_cursor_b_pos(xRect *r, Graph_ctx *gr)
cnt = 0;
}
if(xx >= start && xx <= end) {
int s=0;
if((dataset == -1 && sweepvar_wrap == 0) || (dataset == sweepvar_wrap)) {
dbg(1, "xx=%g cursor2=%g first=%d last=%d start=%g end=%g p=%d wrap=%d sweepvar_wrap=%d ofs=%d\n",
xx, cursor2, first, last, start, end, p, wrap, sweepvar_wrap, ofs);
if(first == -1) first = p;
if(p == first) {
if(xx == cursor2) {dset = xctx->graph_datasets; break;}
s = XSIGN0(xx - cursor2);
dbg(1, "s=%d\n", s);
} else {
int ss = XSIGN0(xx - cursor2);
dbg(1, "s=%d, ss=%d\n", s, ss);
if(ss != s) {dset = xctx->graph_datasets; break;}
}
last = p;

2
src/draw.c
View File

@ -2656,6 +2656,7 @@ void draw_graph(int i, const int flags, Graph_ctx *gr)
char *express = NULL;
xRect *r = &xctx->rect[GRIDLAYER][i];
if(xctx->only_probes) return;
if(RECT_OUTSIDE( gr->sx1, gr->sy1, gr->sx2, gr->sy2,
xctx->areax1, xctx->areay1, xctx->areax2, xctx->areay2)) return;
@ -2954,6 +2955,7 @@ void draw_image(int dr, xRect *r, double *x1, double *y1, double *x2, double *y2
png_to_byte_closure_t closure;
xEmb_image *emb_ptr;
if(xctx->only_probes) return;
xx1 = *x1; yy1 = *y1; /* image anchor point */
RECTORDER(*x1, *y1, *x2, *y2);

5
xschem_library/ngspice/delta_sigma.sch
View File

@ -1,4 +1,5 @@
v {xschem version=3.0.0 file_version=1.2 }
v {xschem version=3.1.0 file_version=1.2
}
G {}
K {}
V {}
@ -137,7 +138,7 @@ C {launcher.sym} 1270 -90 0 0 {name=h5
descr="Select arrow and
Ctrl-Left-Click to load/unload waveforms"
tclcommand="
xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw
xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw tran
"
}
C {launcher.sym} 870 -90 0 0 {name=h1

5
xschem_library/ngspice/solar_panel.sch
View File

@ -1,4 +1,5 @@
v {xschem version=3.1.0 file_version=1.2 }
v {xschem version=3.1.0 file_version=1.2
}
G {}
K {}
V {}
@ -188,7 +189,7 @@ C {launcher.sym} 1200 -1050 0 0 {name=h3
descr="Select arrow and
Ctrl-Left-Click to load/unload waveforms"
tclcommand="
xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw
xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw tran
"
}
C {pv_ngspice.sym} 280 -450 0 0 {name=X1 m=1 roff=1e9}