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

Corrected the "what" command so that the correct cells are listed 

that contain the selected paint.  Previously, all cells inside the
area of the selection box would be printed, which is completely
wrong, and can lead unexpectedly to thousands of cell instance
names being printed out.
This commit is contained in:
Tim Edwards 2021-03-20 17:04:31 -04:00
parent 8384891f3d
commit b77352849d
2 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.143
8.3.144

76
commands/CmdTZ.c
View File

@ -844,6 +844,41 @@ typedef struct labelstore
static int moreLabelEntries, labelEntryCount;
static LabelStore *labelBlockTop, *labelEntry;
/*
* ----------------------------------------------------------------------------
*
* cmdFindWhatTileFunc ---
*
* Callback function for CmdWhat(). Given a tile found in the current
* selection, searches the database to find what cell or cells that type
* belongs to.
*
* ----------------------------------------------------------------------------
*/
int
cmdFindWhatTileFunc(Tile *tile, ClientData clientData)
{
struct linked_id **lid = (struct linked_id **)clientData;
SearchContext scx;
TileTypeBitMask tmask;
TileType type;
TiToRect(tile, &scx.scx_area);
scx.scx_use = EditCellUse;
scx.scx_trans = GeoIdentityTransform;
if (SplitSide(tile))
type = SplitRightType(tile);
else
type = SplitLeftType(tile);
TTMaskSetOnlyType(&tmask, type);
DBTreeSrTiles(&scx, &tmask, 0, cmdWhatPrintCell, (ClientData)lid);
return 0;
}
/*
* ----------------------------------------------------------------------------
*
@ -875,9 +910,7 @@ CmdWhat(w, cmd)
bool foundAny;
bool doList = FALSE;
TileTypeBitMask layers, maskBits, *rMask;
SearchContext scx;
CellUse *CheckUse;
struct linked_id *lid;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj, *paintobj, *labelobj, *cellobj;
@ -959,29 +992,44 @@ CmdWhat(w, cmd)
}
if ((CheckUse != NULL) && (CheckUse->cu_def == SelectRootDef))
{
scx.scx_use = CheckUse;
scx.scx_area = SelectUse->cu_bbox; // BSI
scx.scx_trans = GeoIdentityTransform; // BSI
CellUse *saveUse = EditCellUse;
struct linked_id *lid;
int pNum;
EditCellUse = CheckUse;
TxPrintf("Selected mask layers:\n");
for (i = TT_SELECTBASE; i < DBNumUserLayers; i++)
{
if (TTMaskHasType(&layers, i))
{
lid = NULL;
TxPrintf(" %-8s (", DBTypeLongName(i));
TTMaskSetOnlyType(&maskBits, i);
if (DBIsContact(i)) DBMaskAddStacking(&maskBits);
DBTreeSrTiles(&scx, &maskBits, 0, cmdWhatPrintCell,
(ClientData)&lid);
TxPrintf(")\n");
while (lid != NULL)
{
freeMagic(lid);
lid = lid->lid_next;
/* Search selection for tiles of this type, then */
/* call cmdFindWhatTileFunc() to search the cell */
/* def in the area of that tile to determine what */
/* cell or subcell that tile belongs to. */
lid = NULL;
TxPrintf(" %-8s (", DBTypeLongName(i));
for (pNum = PL_TECHDEPBASE; pNum < DBNumPlanes; pNum++)
if (TTMaskHasType(&DBPlaneTypes[pNum], i))
{
DBSrPaintArea((Tile *)NULL, SelectDef->cd_planes[pNum],
&SelectUse->cu_bbox, &maskBits,
cmdFindWhatTileFunc, (ClientData)&lid);
}
TxPrintf(")\n");
while (lid != NULL)
{
freeMagic(lid);
lid = lid->lid_next;
}
}
}
EditCellUse = saveUse;
}
else
{