diff --git a/src/callback.c b/src/callback.c index 8ef8bbfc..225437c7 100644 --- a/src/callback.c +++ b/src/callback.c @@ -340,7 +340,7 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int /* determine if mouse pointer is below xaxis or left of yaxis in some graph */ if( POINTINSIDE(xctx->mousex, xctx->mousey, r->x1, r->y1, r->x2, r->y2)) { dbg(1, "mouse inside: %d\n", i); - setup_graph_data(i, xctx->graph_flags, 0, gr); + setup_graph_data(i, 0, gr); /* move cursor1 */ /* set cursor position from master graph x-axis */ @@ -517,7 +517,7 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int gr->gx1 = gr->master_gx1; gr->gx2 = gr->master_gx2; gr->gw = gr->master_gw; - setup_graph_data(i, xctx->graph_flags, 1, gr); /* skip flag set, no reload x1 and x2 fields */ + setup_graph_data(i, 1, gr); /* skip flag set, no reload x1 and x2 fields */ if(gr->dataset >= 0 && gr->dataset < xctx->graph_datasets) dataset =gr->dataset; else dataset = -1; /* destroy / show measurement widget */ @@ -1024,7 +1024,7 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int } } /* else if( event == ButtonRelease) */ if(need_redraw || need_all_redraw) { - setup_graph_data(i, xctx->graph_flags, 0, gr); + setup_graph_data(i, 0, gr); draw_graph(i, 1 + 8 + (xctx->graph_flags & 6), gr, NULL); /* draw data in each graph box */ } } /* for(i=0; i< xctx->rects[GRIDLAYER]; i++ */ diff --git a/src/draw.c b/src/draw.c index ae18a4db..a796a5c3 100644 --- a/src/draw.c +++ b/src/draw.c @@ -2088,7 +2088,7 @@ static void draw_graph_grid(Graph_ctx *gr, void *ct) bbox(END, 0.0, 0.0, 0.0, 0.0); } -void setup_graph_data(int i, const int flags, int skip, Graph_ctx *gr) +void setup_graph_data(int i, int skip, Graph_ctx *gr) { double tmp; const char *val; @@ -2215,7 +2215,7 @@ void setup_graph_data(int i, const int flags, int skip, Graph_ctx *gr) * tmp = gr->w * 0.00044; * if(tmp < gr->txtsizelab) gr->txtsizelab = tmp; */ - if(flags & 2) + if(xctx->graph_flags & 2) gr->digtxtsizelab = 0.000900 * fabs( gr->h / gr->posh * gr->gh ); else gr->digtxtsizelab = 0.001200 * fabs( gr->h / gr->posh * gr->gh ); @@ -3033,7 +3033,7 @@ static void draw_graph_all(int flags) if(xctx->enable_layer[GRIDLAYER]) for(i = 0; i < xctx->rects[GRIDLAYER]; ++i) { xRect *r = &xctx->rect[GRIDLAYER][i]; if(r->flags & 1) { - setup_graph_data(i, flags, 0, &xctx->graph_struct); + setup_graph_data(i, 0, &xctx->graph_struct); draw_graph(i, flags, &xctx->graph_struct, NULL); /* draw data in each graph box */ } } @@ -3318,7 +3318,7 @@ void svg_embedded_graph(FILE *fd, xRect *r, double rx1, double ry1, double rx2, for(int i = 0; i < xctx->rects[GRIDLAYER]; ++i) { xRect *r = &xctx->rect[GRIDLAYER][i]; if(r->flags & 1) { - setup_graph_data(i, 8, 0, &xctx->graph_struct); + setup_graph_data(i, 0, &xctx->graph_struct); draw_graph(i, 8, &xctx->graph_struct, (void *)ct); } } diff --git a/src/psprint.c b/src/psprint.c index 0414e557..972baa11 100644 --- a/src/psprint.c +++ b/src/psprint.c @@ -318,7 +318,7 @@ void ps_embedded_graph(xRect* r, double rx1, double ry1, double rx2, double ry2) for (i = 0; i < xctx->rects[GRIDLAYER]; ++i) { xRect* r2 = &xctx->rect[GRIDLAYER][i]; if (r2->flags & 1) { - setup_graph_data(i, 8, 0, &xctx->graph_struct); + setup_graph_data(i, 0, &xctx->graph_struct); draw_graph(i, 8, &xctx->graph_struct, (void*)ct); } } diff --git a/src/scheduler.c b/src/scheduler.c index f6fb7be8..eefcfa56 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -682,7 +682,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg } else { flags = 1 + 8 + (xctx->graph_flags & 6); } - setup_graph_data(i, xctx->graph_flags, 0, &xctx->graph_struct); + setup_graph_data(i, 0, &xctx->graph_struct); draw_graph(i, flags, &xctx->graph_struct, NULL); } Tcl_ResetResult(interp); diff --git a/src/xschem.h b/src/xschem.h index b1174dc8..a963335a 100644 --- a/src/xschem.h +++ b/src/xschem.h @@ -1108,7 +1108,7 @@ extern int sch_waves_loaded(void); extern int edit_wave_attributes(int what, int i, Graph_ctx *gr); extern void draw_graph(int i, int flags, Graph_ctx *gr, void *ct); extern int find_closest_wave(int i, Graph_ctx *gr); -extern void setup_graph_data(int i, const int flags, int skip, Graph_ctx *gr); +extern void setup_graph_data(int i, int skip, Graph_ctx *gr); extern double timer(int start); extern void enable_layers(void); extern void set_snap(double);