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

do not call calc_drawing_bbox() on monster schematics as it takes more time than just drawing the viewport

This commit is contained in:
Stefan Schippers 2020-10-18 13:53:58 +02:00
parent ebdc8746c0
commit c90f188703
4 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/callback.c
View File

@ -972,16 +972,18 @@ int callback(int event, int mx, int my, KeySym key,
if(key=='k' && state==ControlMask) /* unhilight net */
{
xRect boundbox;
int big = xctx->wires> 2000 || xctx->instances > 2000 ;
if(semaphore >= 2) break;
calc_drawing_bbox(&boundbox, 2);
if(!big) calc_drawing_bbox(&boundbox, 2);
unhilight_net();
/* undraw_hilight_net(1); */
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
break;
}
if(key=='K' && state==(ControlMask|ShiftMask)) /* hilight net drilling thru elements */
@ -1006,16 +1008,19 @@ int callback(int event, int mx, int my, KeySym key,
if(key=='K' && state == ShiftMask) /* delete hilighted nets */
{
xRect boundbox;
int big = xctx->wires> 2000 || xctx->instances > 2000 ;
if(semaphore >= 2) break;
enable_drill=0;
calc_drawing_bbox(&boundbox, 2);
if(!big) calc_drawing_bbox(&boundbox, 2);
delete_hilight_net();
/* undraw_hilight_net(1); */
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
break;
}
if(key=='g' && state==Mod1Mask) { /* highlight net and send to gaw viewer */
@ -1698,14 +1703,17 @@ int callback(int event, int mx, int my, KeySym key,
xRect boundbox;
if(auto_hilight && hilight_nets && sel == 0 ) { /* 20160413 20160503 */
if(!prev_last_sel) {
calc_drawing_bbox(&boundbox, 2);
int big = xctx->wires> 2000 || xctx->instances > 2000 ;
if(!big) calc_drawing_bbox(&boundbox, 2);
delete_hilight_net();
/* undraw_hilight_net(1); */
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
}
}
}

13
src/hilight.c
View File

@ -881,13 +881,16 @@ void unhilight_net(void)
void redraw_hilights(void)
{
xRect boundbox;
int big = xctx->wires> 2000 || xctx->instances > 2000 ;
if(!has_x) return;
calc_drawing_bbox(&boundbox, 2);
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
calc_drawing_bbox(&boundbox, 2);
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
}
void draw_hilight_net(int on_window)

13
src/scheduler.c
View File

@ -1423,15 +1423,18 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
else if(!strcmp(argv[1],"unhilight"))
{
xRect boundbox;
int big = xctx->wires> 2000 || xctx->instances > 2000 ;
enable_drill=0;
calc_drawing_bbox(&boundbox, 2);
if(!big) calc_drawing_bbox(&boundbox, 2);
delete_hilight_net();
/* undraw_hilight_net(1); */
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
/*
enable_drill = 0;

13
src/token.c
View File

@ -180,19 +180,22 @@ void check_unique_names(int rename)
char *comma_pos;
char *expanded_instname = NULL;
struct inst_hashentry *entry;
int big = xctx->wires> 2000 || xctx->instances > 2000;
/* int save_draw; */
if(hilight_nets) {
xRect boundbox;
calc_drawing_bbox(&boundbox, 2);
if(!big) calc_drawing_bbox(&boundbox, 2);
enable_drill=0;
delete_hilight_net();
/* undraw_hilight_net(1); */
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) {
bbox(BEGIN, 0.0 , 0.0 , 0.0 , 0.0);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
draw();
bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
}
inst_free_hash(table);
first = 1;