From ca8ffafe8aec083b2960c76c84debbc275e3ff81 Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Mon, 7 Nov 2022 14:23:57 +0100 Subject: [PATCH] code refactoring (update_conn_cues()) --- src/actions.c | 2 +- src/check.c | 13 ++++++------- src/draw.c | 2 +- src/in_memory_undo.c | 2 +- src/move.c | 2 -- src/psprint.c | 2 +- src/save.c | 4 ++-- src/select.c | 2 +- src/svgdraw.c | 2 +- src/xschem.h | 2 +- 10 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/actions.c b/src/actions.c index 90d07735..dadc86bc 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1900,7 +1900,7 @@ void new_wire(int what, double mx_snap, double my_snap) } draw(); if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0); - } else update_conn_cues(1,1); + } else update_conn_cues(WIRELAYER, 1,1); /* draw_hilight_net(1);*/ /* for updating connection bubbles on hilight nets */ } if(! (what &END)) { diff --git a/src/check.c b/src/check.c index f5f81040..38dc0a37 100644 --- a/src/check.c +++ b/src/check.c @@ -43,7 +43,7 @@ static int check_breaks(double x1, double y1, double x2, double y2, double x, do return 0; } -void update_conn_cues(int draw_cues, int dr_win) +void update_conn_cues(int layer, int draw_cues, int dr_win) { int k, i, l, sqx, sqy, save_draw; Wireentry *wptr; @@ -98,7 +98,6 @@ void update_conn_cues(int draw_cues, int dr_win) } dbg(3, "update_conn_cues(): check3\n"); if(draw_cues) { - int cc = xctx->only_probes ? GRIDLAYER : WIRELAYER; save_draw = xctx->draw_window; xctx->draw_window = dr_win; for(init_wire_iterator(&ctx, x1, y1, x2, y2); ( wireptr = wire_iterator_next(&ctx) ) ;) { i = wireptr->n; @@ -106,13 +105,13 @@ void update_conn_cues(int draw_cues, int dr_win) if(LINE_OUTSIDE(wire[i].x1, wire[i].y1, wire[i].x2, wire[i].y2, x1, y1, x2, y2)) continue; if( wire[i].end1 >1 ) { - filledarc(cc, ADD, wire[i].x1, wire[i].y1, cadhalfdotsize, 0, 360); + filledarc(layer, ADD, wire[i].x1, wire[i].y1, cadhalfdotsize, 0, 360); } if( wire[i].end2 >1 ) { - filledarc(cc, ADD, wire[i].x2, wire[i].y2, cadhalfdotsize, 0, 360); + filledarc(layer, ADD, wire[i].x2, wire[i].y2, cadhalfdotsize, 0, 360); } } - filledarc(cc, END, 0.0, 0.0, 0.0, 0.0, 0.0); + filledarc(layer, END, 0.0, 0.0, 0.0, 0.0, 0.0); xctx->draw_window = save_draw; } } @@ -376,7 +375,7 @@ void trim_wires(void) } while(changed); dbg(1, "trim_wires(): doloops=%d changed=%d\n", doloops, changed); my_free(115, &wireflag); - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); } void break_wires_at_pins(void) @@ -490,6 +489,6 @@ void break_wires_at_pins(void) xctx->prep_net_structs=0; xctx->prep_hi_structs=0; xctx->prep_hash_wires=0; - /*update_conn_cues(0, 0); */ + /*update_conn_cues(WIRELAYER, 0, 0); */ } diff --git a/src/draw.c b/src/draw.c index 811f6a64..8c4b649c 100644 --- a/src/draw.c +++ b/src/draw.c @@ -3405,7 +3405,7 @@ void draw(void) drawline(cc, ADD, xctx->wire[i].x1,xctx->wire[i].y1, xctx->wire[i].x2,xctx->wire[i].y2, 0, NULL); } - update_conn_cues(1, xctx->draw_window); + update_conn_cues(cc, 1, xctx->draw_window); filledrect(cc, END, 0.0, 0.0, 0.0, 0.0); drawline(cc, END, 0.0, 0.0, 0.0, 0.0, 0, NULL); } diff --git a/src/in_memory_undo.c b/src/in_memory_undo.c index 80ed2f55..b70dc63a 100644 --- a/src/in_memory_undo.c +++ b/src/in_memory_undo.c @@ -686,5 +686,5 @@ void mem_pop_undo(int redo, int set_modify_status) xctx->prep_hash_wires = 0; xctx->prep_net_structs = 0; xctx->prep_hi_structs = 0; - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); } diff --git a/src/move.c b/src/move.c index d3d132de..50733dd0 100644 --- a/src/move.c +++ b/src/move.c @@ -1013,7 +1013,6 @@ void copy_objects(int what) find_inst_to_be_redrawn(16); /* clear data */ check_collapsing_objects(); if(tclgetboolvar("autotrim_wires")) trim_wires(); - /* update_conn_cues(1, 1); */ if(xctx->hilight_nets) { propagate_hilights(1, 1, XINSERT_NOREPLACE); } @@ -1522,7 +1521,6 @@ void move_objects(int what, int merge, double dx, double dy) find_inst_to_be_redrawn(16); /* clear data */ check_collapsing_objects(); if(tclgetboolvar("autotrim_wires")) trim_wires(); - /* update_conn_cues(1, 1); */ if(xctx->hilight_nets) { propagate_hilights(1, 1, XINSERT_NOREPLACE); diff --git a/src/psprint.c b/src/psprint.c index 5e69c19c..d45b630b 100644 --- a/src/psprint.c +++ b/src/psprint.c @@ -891,7 +891,7 @@ void create_ps(char **psfile, int what) Wireentry *wireptr; int i; Iterator_ctx ctx; - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); /* draw connecting dots */ x1 = X_TO_XSCHEM(xctx->areax1); y1 = Y_TO_XSCHEM(xctx->areay1); diff --git a/src/save.c b/src/save.c index 9a97c970..aedf173d 100644 --- a/src/save.c +++ b/src/save.c @@ -2233,7 +2233,7 @@ void load_schematic(int load_symbols, const char *filename, int reset_undo) /* 2 } check_collapsing_objects(); if(tclgetboolvar("autotrim_wires")) trim_wires(); - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); if(xctx->hilight_nets && load_symbols) { propagate_hilights(1, 1, XINSERT_NOREPLACE); } @@ -2453,7 +2453,7 @@ void pop_undo(int redo, int set_modify_status) xctx->prep_net_structs=0; xctx->prep_hi_structs=0; link_symbols_to_instances(-1); - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); if(xctx->hilight_nets) { propagate_hilights(1, 1, XINSERT_NOREPLACE); } diff --git a/src/select.c b/src/select.c index 87a64acc..53871f90 100644 --- a/src/select.c +++ b/src/select.c @@ -444,7 +444,7 @@ void delete(int to_push_undo) } if(tclgetboolvar("autotrim_wires")) trim_wires(); del_rect_line_arc_poly(); - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); if(xctx->hilight_nets) { propagate_hilights(1, 1, XINSERT_NOREPLACE); } diff --git a/src/svgdraw.c b/src/svgdraw.c index 7d07f897..e1ded9f1 100644 --- a/src/svgdraw.c +++ b/src/svgdraw.c @@ -853,7 +853,7 @@ void svg_draw(void) Wireentry *wireptr; int i; Iterator_ctx ctx; - update_conn_cues(0, 0); + update_conn_cues(WIRELAYER, 0, 0); /* draw connecting dots */ x1 = X_TO_XSCHEM(xctx->areax1); y1 = Y_TO_XSCHEM(xctx->areay1); diff --git a/src/xschem.h b/src/xschem.h index 21c52684..388eb4fd 100644 --- a/src/xschem.h +++ b/src/xschem.h @@ -1207,7 +1207,7 @@ extern int touch(double,double,double,double,double,double); extern int rectclip(int,int,int,int, double*,double*,double*,double*); extern void trim_wires(void); -extern void update_conn_cues(int draw_cues, int dr_win); +extern void update_conn_cues(int layer, int draw_cues, int dr_win); extern void break_wires_at_pins(void); extern void check_touch(int i, int j,