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

More or less reverted the last commit, as it was found that the 

calculation for "limit" in the CIFgen routines was wrong, not the
interpretation of the "gridlimit" value in the tech file.  The
parsing of "gridlimit" has been put back the way it was before the
last commit, and the "limit" value calculations have been corrected.
This commit is contained in:
Tim Edwards 2021-11-16 15:15:33 -05:00
parent db6128232f
commit 7ffe8bc866
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cif/CIFgen.c
View File

@ -133,8 +133,7 @@ SetBoxGrid(area)
int limit; int limit;
int delta; int delta;
limit = CIFCurStyle->cs_gridLimit * CIFCurStyle->cs_expander; limit = CIFCurStyle->cs_gridLimit;
limit /= (CIFCurStyle->cs_flags & CWF_ANGSTROMS) ? 100 : 10;
if (CIFCurStyle && (limit > 1)) if (CIFCurStyle && (limit > 1))
{ {
@ -595,7 +594,7 @@ cifGrowEuclideanFunc(tile, table)
SetBoxGrid(&rtmp); SetBoxGrid(&rtmp);
DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL); DBPaintPlane(cifPlane, &rtmp, table, (PaintUndoInfo *) NULL);
/* Finally: translate, resize, and paint the diagonal tile */ /* Finally, translate, resize, and paint the diagonal tile */
rtmp = area; rtmp = area;
@ -618,6 +617,7 @@ cifGrowEuclideanFunc(tile, table)
SetBoxGrid(&rtmp); SetBoxGrid(&rtmp);
DBNMPaintPlane(cifPlane, oldType, &rtmp, table, (PaintUndoInfo *) NULL); DBNMPaintPlane(cifPlane, oldType, &rtmp, table, (PaintUndoInfo *) NULL);
oldType = (growDirs & GROW_EAST) ? TiGetRightType(tile) : TiGetLeftType(tile); oldType = (growDirs & GROW_EAST) ? TiGetRightType(tile) : TiGetLeftType(tile);
} }
else else
@ -1442,8 +1442,7 @@ GetEuclideanWidthGrid(width)
int delta; int delta;
int limit; int limit;
limit = CIFCurStyle->cs_gridLimit * CIFCurStyle->cs_expander; limit = CIFCurStyle->cs_gridLimit;
limit /= (CIFCurStyle->cs_flags & CWF_ANGSTROMS) ? 100 : 10;
weuclid = (int)(ceil((double)width * 0.70711)); weuclid = (int)(ceil((double)width * 0.70711));
if (CIFCurStyle && (limit > 1)) if (CIFCurStyle && (limit > 1))
@ -1564,8 +1563,7 @@ GetExpandedAreaGrid(wrule, space, area)
r.r_ybot -= dy; r.r_ybot -= dy;
r.r_ytop += dy; r.r_ytop += dy;
limit = CIFCurStyle->cs_gridLimit * CIFCurStyle->cs_expander; limit = CIFCurStyle->cs_gridLimit;
limit /= (CIFCurStyle->cs_flags & CWF_ANGSTROMS) ? 100 : 10;
if (CIFCurStyle && (limit > 1)) if (CIFCurStyle && (limit > 1))
{ {
@ -3478,8 +3476,7 @@ calcX:
/* Check that we are not violating any gridlimit */ /* Check that we are not violating any gridlimit */
limit = CIFCurStyle->cs_gridLimit * CIFCurStyle->cs_expander; limit = CIFCurStyle->cs_gridLimit;
limit /= (CIFCurStyle->cs_flags & CWF_ANGSTROMS) ? 100 : 10;
if (CIFCurStyle && (limit > 1)) if (CIFCurStyle && (limit > 1))
{ {
@ -3568,8 +3565,7 @@ cifSquareFunc(area, op, rows, columns, cut)
bool glimit; bool glimit;
SquaresData *squares = (SquaresData *)op->co_client; SquaresData *squares = (SquaresData *)op->co_client;
limit = CIFCurStyle->cs_gridLimit * CIFCurStyle->cs_expander; limit = CIFCurStyle->cs_gridLimit;
limit /= (CIFCurStyle->cs_flags & CWF_ANGSTROMS) ? 100 : 10;
glimit = (CIFCurStyle && (limit > 1)) ? TRUE : FALSE; glimit = (CIFCurStyle && (limit > 1)) ? TRUE : FALSE;
pitch = squares->sq_size + squares->sq_sep; pitch = squares->sq_size + squares->sq_sep;