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

speed optimizations in draw_graph()

This commit is contained in:
Stefan Frederik 2022-01-01 21:47:17 +01:00
parent 81a7041c9f
commit 1c27e4cc0a
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/draw.c
View File

@ -2033,6 +2033,7 @@ void draw_graph(int c, int i, int flags)
{
/* container box */
double rx1, ry1, rx2, ry2, rw/*, rh */;
double sx1, sy1, sx2, sy2; /* screen coordinates of above for clipping */
/* graph box (smaller due to margins) */
double x1, y1, x2, y2;
/* graph coordinate, some defaults */
@ -2074,6 +2075,11 @@ void draw_graph(int c, int i, int flags)
ry1 = r->y1;
rx2 = r->x2;
ry2 = r->y2;
sx1=X_TO_SCREEN(rx1);
sy1=Y_TO_SCREEN(ry1);
sx2=X_TO_SCREEN(rx2);
sy2=Y_TO_SCREEN(ry2);
if(! rectclip(xctx->areax1,xctx->areay1,xctx->areax2,xctx->areay2,&sx1,&sy1,&sx2,&sy2)) return;
rw = (rx2 - rx1);
/* rh = (ry2 -ry1); */
/* get variables to plot, x/y range, grid info etc */
@ -2231,35 +2237,35 @@ void draw_graph(int c, int i, int flags)
last = ofs;
for(p = ofs ; p < ofs + xctx->graph_npoints[dset]; p++) {
xx = xctx->graph_values[sweep_idx][p];
if(xx > end || xx < start ||
((sweep_idx == 0 && cnt > 1) &&
SIGN(xx - prev_x) != SIGN(prev_x - prev_prev_x) ) ) {
if(first != -1) {
/* get y-axis points */
if(bus_msb) {
if(digital) {
draw_graph_bus_points(ntok, first, last, cx, dx, cy, dy, wave_color,
sweep_idx, digital, dig_max_waves, wcnt, n_nodes, wy1, wy2);
if(first != -1) { /* there is something to plot ... */
if(xx > end || xx < start || /* ... and we ran out of graph area ... */
((sweep_idx == 0 && cnt > 1) && /* ... or sweep variable changed direction */
SIGN(xx - prev_x) != SIGN(prev_x - prev_prev_x) ) ) {
/* get y-axis points */
if(bus_msb) {
if(digital) {
draw_graph_bus_points(ntok, first, last, cx, dx, cy, dy, wave_color,
sweep_idx, digital, dig_max_waves, wcnt, n_nodes, wy1, wy2);
}
} else {
draw_graph_points(v, first, last, scy, sdy, point, wave_color,
digital, dig_max_waves, wcnt, n_nodes, wy1, wy2);
}
} else {
draw_graph_points(v, first, last, scy, sdy, point, wave_color,
digital, dig_max_waves, wcnt, n_nodes, wy1, wy2);
}
poly_npoints = 0;
first = -1;
cnt = 0;
poly_npoints = 0;
first = -1;
cnt = 0;
}
}
if(xx >= start && xx <= end) {
if(first == -1) first = p;
/* Build poly x array. Translate from graph coordinates to {x1,y1} - {x2, y2} world. */
/* Build poly x array. Translate from graph coordinates to screen coords */
point[poly_npoints].x = S_X(xx); /* CLIP(S_X(xx), xctx->areax1, xctx->areax2); */
last = p;
poly_npoints++;
prev_prev_x = prev_x;
prev_x = xx;
cnt++;
}
prev_prev_x = prev_x;
prev_x = xx;
cnt++;
}
if(first != -1) {
/* get y-axis points */

2
tests/xschemtest.tcl
View File

@ -164,7 +164,7 @@ proc netlist_test {} {
loading.sch vhdl 2601437773
mos_power_ampli.sch spice 2488555251
hierarchical_tedax.sch tedax 998070173
LCC_instances.sch spice 3917186717
LCC_instances.sch spice 1145731069
pcb_test1.sch tedax 1295717013
simulate_ff.sch spice 1321596936
} {