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

Modified the label connect function so that it only copies connected 

labels if they are in the top-level cell of the connection search.
Otherwise, this slows the connection search way down for nets with
lots of internal labels, and can also have potentially bad consequences
if, for example, the connected network is copied to another position,
and carries all the flattened and non-hierarchically-named labels with
it.
This commit is contained in:
Tim Edwards 2019-02-09 17:02:23 -05:00
parent dfa95351cb
commit 7f1fa3a4c5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
database/DBconnect.c
View File

@ -674,9 +674,15 @@ dbcConnectLabelFunc(scx, lab, tpath, csa2)
GeoTransPointDelta(&scx->scx_trans, &lab->lab_offset, &offset);
rotate = GeoTransAngle(&scx->scx_trans, lab->lab_rotate);
DBEraseLabelsByContent(def, &r, -1, lab->lab_text);
DBPutFontLabel(def, &r, lab->lab_font, lab->lab_size, rotate, &offset,
/* Only add labels if they are on the search top level */
/* (NOTE: Could add hierachical labels using tpath) */
if (scx->scx_use == csa2->csa2_topscx->scx_use)
{
DBEraseLabelsByContent(def, &r, -1, lab->lab_text);
DBPutFontLabel(def, &r, lab->lab_font, lab->lab_size, rotate, &offset,
pos, lab->lab_text, lab->lab_type, lab->lab_flags);
}
if (lab->lab_flags & PORT_DIR_MASK)
{
@ -858,10 +864,6 @@ dbcConnectFunc(tile, cx)
&newarea, DBStdPaintTbl(loctype, pNum),
(PaintUndoInfo *) NULL);
/* Copy information from original context into new search context */
scx2 = *csa2->csa2_topscx;
scx2.scx_area = newarea;
/* Check the source def for any labels belonging to this */
/* tile area and plane, and add them to the destination. */
@ -887,6 +889,14 @@ dbcConnectFunc(tile, cx)
}
}
/* Note that the search must be done from the top since zero-size */
/* port labels can be on any part of the hierarchy with no paint */
/* underneath in its own cell to trigger the callback function. */
/* Copy information from top search context into new search context */
scx2 = *csa2->csa2_topscx;
scx2.scx_area = newarea;
DBTreeSrLabels(&scx2, connectMask, csa2->csa2_xMask, NULL,
searchtype, dbcConnectLabelFunc,
(ClientData) csa2);