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

code formatting cleanups

This commit is contained in:
stefan schippers 2025-01-22 00:22:02 +01:00
parent 1015a9d71e
commit ed2a4f61c8
2 changed files with 77 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/findnet.c
View File

@ -25,18 +25,18 @@
static double distance; /* safe to keep even with multiple schematics */
static Selected sel; /* safe to keep even with multiple schematics */
static void find_closest_net(double mx,double my)
static void find_closest_net(double mx, double my)
/* returns the net that is closest to the mouse pointer */
/* if there are nets and distance < CADWIREMINDIST */
{
double tmp;
int i,w=-1;
int i, w=-1;
double threshold;
threshold = CADWIREMINDIST * CADWIREMINDIST * xctx->zoom * xctx->zoom;
for(i=0;i<xctx->wires; ++i)
{
if( (tmp = dist(xctx->wire[i].x1,xctx->wire[i].y1,xctx->wire[i].x2,xctx->wire[i].y2,mx,my)) < distance )
if( (tmp = dist(xctx->wire[i].x1, xctx->wire[i].y1, xctx->wire[i].x2, xctx->wire[i].y2, mx, my)) < distance )
{
w = i; distance = tmp;
}
@ -104,7 +104,7 @@ static void find_closest_bezier(double mx, double my, int c, int i, int *l, int
}
}
static void find_closest_polygon(double mx,double my)
static void find_closest_polygon(double mx, double my)
/* returns the polygon that is closest to the mouse pointer */
/* if there are lines and distance < CADWIREMINDIST */
{
@ -138,7 +138,7 @@ static void find_closest_polygon(double mx,double my)
y1 = p->y[j];
x2 = p->x[j+1];
y2 = p->y[j+1];
ORDER(x1,y1,x2,y2);
ORDER(x1, y1, x2, y2);
if( (tmp = dist(x1, y1, x2, y2, mx, my)) < distance )
{
l = i; distance = tmp;col = c;
@ -155,12 +155,12 @@ static void find_closest_polygon(double mx,double my)
}
static void find_closest_line(double mx,double my)
static void find_closest_line(double mx, double my)
/* returns the line that is closest to the mouse pointer */
/* if there are lines and distance < CADWIREMINDIST */
{
double tmp;
int i,c,l=-1, col = 0;
int i, c, l = -1, col = 0;
double threshold;
threshold = CADWIREMINDIST * CADWIREMINDIST * xctx->zoom * xctx->zoom;
for(c=0;c<cadlayers; ++c)
@ -168,7 +168,7 @@ static void find_closest_line(double mx,double my)
if(!xctx->enable_layer[c]) continue;
for(i=0;i<xctx->lines[c]; ++i)
{
if( (tmp = dist(xctx->line[c][i].x1,xctx->line[c][i].y1,xctx->line[c][i].x2,xctx->line[c][i].y2,mx,my))
if( (tmp = dist(xctx->line[c][i].x1, xctx->line[c][i].y1, xctx->line[c][i].x2, xctx->line[c][i].y2, mx, my))
< distance )
{
l = i; distance = tmp;col = c;
@ -182,31 +182,60 @@ static void find_closest_line(double mx,double my)
}
}
/* sample code: find all inst and wire endpoints around (mx, my) */
#if 0
static void xfind_closest_net_or_symbol_pin(double mx, double my, double *x, double *y)
{
int sqx, sqy;
Instpinentry *iptr;
Wireentry *wptr;
double xx, yy;
get_square(mx, my, &sqx, &sqy);
for(iptr = xctx->instpin_spatial_table[sqx][sqy]; iptr; iptr = iptr->next) {
int n = iptr->n;
if( !((xctx->inst[n].ptr + xctx->sym)->type) ) continue;
xx = iptr->x0;
yy = iptr->y0;
}
for(wptr = xctx->wire_spatial_table[sqx][sqy]; wptr; wptr = wptr->next) {
int n = wptr->n;
xWire *w = &xctx->wire[n];
xx = w->x1;
yy = w->y1;
xx = w->x2;
yy = w->y2;
}
}
#endif
/* 20171022 snap wire to closest pin or net endpoint */
void find_closest_net_or_symbol_pin(double mx,double my, double *x, double *y)
void find_closest_net_or_symbol_pin(double mx, double my, double *x, double *y)
{
int i, j, no_of_pin_rects;
double x0, x1, x2, y0, y1, y2, xx, yy, dist, min_dist_x=0, min_dist_y=0;
double x0, x1, x2, y0, y1, y2, xx, yy, dist, min_dist_x = 0, min_dist_y = 0;
xRect rect;
short rot, flip;
char *type=NULL;
char *type = NULL;
double curr_dist;
curr_dist = DBL_MAX;
for(i=0;i<xctx->instances; ++i) {
for(i = 0;i < xctx->instances; ++i) {
x0=xctx->inst[i].x0;
y0=xctx->inst[i].y0;
rot = xctx->inst[i].rot;
flip = xctx->inst[i].flip;
my_strdup(_ALLOC_ID_, &type,(xctx->inst[i].ptr+ xctx->sym)->type);
my_strdup(_ALLOC_ID_, &type, (xctx->inst[i].ptr+ xctx->sym)->type);
if(!type) continue;
no_of_pin_rects = (xctx->inst[i].ptr+ xctx->sym)->rects[PINLAYER];
if(IS_LABEL_OR_PIN(type)) no_of_pin_rects=1;
for(j=0; j<no_of_pin_rects; ++j) {
rect = ((xctx->inst[i].ptr+ xctx->sym)->rect[PINLAYER])[j];
ROTATION(rot, flip, 0.0,0.0,rect.x1,rect.y1,x1,y1);
ROTATION(rot, flip, 0.0,0.0,rect.x2,rect.y2,x2,y2);
ROTATION(rot, flip, 0.0, 0.0, rect.x1, rect.y1, x1, y1);
ROTATION(rot, flip, 0.0, 0.0, rect.x2, rect.y2, x2, y2);
x1 += x0;
y1 += y0;
x2 += x0;
@ -221,8 +250,8 @@ void find_closest_net_or_symbol_pin(double mx,double my, double *x, double *y)
}
}
}
for(i=0;i<xctx->wires; ++i) {
xx=xctx->wire[i].x1;
for(i = 0;i < xctx->wires; ++i) {
xx = xctx->wire[i].x1;
yy = xctx->wire[i].y1;
dist = (mx - xx) * (mx - xx) + (my - yy) * (my - yy);
if(dist < curr_dist) {
@ -230,7 +259,7 @@ void find_closest_net_or_symbol_pin(double mx,double my, double *x, double *y)
min_dist_x = xx;
min_dist_y = yy;
}
xx=xctx->wire[i].x2;
xx = xctx->wire[i].x2;
yy = xctx->wire[i].y2;
dist = (mx - xx) * (mx - xx) + (my - yy) * (my - yy);
if(dist < curr_dist) {
@ -244,10 +273,10 @@ void find_closest_net_or_symbol_pin(double mx,double my, double *x, double *y)
my_free(_ALLOC_ID_, &type);
}
static void find_closest_arc(double mx,double my)
static void find_closest_arc(double mx, double my)
{
double dist, angle, angle1, angle2;
int i,c,r=-1, col;
int i, c, r=-1, col;
int match;
double threshold;
threshold = CADWIREMINDIST * CADWIREMINDIST * xctx->zoom * xctx->zoom;
@ -257,7 +286,7 @@ static void find_closest_arc(double mx,double my)
if(!xctx->enable_layer[c]) continue;
for(i=0;i<xctx->arcs[c]; ++i)
{
dist = sqrt(pow(mx-xctx->arc[c][i].x,2) + pow(my-xctx->arc[c][i].y,2)) - xctx->arc[c][i].r;
dist = sqrt(pow(mx-xctx->arc[c][i].x, 2) + pow(my-xctx->arc[c][i].y, 2)) - xctx->arc[c][i].r;
dist *= dist; /* square distance */
angle = fmod(atan2(xctx->arc[c][i].y-my, mx-xctx->arc[c][i].x)*180./XSCH_PI, 360.);
if(angle<0.) angle +=360.;
@ -278,7 +307,7 @@ static void find_closest_arc(double mx,double my)
}
}
dbg(1, "find_closest_arc(): dist = %g, angle = %g\n", dist, angle);
dbg(1, "find_closest_arc(): center=%g,%g: mouse: %g:%g\n",
dbg(1, "find_closest_arc(): center=%g, %g: mouse: %g:%g\n",
xctx->arc[c][i].x, xctx->arc[c][i].y, mx, my);
if(match ) {
dbg(1, "find_closest_arc(): i = %d\n", i);
@ -288,29 +317,29 @@ static void find_closest_arc(double mx,double my)
}
} /* end for i */
} /* end for c */
if( r!=-1 && distance <= threshold ) /* * pow(xctx->arc[col][r].r,2)) */
if( r!=-1 && distance <= threshold ) /* * pow(xctx->arc[col][r].r, 2)) */
{
sel.n = r; sel.type = ARC; sel.col = col;
}
}
static void find_closest_box(double mx,double my, int override_lock)
static void find_closest_box(double mx ,double my, int override_lock)
{
double tmp;
double ds = xctx->cadhalfdotsize;
int i,c,r=-1, col = 0;
int i, c, r=-1, col = 0;
for(c=0;c<cadlayers; ++c)
{
if(!xctx->enable_layer[c]) continue;
for(i=0;i<xctx->rects[c]; ++i)
{
if( POINTINSIDE(mx,my,xctx->rect[c][i].x1 - ds, xctx->rect[c][i].y1 - ds,
if( POINTINSIDE(mx, my, xctx->rect[c][i].x1 - ds, xctx->rect[c][i].y1 - ds,
xctx->rect[c][i].x2 + ds, xctx->rect[c][i].y2 + ds) )
{
tmp=dist_from_rect(mx,my,xctx->rect[c][i].x1,xctx->rect[c][i].y1,
xctx->rect[c][i].x2,xctx->rect[c][i].y2);
tmp=dist_from_rect(mx, my, xctx->rect[c][i].x1, xctx->rect[c][i].y1,
xctx->rect[c][i].x2, xctx->rect[c][i].y2);
if(tmp < distance)
{
r = i; distance = tmp;col = c;
@ -324,22 +353,22 @@ static void find_closest_box(double mx,double my, int override_lock)
}
}
static void find_closest_element(double mx,double my, int override_lock)
static void find_closest_element(double mx, double my, int override_lock)
{
double tmp;
int i,r=-1;
int i, r=-1;
for(i=0;i<xctx->instances; ++i)
{
dbg(2, "find_closest_element(): %s: %g %g %g %g\n",
xctx->inst[i].instname, xctx->inst[i].x1,xctx->inst[i].y1,xctx->inst[i].x2,xctx->inst[i].y2);
if( POINTINSIDE(mx,my,xctx->inst[i].x1,xctx->inst[i].y1,xctx->inst[i].x2,xctx->inst[i].y2) )
xctx->inst[i].instname, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2);
if( POINTINSIDE(mx, my, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2) )
{
tmp=pow(mx-(xctx->inst[i].xx1 + xctx->inst[i].xx2)/2, 2)+pow(my-(xctx->inst[i].yy1 + xctx->inst[i].yy2)/2, 2);
if(tmp*0.1 < distance)
{
r = i; distance = tmp*0.1;
}
dbg(2, "find_closest_element(): finding closest element, instances=%d, dist=%.16g\n",i,tmp);
dbg(2, "find_closest_element(): finding closest element, instances=%d, dist=%.16g\n", i, tmp);
}
} /* end for i */
if( r!=-1 && (override_lock || strboolcmp(get_tok_value(xctx->inst[r].prop_ptr, "lock", 0), "true")) ) {
@ -347,11 +376,11 @@ static void find_closest_element(double mx,double my, int override_lock)
}
}
static void find_closest_text(double mx,double my)
static void find_closest_text(double mx, double my)
{
short rot,flip;
double xx1,xx2,yy1,yy2;
int i,r=-1, tmp;
short rot, flip;
double xx1, xx2, yy1, yy2;
int i, r=-1, tmp;
double threshold, dtmp;
#if HAS_CAIRO==1
int customfont;
@ -370,17 +399,17 @@ static void find_closest_text(double mx,double my)
xctx->text[i].xscale, xctx->text[i].yscale, rot, flip,
xctx->text[i].hcenter, xctx->text[i].vcenter,
xctx->text[i].x0, xctx->text[i].y0,
&xx1,&yy1, &xx2,&yy2, &tmp, &dtmp);
&xx1, &yy1, &xx2, &yy2, &tmp, &dtmp);
my_free(_ALLOC_ID_, &estr);
#if HAS_CAIRO==1
if(customfont) {
cairo_restore(xctx->cairo_ctx);
}
#endif
if(POINTINSIDE(mx,my,xx1,yy1, xx2, yy2))
if(POINTINSIDE(mx, my, xx1, yy1, xx2, yy2))
{
r = i; distance = 0;
dbg(2, "find_closest_text(): finding closest text, texts=%d, dist=%.16g\n",i,distance);
dbg(2, "find_closest_text(): finding closest text, texts=%d, dist=%.16g\n", i, distance);
}
} /* end for i */
if( distance <= threshold && r!=-1)
@ -389,19 +418,19 @@ static void find_closest_text(double mx,double my)
}
}
Selected find_closest_obj(double mx,double my, int override_lock)
Selected find_closest_obj(double mx, double my, int override_lock)
{
sel.n = 0L; sel.col = 0; sel.type = 0;
distance = DBL_MAX;
find_closest_line(mx,my);
find_closest_polygon(mx,my);
find_closest_line(mx, my);
find_closest_polygon(mx, my);
/* dbg(1, "1 find_closest_obj(): sel.n=%d, sel.col=%d, sel.type=%d\n", sel.n, sel.col, sel.type); */
find_closest_box(mx,my, override_lock);
find_closest_arc(mx,my);
find_closest_box(mx, my, override_lock);
find_closest_arc(mx, my);
/* dbg(1, "2 find_closest_obj(): sel.n=%d, sel.col=%d, sel.type=%d\n", sel.n, sel.col, sel.type); */
find_closest_text(mx,my);
find_closest_net(mx,my);
find_closest_element(mx,my, override_lock);
find_closest_text(mx, my);
find_closest_net(mx, my);
find_closest_element(mx, my, override_lock);
return sel; /*sel.type = 0 if nothing found */
}

6
src/xschem.h
View File

@ -773,9 +773,6 @@ struct hilight_hashentry
int time; /*delta-time for sims */
};
typedef struct {
/* spice raw file specific data */
char **names;
@ -801,9 +798,6 @@ typedef struct {
double sweep1, sweep2;
} Raw;
/* for netlist.c */
typedef struct instpinentry Instpinentry;
struct instpinentry