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

Corrected bpDump to remove UnitsS2I(), replacing with scalefactor 

determined by CIFGetOutputScale().
This commit is contained in:
Tim Edwards 2020-04-08 12:11:32 -04:00
parent 7e1fcc8ef6
commit 99ac84d590
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bplane/bpDump.c
View File

@ -37,6 +37,7 @@
#include "utils/utils.h" #include "utils/utils.h"
#include "database/database.h" #include "database/database.h"
#include "utils/geometry.h" #include "utils/geometry.h"
#include "cif/cif.h"
#include "bplane/bplaneInt.h" #include "bplane/bplaneInt.h"
static int bpDumpFlags; /* set by bpDump, used by subroutines */ static int bpDumpFlags; /* set by bpDump, used by subroutines */
@ -66,7 +67,6 @@ static void bpIndent(int n)
*/ */
void bpDumpRect(Rect *r) void bpDumpRect(Rect *r)
{ {
if(bpDumpFlags & BPD_INTERNAL_UNITS) if(bpDumpFlags & BPD_INTERNAL_UNITS)
{ {
fprintf(stderr,"%d ", fprintf(stderr,"%d ",
@ -80,14 +80,18 @@ void bpDumpRect(Rect *r)
} }
else else
{ {
fprintf(stderr,"%s ", float oscale;
UnitsI2S(r->r_xbot));
fprintf(stderr,"%s ", oscale = CIFGetOutputScale(1000);
UnitsI2S(r->r_ybot));
fprintf(stderr,"%s ", fprintf(stderr,"%f ",
UnitsI2S(r->r_xtop)); oscale * (float)r->r_xbot);
fprintf(stderr,"%s", fprintf(stderr,"%f ",
UnitsI2S(r->r_ytop)); oscale * (float)r->r_ybot);
fprintf(stderr,"%f ",
oscale * (float)r->r_xtop);
fprintf(stderr,"%f",
oscale * (float)r->r_ytop);
} }
} }
@ -168,11 +172,15 @@ static void bpBinArrayDump(BinArray *ba, int indent)
} }
else else
{ {
fprintf(stderr,"{dx %s} ", float oscale;
UnitsI2S(dx));
fprintf(stderr,"{dy %s} ", oscale = CIFGetOutputScale(1000);
UnitsI2S(dy));
fprintf(stderr,"{dx %f} ",
(float)dx * oscale);
fprintf(stderr,"{dy %f} ",
(float)dy * oscale);
} }
fprintf(stderr,"{dimX %d} {dimY %d} { bbox ", fprintf(stderr,"{dimX %d} {dimY %d} { bbox ",
dimX, dimX,