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

simplify / break down complex expressions for code readability

This commit is contained in:
Stefan Schippers 2020-10-05 03:00:40 +02:00
parent 051b20c014
commit 82051a33e5
4 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/callback.c
View File

@ -553,7 +553,7 @@ int callback(int event, int mx, int my, KeySym key,
/* /20130628 */ /* /20130628 */
break; break;
} }
if(key== 'W' && state == ShiftMask) { /* 20171022 create wire snapping to closest instance pin */ if(key== 'W' && state == ShiftMask) { /* create wire snapping to closest instance pin */
double x, y; double x, y;
int xx, yy; int xx, yy;
if(semaphore >= 2) break; if(semaphore >= 2) break;

102
src/move.c
View File

@ -460,7 +460,7 @@ void find_inst_to_be_redrawn(const char *node)
if(int_hash_lookup(nodetable, node, 0, XINSERT_NOREPLACE)) return; if(int_hash_lookup(nodetable, node, 0, XINSERT_NOREPLACE)) return;
dbg(1, "find_inst_to_be_redrawn(): node=%s\n", node); dbg(1, "find_inst_to_be_redrawn(): node=%s\n", node);
for(i=0; i< lastinst; i++) { for(i=0; i < lastinst; i++) {
sym = inst_ptr[i].ptr + instdef; sym = inst_ptr[i].ptr + instdef;
rects = sym->rects[PINLAYER]; rects = sym->rects[PINLAYER];
for(p = 0; p < rects; p++) { for(p = 0; p < rects; p++) {
@ -470,6 +470,25 @@ void find_inst_to_be_redrawn(const char *node)
} }
} }
} }
/*
for(i=0;i < lastwire; i++) {
if(node && wire[i].node && !strcmp(wire[i].node, node )) {
if(wire[i].bus){
int ov, y1, y2;
ov = bus_width> cadhalfdotsize ? bus_width : CADHALFDOTSIZE;
if(wire[i].y1 < wire[i].y2) { y1 = wire[i].y1-ov; y2 = wire[i].y2+ov; }
else { y1 = wire[i].y1+ov; y2 = wire[i].y2-ov; }
bbox(ADD, wire[i].x1-ov, y1 , wire[i].x2+ov , y2 );
} else {
int ov, y1, y2;
ov = cadhalfdotsize;
if(wire[i].y1 < wire[i].y2) { y1 = wire[i].y1-ov; y2 = wire[i].y2+ov; }
else { y1 = wire[i].y1+ov; y2 = wire[i].y2-ov; }
bbox(ADD, wire[i].x1-ov, y1 , wire[i].x2+ov , y2 );
}
}
}
*/
} }
void copy_objects(int what) void copy_objects(int what)
@ -663,35 +682,36 @@ void copy_objects(int what)
case POLYGON: /* 20171115 */ case POLYGON: /* 20171115 */
if(c!=k) break; if(c!=k) break;
{ {
xPolygon *p = &polygon[c][n];
/* double bx1, by1, bx2, by2; */ /* double bx1, by1, bx2, by2; */
double *x = my_malloc(227, sizeof(double) *polygon[c][n].points); double *x = my_malloc(227, sizeof(double) *p->points);
double *y = my_malloc(228, sizeof(double) *polygon[c][n].points); double *y = my_malloc(228, sizeof(double) *p->points);
int j; int j;
for(j=0; j<polygon[c][n].points; j++) { for(j=0; j<p->points; j++) {
/* /*
if(j==0 || polygon[c][n].x[j] < bx1) bx1 = polygon[c][n].x[j]; if(j==0 || p->x[j] < bx1) bx1 = p->x[j];
if(j==0 || polygon[c][n].y[j] < by1) by1 = polygon[c][n].y[j]; if(j==0 || p->y[j] < by1) by1 = p->y[j];
if(j==0 || polygon[c][n].x[j] > bx2) bx2 = polygon[c][n].x[j]; if(j==0 || p->x[j] > bx2) bx2 = p->x[j];
if(j==0 || polygon[c][n].y[j] > by2) by2 = polygon[c][n].y[j]; if(j==0 || p->y[j] > by2) by2 = p->y[j];
*/ */
if( polygon[c][n].sel==SELECTED || polygon[c][n].selected_point[j]) { if( p->sel==SELECTED || p->selected_point[j]) {
if(rotatelocal) { if(rotatelocal) {
ROTATION(polygon[c][n].x[0], polygon[c][n].y[0], polygon[c][n].x[j], polygon[c][n].y[j], rx1,ry1); ROTATION(p->x[0], p->y[0], p->x[j], p->y[j], rx1,ry1);
} else { } else {
ROTATION(x1, y_1, polygon[c][n].x[j], polygon[c][n].y[j], rx1,ry1); ROTATION(x1, y_1, p->x[j], p->y[j], rx1,ry1);
} }
x[j] = rx1+deltax; x[j] = rx1+deltax;
y[j] = ry1+deltay; y[j] = ry1+deltay;
} else { } else {
x[j] = polygon[c][n].x[j]; x[j] = p->x[j];
y[j] = polygon[c][n].y[j]; y[j] = p->y[j];
} }
} }
/* bbox(ADD, bx1, by1, bx2, by2); */ /* bbox(ADD, bx1, by1, bx2, by2); */
drawpolygon(k, NOW, x, y, polygon[c][n].points, polygon[c][n].fill, polygon[c][n].dash); /* 20180914 added fill */ drawpolygon(k, NOW, x, y, p->points, p->fill, p->dash); /* 20180914 added fill */
selectedgroup[i].n=lastpolygon[c]; selectedgroup[i].n=lastpolygon[c];
store_polygon(-1, x, y, polygon[c][n].points, c, polygon[c][n].sel, polygon[c][n].prop_ptr); store_polygon(-1, x, y, p->points, c, p->sel, p->prop_ptr);
polygon[c][n].sel=0; p->sel=0;
my_free(819, &x); my_free(819, &x);
my_free(820, &y); my_free(820, &y);
} }
@ -755,9 +775,9 @@ void copy_objects(int what)
customfont = set_text_custom_font(&textelement[n]); customfont = set_text_custom_font(&textelement[n]);
#endif #endif
text_bbox(textelement[n].txt_ptr, textelement[n].xscale, text_bbox(textelement[n].txt_ptr, textelement[n].xscale,
textelement[n].yscale, textelement[n].rot,textelement[n].flip, textelement[n].hcenter, textelement[n].vcenter, textelement[n].yscale, textelement[n].rot,textelement[n].flip, textelement[n].hcenter, textelement[n].vcenter,
textelement[n].x0, textelement[n].y0, textelement[n].x0, textelement[n].y0,
&rx1,&ry1, &rx2,&ry2); &rx1,&ry1, &rx2,&ry2);
#ifdef HAS_CAIRO #ifdef HAS_CAIRO
if(customfont) cairo_restore(cairo_ctx); if(customfont) cairo_restore(cairo_ctx);
#endif #endif
@ -782,7 +802,7 @@ void copy_objects(int what)
textelement[lasttext].prop_ptr=NULL; textelement[lasttext].prop_ptr=NULL;
textelement[lasttext].font=NULL; textelement[lasttext].font=NULL;
my_strdup(230, &textelement[lasttext].prop_ptr, textelement[n].prop_ptr); my_strdup(230, &textelement[lasttext].prop_ptr, textelement[n].prop_ptr);
my_strdup(231, &textelement[lasttext].font, get_tok_value(textelement[lasttext].prop_ptr, "font", 0));/*20171206 */ my_strdup(231, &textelement[lasttext].font, get_tok_value(textelement[lasttext].prop_ptr, "font", 0));
str = get_tok_value(textelement[lasttext].prop_ptr, "hcenter", 0); str = get_tok_value(textelement[lasttext].prop_ptr, "hcenter", 0);
@ -824,8 +844,9 @@ void copy_objects(int what)
cairo_select_font_face (cairo_save_ctx, textfont, slant, weight); cairo_select_font_face (cairo_save_ctx, textfont, slant, weight);
} }
#endif #endif
draw_string(textlayer, ADD, textelement[lasttext].txt_ptr, /* draw moved txt */ draw_string(textlayer, ADD, textelement[lasttext].txt_ptr, /* draw moved txt */
textelement[lasttext].rot, textelement[lasttext].flip, textelement[lasttext].hcenter, textelement[lasttext].vcenter, textelement[lasttext].rot, textelement[lasttext].flip,
textelement[lasttext].hcenter, textelement[lasttext].vcenter,
rx1+deltax,ry1+deltay, rx1+deltax,ry1+deltay,
textelement[lasttext].xscale, textelement[lasttext].yscale); textelement[lasttext].xscale, textelement[lasttext].yscale);
#ifndef HAS_CAIRO #ifndef HAS_CAIRO
@ -872,10 +893,10 @@ void copy_objects(int what)
/* new_prop_string() for cleaning some internal caches. */ /* new_prop_string() for cleaning some internal caches. */
if(!newpropcnt) hash_all_names(lastinst); if(!newpropcnt) hash_all_names(lastinst);
new_prop_string(lastinst, inst_ptr[n].prop_ptr,newpropcnt++, dis_uniq_names); new_prop_string(lastinst, inst_ptr[n].prop_ptr,newpropcnt++, dis_uniq_names);
my_strdup2(235, &inst_ptr[lastinst].instname, get_tok_value(inst_ptr[lastinst].prop_ptr, "name", 0)); /* 20150409 */ my_strdup2(235, &inst_ptr[lastinst].instname, get_tok_value(inst_ptr[lastinst].prop_ptr, "name", 0));
n=selectedgroup[i].n=lastinst; n=selectedgroup[i].n=lastinst;
lastinst++; /* must be updated before calling symbol_bbox which triggers prepare_netlist_structs(0) */ lastinst++; /* must be updated before calling symbol_bbox which triggers prepare_netlist_structs(0)*/
} }
break; break;
} /* end switch(selectedgroup[i].type) */ } /* end switch(selectedgroup[i].type) */
@ -1138,33 +1159,33 @@ void move_objects(int what, int merge, double dx, double dy)
case POLYGON: /* 20171115 */ case POLYGON: /* 20171115 */
if(c!=k) break; if(c!=k) break;
{ {
xPolygon *p = &polygon[c][n];
double bx1=0., by1=0., bx2=0., by2=0.; double bx1=0., by1=0., bx2=0., by2=0.;
int j; int j;
double savex0, savey0; double savex0, savey0;
savex0 = polygon[c][n].x[0]; savex0 = p->x[0];
savey0 = polygon[c][n].y[0]; savey0 = p->y[0];
for(j=0; j<polygon[c][n].points; j++) { for(j=0; j<p->points; j++) {
if(j==0 || polygon[c][n].x[j] < bx1) bx1 = polygon[c][n].x[j]; if(j==0 || p->x[j] < bx1) bx1 = p->x[j];
if(j==0 || polygon[c][n].y[j] < by1) by1 = polygon[c][n].y[j]; if(j==0 || p->y[j] < by1) by1 = p->y[j];
if(j==0 || polygon[c][n].x[j] > bx2) bx2 = polygon[c][n].x[j]; if(j==0 || p->x[j] > bx2) bx2 = p->x[j];
if(j==0 || polygon[c][n].y[j] > by2) by2 = polygon[c][n].y[j]; if(j==0 || p->y[j] > by2) by2 = p->y[j];
if( polygon[c][n].sel==SELECTED || polygon[c][n].selected_point[j]) { if( p->sel==SELECTED || p->selected_point[j]) {
if(rotatelocal) { if(rotatelocal) {
ROTATION(savex0, savey0, polygon[c][n].x[j], polygon[c][n].y[j], rx1,ry1); ROTATION(savex0, savey0, p->x[j], p->y[j], rx1,ry1);
} else { } else {
ROTATION(x1, y_1, polygon[c][n].x[j], polygon[c][n].y[j], rx1,ry1); ROTATION(x1, y_1, p->x[j], p->y[j], rx1,ry1);
} }
polygon[c][n].x[j] = rx1+deltax; p->x[j] = rx1+deltax;
polygon[c][n].y[j] = ry1+deltay; p->y[j] = ry1+deltay;
} }
} }
bbox(ADD, bx1, by1, bx2, by2); bbox(ADD, bx1, by1, bx2, by2);
drawpolygon(k, NOW, p->x, p->y, p->points, p->fill, p->dash);
} }
/* 20180914 added fill */
drawpolygon(k, NOW, polygon[c][n].x, polygon[c][n].y, polygon[c][n].points, polygon[c][n].fill, polygon[c][n].dash);
break; break;
case ARC: case ARC:
@ -1303,9 +1324,8 @@ void move_objects(int what, int merge, double dx, double dy)
customfont = set_text_custom_font(&textelement[n]); customfont = set_text_custom_font(&textelement[n]);
#endif #endif
text_bbox(textelement[n].txt_ptr, textelement[n].xscale, text_bbox(textelement[n].txt_ptr, textelement[n].xscale,
textelement[n].yscale, textelement[n].rot,textelement[n].flip, textelement[n].hcenter, textelement[n].vcenter, textelement[n].yscale, textelement[n].rot,textelement[n].flip, textelement[n].hcenter,
textelement[n].x0, textelement[n].y0, textelement[n].vcenter, textelement[n].x0, textelement[n].y0, &rx1,&ry1, &rx2,&ry2);
&rx1,&ry1, &rx2,&ry2);
#ifdef HAS_CAIRO #ifdef HAS_CAIRO
if(customfont) cairo_restore(cairo_ctx); if(customfont) cairo_restore(cairo_ctx);
#endif #endif

3
src/psprint.c
View File

@ -538,7 +538,8 @@ void ps_draw(void)
ps_drawarc(c, arc[c][i].fill, arc[c][i].x, arc[c][i].y, arc[c][i].r, arc[c][i].a, arc[c][i].b, arc[c][i].dash); ps_drawarc(c, arc[c][i].fill, arc[c][i].x, arc[c][i].y, arc[c][i].r, arc[c][i].a, arc[c][i].b, arc[c][i].dash);
} }
for(i=0;i<lastpolygon[c];i++) { for(i=0;i<lastpolygon[c];i++) {
ps_drawpolygon(c, NOW, polygon[c][i].x, polygon[c][i].y, polygon[c][i].points, polygon[c][i].fill, polygon[c][i].dash); ps_drawpolygon(c, NOW, polygon[c][i].x, polygon[c][i].y, polygon[c][i].points,
polygon[c][i].fill, polygon[c][i].dash);
} }

4
xschem_library/examples/cmos_inv.sch
View File

@ -17,8 +17,8 @@ N 60 -230 100 -230 {lab=A}
N 140 -230 190 -230 {lab=Z} N 140 -230 190 -230 {lab=Z}
N 140 -340 140 -320 {lab=VDD} N 140 -340 140 -320 {lab=VDD}
N 140 -140 140 -120 {lab=0} N 140 -140 140 -120 {lab=0}
C {nmos4.sym} 120 -170 0 0 {name=M1 model=n w=WN l=LLN m=1} C {nmos4.sym} 120 -170 0 0 {name=M1 model=n w=WN l=LLN m=1 net_name=true}
C {pmos4.sym} 120 -290 0 0 {name=M2 model=p w=WP l=LLP m=1} C {pmos4.sym} 120 -290 0 0 {name=M2 model=p w=WP l=LLP m=1 net_name=true}
C {vdd.sym} 140 -340 0 0 {name=l1 lab=VDD} C {vdd.sym} 140 -340 0 0 {name=l1 lab=VDD}
C {lab_pin.sym} 140 -120 0 0 {name=l2 sig_type=std_logic lab=0} C {lab_pin.sym} 140 -120 0 0 {name=l2 sig_type=std_logic lab=0}
C {ipin.sym} 60 -230 0 0 {name=p1 lab=A} C {ipin.sym} 60 -230 0 0 {name=p1 lab=A}