2009-07-08 09:44:13 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// The file format-specific stuff for all of the 2d vector output formats.
|
2013-07-28 22:08:34 +00:00
|
|
|
//
|
|
|
|
// Copyright 2008-2013 Jonathan Westhues.
|
2009-07-08 09:44:13 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#include "solvespace.h"
|
|
|
|
|
2013-10-19 05:36:45 +00:00
|
|
|
void VectorFileWriter::Dummy(void) {
|
|
|
|
// This out-of-line virtual method definition quells the following warning
|
|
|
|
// from Clang++: "'VectorFileWriter' has no out-of-line virtual method
|
|
|
|
// definitions; its vtable will be emitted in every translation unit
|
|
|
|
// [-Wweak-vtables]"
|
|
|
|
}
|
|
|
|
|
2009-07-08 09:44:13 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for DXF export
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void DxfFileWriter::StartFile(void) {
|
|
|
|
// Some software, like Adobe Illustrator, insists on a header.
|
|
|
|
fprintf(f,
|
|
|
|
" 999\r\n"
|
|
|
|
"file created by SolveSpace\r\n"
|
|
|
|
" 0\r\n"
|
|
|
|
"SECTION\r\n"
|
|
|
|
" 2\r\n"
|
|
|
|
"HEADER\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$ACADVER\r\n"
|
|
|
|
" 1\r\n"
|
|
|
|
"AC1006\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$ANGDIR\r\n"
|
|
|
|
" 70\r\n"
|
|
|
|
"0\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$AUNITS\r\n"
|
|
|
|
" 70\r\n"
|
|
|
|
"0\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$AUPREC\r\n"
|
|
|
|
" 70\r\n"
|
|
|
|
"0\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$INSBASE\r\n"
|
|
|
|
" 10\r\n"
|
|
|
|
"0.0\r\n"
|
|
|
|
" 20\r\n"
|
|
|
|
"0.0\r\n"
|
|
|
|
" 30\r\n"
|
|
|
|
"0.0\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$EXTMIN\r\n"
|
|
|
|
" 10\r\n"
|
|
|
|
"0.0\r\n"
|
|
|
|
" 20\r\n"
|
|
|
|
"0.0\r\n"
|
|
|
|
" 9\r\n"
|
|
|
|
"$EXTMAX\r\n"
|
|
|
|
" 10\r\n"
|
|
|
|
"10000.0\r\n"
|
|
|
|
" 20\r\n"
|
|
|
|
"10000.0\r\n"
|
|
|
|
" 0\r\n"
|
|
|
|
"ENDSEC\r\n");
|
|
|
|
|
|
|
|
// Then start the entities.
|
|
|
|
fprintf(f,
|
|
|
|
" 0\r\n"
|
|
|
|
"SECTION\r\n"
|
|
|
|
" 2\r\n"
|
|
|
|
"ENTITIES\r\n");
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void DxfFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void DxfFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void DxfFileWriter::Triangle(STriangle *tr) {
|
|
|
|
}
|
|
|
|
|
|
|
|
void DxfFileWriter::Bezier(SBezier *sb) {
|
|
|
|
Vector c, n = Vector::From(0, 0, 1);
|
|
|
|
double r;
|
|
|
|
if(sb->deg == 1) {
|
|
|
|
fprintf(f,
|
2009-07-08 09:44:13 +00:00
|
|
|
" 0\r\n"
|
|
|
|
"LINE\r\n"
|
|
|
|
" 8\r\n" // Layer code
|
|
|
|
"%d\r\n"
|
|
|
|
" 10\r\n" // xA
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 20\r\n" // yA
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 30\r\n" // zA
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 11\r\n" // xB
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 21\r\n" // yB
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 31\r\n" // zB
|
|
|
|
"%.6f\r\n",
|
2009-10-30 10:38:34 +00:00
|
|
|
0,
|
|
|
|
sb->ctrl[0].x, sb->ctrl[0].y, sb->ctrl[0].z,
|
|
|
|
sb->ctrl[1].x, sb->ctrl[1].y, sb->ctrl[1].z);
|
|
|
|
} else if(sb->IsInPlane(n, 0) && sb->IsCircle(n, &c, &r)) {
|
2009-07-08 09:44:13 +00:00
|
|
|
double theta0 = atan2(sb->ctrl[0].y - c.y, sb->ctrl[0].x - c.x),
|
|
|
|
theta1 = atan2(sb->ctrl[2].y - c.y, sb->ctrl[2].x - c.x),
|
|
|
|
dtheta = WRAP_SYMMETRIC(theta1 - theta0, 2*PI);
|
|
|
|
if(dtheta < 0) {
|
|
|
|
SWAP(double, theta0, theta1);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f,
|
|
|
|
" 0\r\n"
|
|
|
|
"ARC\r\n"
|
|
|
|
" 8\r\n" // Layer code
|
|
|
|
"%d\r\n"
|
|
|
|
" 10\r\n" // x
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 20\r\n" // y
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 30\r\n" // z
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 40\r\n" // radius
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 50\r\n" // start angle
|
|
|
|
"%.6f\r\n"
|
|
|
|
" 51\r\n" // end angle
|
|
|
|
"%.6f\r\n",
|
|
|
|
0,
|
|
|
|
c.x, c.y, 0.0,
|
|
|
|
r,
|
|
|
|
theta0*180/PI, theta1*180/PI);
|
|
|
|
} else {
|
2009-10-30 10:38:34 +00:00
|
|
|
BezierAsPwl(sb);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DxfFileWriter::FinishAndCloseFile(void) {
|
|
|
|
fprintf(f,
|
|
|
|
" 0\r\n"
|
|
|
|
"ENDSEC\r\n"
|
|
|
|
" 0\r\n"
|
|
|
|
"EOF\r\n" );
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for EPS output
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void EpsFileWriter::StartFile(void) {
|
|
|
|
fprintf(f,
|
|
|
|
"%%!PS-Adobe-2.0\r\n"
|
|
|
|
"%%%%Creator: SolveSpace\r\n"
|
|
|
|
"%%%%Title: title\r\n"
|
|
|
|
"%%%%Pages: 0\r\n"
|
|
|
|
"%%%%PageOrder: Ascend\r\n"
|
|
|
|
"%%%%BoundingBox: 0 0 %d %d\r\n"
|
|
|
|
"%%%%HiResBoundingBox: 0 0 %.3f %.3f\r\n"
|
|
|
|
"%%%%EndComments\r\n"
|
|
|
|
"\r\n"
|
|
|
|
"gsave\r\n"
|
|
|
|
"\r\n",
|
|
|
|
(int)ceil(MmToPts(ptMax.x - ptMin.x)),
|
|
|
|
(int)ceil(MmToPts(ptMax.y - ptMin.y)),
|
|
|
|
MmToPts(ptMax.x - ptMin.x),
|
|
|
|
MmToPts(ptMax.y - ptMin.y));
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void EpsFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
fprintf(f, "newpath\r\n");
|
|
|
|
prevPt = Vector::From(VERY_POSITIVE, VERY_POSITIVE, VERY_POSITIVE);
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void EpsFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
fprintf(f, " %.3f setlinewidth\r\n"
|
|
|
|
" %.3f %.3f %.3f setrgbcolor\r\n"
|
|
|
|
" 1 setlinejoin\r\n" // rounded
|
|
|
|
" 1 setlinecap\r\n" // rounded
|
|
|
|
" gsave stroke grestore\r\n",
|
|
|
|
MmToPts(lineWidth),
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
strokeRgb.redF(), strokeRgb.greenF(), strokeRgb.blueF());
|
2009-10-30 10:38:34 +00:00
|
|
|
if(filled) {
|
|
|
|
fprintf(f, " %.3f %.3f %.3f setrgbcolor\r\n"
|
|
|
|
" gsave fill grestore\r\n",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
fillRgb.redF(), fillRgb.greenF(), fillRgb.blueF());
|
2009-10-30 10:38:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void EpsFileWriter::MaybeMoveTo(Vector st, Vector fi) {
|
|
|
|
if(!prevPt.Equals(st)) {
|
|
|
|
fprintf(f, " %.3f %.3f moveto\r\n",
|
|
|
|
MmToPts(st.x - ptMin.x), MmToPts(st.y - ptMin.y));
|
|
|
|
}
|
|
|
|
prevPt = fi;
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void EpsFileWriter::Triangle(STriangle *tr) {
|
|
|
|
fprintf(f,
|
|
|
|
"%.3f %.3f %.3f setrgbcolor\r\n"
|
|
|
|
"newpath\r\n"
|
|
|
|
" %.3f %.3f moveto\r\n"
|
|
|
|
" %.3f %.3f lineto\r\n"
|
|
|
|
" %.3f %.3f lineto\r\n"
|
|
|
|
" closepath\r\n"
|
2009-10-30 10:38:34 +00:00
|
|
|
"gsave fill grestore\r\n",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
tr->meta.color.redF(), tr->meta.color.greenF(), tr->meta.color.blueF(),
|
2009-07-08 09:44:13 +00:00
|
|
|
MmToPts(tr->a.x - ptMin.x), MmToPts(tr->a.y - ptMin.y),
|
|
|
|
MmToPts(tr->b.x - ptMin.x), MmToPts(tr->b.y - ptMin.y),
|
|
|
|
MmToPts(tr->c.x - ptMin.x), MmToPts(tr->c.y - ptMin.y));
|
|
|
|
|
|
|
|
// same issue with cracks, stroke it to avoid them
|
|
|
|
double sw = max(ptMax.x - ptMin.x, ptMax.y - ptMin.y) / 1000;
|
|
|
|
fprintf(f,
|
2009-10-30 10:38:34 +00:00
|
|
|
"1 setlinejoin\r\n"
|
|
|
|
"1 setlinecap\r\n"
|
2009-07-08 09:44:13 +00:00
|
|
|
"%.3f setlinewidth\r\n"
|
2009-10-30 10:38:34 +00:00
|
|
|
"gsave stroke grestore\r\n",
|
|
|
|
MmToPts(sw));
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
2009-10-30 10:38:34 +00:00
|
|
|
void EpsFileWriter::Bezier(SBezier *sb) {
|
2009-07-08 09:44:13 +00:00
|
|
|
Vector c, n = Vector::From(0, 0, 1);
|
|
|
|
double r;
|
2009-10-30 10:38:34 +00:00
|
|
|
if(sb->deg == 1) {
|
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[1]);
|
|
|
|
fprintf(f, " %.3f %.3f lineto\r\n",
|
|
|
|
MmToPts(sb->ctrl[1].x - ptMin.x),
|
|
|
|
MmToPts(sb->ctrl[1].y - ptMin.y));
|
|
|
|
} else if(sb->IsCircle(n, &c, &r)) {
|
2009-07-08 09:44:13 +00:00
|
|
|
Vector p0 = sb->ctrl[0], p1 = sb->ctrl[2];
|
|
|
|
double theta0 = atan2(p0.y - c.y, p0.x - c.x),
|
|
|
|
theta1 = atan2(p1.y - c.y, p1.x - c.x),
|
|
|
|
dtheta = WRAP_SYMMETRIC(theta1 - theta0, 2*PI);
|
2009-10-30 10:38:34 +00:00
|
|
|
MaybeMoveTo(p0, p1);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
2009-10-30 11:18:54 +00:00
|
|
|
" %.3f %.3f %.3f %.3f %.3f %s\r\n",
|
2009-07-08 09:44:13 +00:00
|
|
|
MmToPts(c.x - ptMin.x), MmToPts(c.y - ptMin.y),
|
|
|
|
MmToPts(r),
|
2009-10-30 11:18:54 +00:00
|
|
|
theta0*180/PI, theta1*180/PI,
|
|
|
|
dtheta < 0 ? "arcn" : "arc");
|
2009-07-08 09:44:13 +00:00
|
|
|
} else if(sb->deg == 3 && !sb->IsRational()) {
|
2009-10-30 10:38:34 +00:00
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[3]);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
2009-10-30 10:38:34 +00:00
|
|
|
" %.3f %.3f %.3f %.3f %.3f %.3f curveto\r\n",
|
2009-07-08 09:44:13 +00:00
|
|
|
MmToPts(sb->ctrl[1].x - ptMin.x), MmToPts(sb->ctrl[1].y - ptMin.y),
|
|
|
|
MmToPts(sb->ctrl[2].x - ptMin.x), MmToPts(sb->ctrl[2].y - ptMin.y),
|
2009-10-30 10:38:34 +00:00
|
|
|
MmToPts(sb->ctrl[3].x - ptMin.x), MmToPts(sb->ctrl[3].y - ptMin.y));
|
2009-07-08 09:44:13 +00:00
|
|
|
} else {
|
2009-10-30 10:38:34 +00:00
|
|
|
BezierAsNonrationalCubic(sb);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void EpsFileWriter::FinishAndCloseFile(void) {
|
|
|
|
fprintf(f,
|
|
|
|
"\r\n"
|
|
|
|
"grestore\r\n"
|
|
|
|
"\r\n");
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for PDF output, some extra complexity because we have to generate
|
|
|
|
// a correct xref table.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void PdfFileWriter::StartFile(void) {
|
2015-03-29 00:30:52 +00:00
|
|
|
if((ptMax.x - ptMin.x) > 200*25.4 ||
|
2009-12-15 14:51:21 +00:00
|
|
|
(ptMax.y - ptMin.y) > 200*25.4)
|
|
|
|
{
|
|
|
|
Message("PDF page size exceeds 200 by 200 inches; many viewers may "
|
|
|
|
"reject this file.");
|
|
|
|
}
|
|
|
|
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"%%PDF-1.1\r\n"
|
|
|
|
"%%%c%c%c%c\r\n",
|
|
|
|
0xe2, 0xe3, 0xcf, 0xd3);
|
2015-03-29 00:30:52 +00:00
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[1] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"1 0 obj\r\n"
|
|
|
|
" << /Type /Catalog\r\n"
|
|
|
|
" /Outlines 2 0 R\r\n"
|
|
|
|
" /Pages 3 0 R\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[2] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"2 0 obj\r\n"
|
|
|
|
" << /Type /Outlines\r\n"
|
|
|
|
" /Count 0\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[3] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"3 0 obj\r\n"
|
|
|
|
" << /Type /Pages\r\n"
|
|
|
|
" /Kids [4 0 R]\r\n"
|
|
|
|
" /Count 1\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[4] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"4 0 obj\r\n"
|
|
|
|
" << /Type /Page\r\n"
|
|
|
|
" /Parent 3 0 R\r\n"
|
|
|
|
" /MediaBox [0 0 %.3f %.3f]\r\n"
|
|
|
|
" /Contents 5 0 R\r\n"
|
|
|
|
" /Resources << /ProcSet 7 0 R\r\n"
|
|
|
|
" /Font << /F1 8 0 R >>\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"endobj\r\n",
|
|
|
|
MmToPts(ptMax.x - ptMin.x),
|
|
|
|
MmToPts(ptMax.y - ptMin.y));
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[5] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"5 0 obj\r\n"
|
|
|
|
" << /Length 6 0 R >>\r\n"
|
|
|
|
"stream\r\n");
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
bodyStart = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PdfFileWriter::FinishAndCloseFile(void) {
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint32_t bodyEnd = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
|
|
|
|
fprintf(f,
|
|
|
|
"endstream\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[6] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"6 0 obj\r\n"
|
|
|
|
" %d\r\n"
|
|
|
|
"endobj\r\n",
|
|
|
|
bodyEnd - bodyStart);
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[7] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"7 0 obj\r\n"
|
|
|
|
" [/PDF /Text]\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[8] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"8 0 obj\r\n"
|
|
|
|
" << /Type /Font\r\n"
|
|
|
|
" /Subtype /Type1\r\n"
|
|
|
|
" /Name /F1\r\n"
|
|
|
|
" /BaseFont /Helvetica\r\n"
|
|
|
|
" /Encoding /WinAnsiEncoding\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"endobj\r\n");
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
xref[9] = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"9 0 obj\r\n"
|
|
|
|
" << /Creator (SolveSpace)\r\n"
|
|
|
|
" >>\r\n");
|
2015-03-29 00:30:52 +00:00
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint32_t xrefStart = (uint32_t)ftell(f);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
|
|
|
"xref\r\n"
|
|
|
|
"0 10\r\n"
|
|
|
|
"0000000000 65535 f\r\n");
|
2015-03-29 00:30:52 +00:00
|
|
|
|
2009-07-08 09:44:13 +00:00
|
|
|
int i;
|
|
|
|
for(i = 1; i <= 9; i++) {
|
|
|
|
fprintf(f, "%010d %05d n\r\n", xref[i], 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f,
|
|
|
|
"\r\n"
|
|
|
|
"trailer\r\n"
|
|
|
|
" << /Size 10\r\n"
|
|
|
|
" /Root 1 0 R\r\n"
|
|
|
|
" /Info 9 0 R\r\n"
|
|
|
|
" >>\r\n"
|
|
|
|
"startxref\r\n"
|
|
|
|
"%d\r\n"
|
|
|
|
"%%%%EOF\r\n",
|
|
|
|
xrefStart);
|
|
|
|
|
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void PdfFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
fprintf(f, "1 J 1 j " // round endcaps and joins
|
|
|
|
"%.3f w "
|
|
|
|
"%.3f %.3f %.3f RG\r\n",
|
|
|
|
MmToPts(lineWidth),
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
strokeRgb.redF(), strokeRgb.greenF(), strokeRgb.blueF());
|
2009-10-30 10:38:34 +00:00
|
|
|
if(filled) {
|
|
|
|
fprintf(f, "%.3f %.3f %.3f rg\r\n",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
fillRgb.redF(), fillRgb.greenF(), fillRgb.blueF());
|
2009-10-30 10:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
prevPt = Vector::From(VERY_POSITIVE, VERY_POSITIVE, VERY_POSITIVE);
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void PdfFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
if(filled) {
|
|
|
|
fprintf(f, "b\r\n");
|
|
|
|
} else {
|
|
|
|
fprintf(f, "S\r\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PdfFileWriter::MaybeMoveTo(Vector st, Vector fi) {
|
|
|
|
if(!prevPt.Equals(st)) {
|
|
|
|
fprintf(f, "%.3f %.3f m\r\n",
|
|
|
|
MmToPts(st.x - ptMin.x), MmToPts(st.y - ptMin.y));
|
|
|
|
}
|
|
|
|
prevPt = fi;
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PdfFileWriter::Triangle(STriangle *tr) {
|
|
|
|
double sw = max(ptMax.x - ptMin.x, ptMax.y - ptMin.y) / 1000;
|
|
|
|
|
|
|
|
fprintf(f,
|
2009-10-30 10:38:34 +00:00
|
|
|
"1 J 1 j\r\n"
|
2009-07-08 09:44:13 +00:00
|
|
|
"%.3f %.3f %.3f RG\r\n"
|
|
|
|
"%.3f %.3f %.3f rg\r\n"
|
|
|
|
"%.3f w\r\n"
|
|
|
|
"%.3f %.3f m\r\n"
|
|
|
|
"%.3f %.3f l\r\n"
|
|
|
|
"%.3f %.3f l\r\n"
|
|
|
|
"b\r\n",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
tr->meta.color.redF(), tr->meta.color.greenF(), tr->meta.color.blueF(),
|
|
|
|
tr->meta.color.redF(), tr->meta.color.greenF(), tr->meta.color.blueF(),
|
2009-07-08 09:44:13 +00:00
|
|
|
MmToPts(sw),
|
|
|
|
MmToPts(tr->a.x - ptMin.x), MmToPts(tr->a.y - ptMin.y),
|
|
|
|
MmToPts(tr->b.x - ptMin.x), MmToPts(tr->b.y - ptMin.y),
|
|
|
|
MmToPts(tr->c.x - ptMin.x), MmToPts(tr->c.y - ptMin.y));
|
|
|
|
}
|
|
|
|
|
2009-10-30 10:38:34 +00:00
|
|
|
void PdfFileWriter::Bezier(SBezier *sb) {
|
|
|
|
if(sb->deg == 1) {
|
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[1]);
|
2009-07-08 09:44:13 +00:00
|
|
|
fprintf(f,
|
2009-10-30 10:38:34 +00:00
|
|
|
"%.3f %.3f l\r\n",
|
|
|
|
MmToPts(sb->ctrl[1].x - ptMin.x), MmToPts(sb->ctrl[1].y - ptMin.y));
|
|
|
|
} else if(sb->deg == 3 && !sb->IsRational()) {
|
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[3]);
|
|
|
|
fprintf(f,
|
|
|
|
"%.3f %.3f %.3f %.3f %.3f %.3f c\r\n",
|
2009-07-08 09:44:13 +00:00
|
|
|
MmToPts(sb->ctrl[1].x - ptMin.x), MmToPts(sb->ctrl[1].y - ptMin.y),
|
|
|
|
MmToPts(sb->ctrl[2].x - ptMin.x), MmToPts(sb->ctrl[2].y - ptMin.y),
|
|
|
|
MmToPts(sb->ctrl[3].x - ptMin.x), MmToPts(sb->ctrl[3].y - ptMin.y));
|
|
|
|
} else {
|
2009-10-30 10:38:34 +00:00
|
|
|
BezierAsNonrationalCubic(sb);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for SVG output
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void SvgFileWriter::StartFile(void) {
|
|
|
|
fprintf(f,
|
|
|
|
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\" "
|
|
|
|
"\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\r\n"
|
|
|
|
"<svg xmlns=\"http://www.w3.org/2000/svg\" "
|
|
|
|
"xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
|
|
|
|
"width='%.3fmm' height='%.3fmm' "
|
|
|
|
"viewBox=\"0 0 %.3f %.3f\">\r\n"
|
|
|
|
"\r\n"
|
|
|
|
"<title>Exported SVG</title>\r\n"
|
|
|
|
"\r\n",
|
2015-04-12 21:24:55 +00:00
|
|
|
(ptMax.x - ptMin.x), (ptMax.y - ptMin.y),
|
|
|
|
(ptMax.x - ptMin.x), (ptMax.y - ptMin.y));
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void SvgFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
fprintf(f, "<path d='");
|
|
|
|
prevPt = Vector::From(VERY_POSITIVE, VERY_POSITIVE, VERY_POSITIVE);
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void SvgFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
char fill[100];
|
|
|
|
if(filled) {
|
|
|
|
sprintf(fill, "#%02x%02x%02x",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
fillRgb.red, fillRgb.green, fillRgb.blue);
|
2009-10-30 10:38:34 +00:00
|
|
|
} else {
|
|
|
|
strcpy(fill, "none");
|
|
|
|
}
|
|
|
|
fprintf(f, "' stroke-width='%.3f' stroke='#%02x%02x%02x' "
|
|
|
|
"stroke-linecap='round' stroke-linejoin='round' "
|
|
|
|
"fill='%s' />\r\n",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
lineWidth, strokeRgb.red, strokeRgb.green, strokeRgb.blue,
|
2009-10-30 10:38:34 +00:00
|
|
|
fill);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SvgFileWriter::MaybeMoveTo(Vector st, Vector fi) {
|
2009-07-08 09:44:13 +00:00
|
|
|
// SVG uses a coordinate system with the origin at top left, +y down
|
2009-10-30 10:38:34 +00:00
|
|
|
if(!prevPt.Equals(st)) {
|
|
|
|
fprintf(f, "M%.3f %.3f ", (st.x - ptMin.x), (ptMax.y - st.y));
|
|
|
|
}
|
|
|
|
prevPt = fi;
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SvgFileWriter::Triangle(STriangle *tr) {
|
|
|
|
// crispEdges turns of anti-aliasing, which tends to cause hairline
|
|
|
|
// cracks between triangles; but there still is some cracking, so
|
|
|
|
// specify a stroke width too, hope for around a pixel
|
|
|
|
double sw = max(ptMax.x - ptMin.x, ptMax.y - ptMin.y) / 1000;
|
|
|
|
fprintf(f,
|
|
|
|
"<polygon points='%.3f,%.3f %.3f,%.3f %.3f,%.3f' "
|
|
|
|
"stroke='#%02x%02x%02x' stroke-width='%.3f' "
|
|
|
|
"style='fill:#%02x%02x%02x' shape-rendering='crispEdges'/>\r\n",
|
|
|
|
(tr->a.x - ptMin.x), (ptMax.y - tr->a.y),
|
|
|
|
(tr->b.x - ptMin.x), (ptMax.y - tr->b.y),
|
|
|
|
(tr->c.x - ptMin.x), (ptMax.y - tr->c.y),
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
tr->meta.color.red, tr->meta.color.green, tr->meta.color.blue,
|
2009-07-08 09:44:13 +00:00
|
|
|
sw,
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
tr->meta.color.red, tr->meta.color.green, tr->meta.color.blue);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
2009-10-30 10:38:34 +00:00
|
|
|
void SvgFileWriter::Bezier(SBezier *sb) {
|
2009-07-08 09:44:13 +00:00
|
|
|
Vector c, n = Vector::From(0, 0, 1);
|
|
|
|
double r;
|
2009-10-30 10:38:34 +00:00
|
|
|
if(sb->deg == 1) {
|
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[1]);
|
|
|
|
fprintf(f, "L%.3f,%.3f ",
|
|
|
|
(sb->ctrl[1].x - ptMin.x), (ptMax.y - sb->ctrl[1].y));
|
|
|
|
} else if(sb->IsCircle(n, &c, &r)) {
|
2009-07-08 09:44:13 +00:00
|
|
|
Vector p0 = sb->ctrl[0], p1 = sb->ctrl[2];
|
|
|
|
double theta0 = atan2(p0.y - c.y, p0.x - c.x),
|
|
|
|
theta1 = atan2(p1.y - c.y, p1.x - c.x),
|
|
|
|
dtheta = WRAP_SYMMETRIC(theta1 - theta0, 2*PI);
|
|
|
|
// The arc must be less than 180 degrees, or else it couldn't have
|
2009-10-30 11:18:54 +00:00
|
|
|
// been represented as a single rational Bezier. So large-arc-flag
|
|
|
|
// must be false. sweep-flag is determined by the sign of dtheta.
|
|
|
|
// Note that clockwise and counter-clockwise are backwards in SVG's
|
|
|
|
// mirrored csys.
|
2009-10-30 10:38:34 +00:00
|
|
|
MaybeMoveTo(p0, p1);
|
2009-10-30 11:18:54 +00:00
|
|
|
fprintf(f, "A%.3f,%.3f 0 0,%d %.3f,%.3f ",
|
2009-10-30 10:38:34 +00:00
|
|
|
r, r,
|
2009-10-30 11:18:54 +00:00
|
|
|
(dtheta < 0) ? 1 : 0,
|
2009-10-30 10:38:34 +00:00
|
|
|
p1.x - ptMin.x, ptMax.y - p1.y);
|
2009-07-08 09:44:13 +00:00
|
|
|
} else if(!sb->IsRational()) {
|
2009-10-30 10:38:34 +00:00
|
|
|
if(sb->deg == 2) {
|
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[2]);
|
|
|
|
fprintf(f, "Q%.3f,%.3f %.3f,%.3f ",
|
2009-07-08 09:44:13 +00:00
|
|
|
sb->ctrl[1].x - ptMin.x, ptMax.y - sb->ctrl[1].y,
|
2009-10-30 10:38:34 +00:00
|
|
|
sb->ctrl[2].x - ptMin.x, ptMax.y - sb->ctrl[2].y);
|
2009-07-08 09:44:13 +00:00
|
|
|
} else if(sb->deg == 3) {
|
2009-10-30 10:38:34 +00:00
|
|
|
MaybeMoveTo(sb->ctrl[0], sb->ctrl[3]);
|
|
|
|
fprintf(f, "C%.3f,%.3f %.3f,%.3f %.3f,%.3f ",
|
2009-07-08 09:44:13 +00:00
|
|
|
sb->ctrl[1].x - ptMin.x, ptMax.y - sb->ctrl[1].y,
|
|
|
|
sb->ctrl[2].x - ptMin.x, ptMax.y - sb->ctrl[2].y,
|
2009-10-30 10:38:34 +00:00
|
|
|
sb->ctrl[3].x - ptMin.x, ptMax.y - sb->ctrl[3].y);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
} else {
|
2009-10-30 10:38:34 +00:00
|
|
|
BezierAsNonrationalCubic(sb);
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SvgFileWriter::FinishAndCloseFile(void) {
|
|
|
|
fprintf(f, "\r\n</svg>\r\n");
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for HPGL output
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
double HpglFileWriter::MmToHpglUnits(double mm) {
|
|
|
|
return mm*40;
|
|
|
|
}
|
|
|
|
|
|
|
|
void HpglFileWriter::StartFile(void) {
|
|
|
|
fprintf(f, "IN;\r\n");
|
|
|
|
fprintf(f, "SP1;\r\n");
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void HpglFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void HpglFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void HpglFileWriter::Triangle(STriangle *tr) {
|
|
|
|
}
|
|
|
|
|
2009-10-30 10:38:34 +00:00
|
|
|
void HpglFileWriter::Bezier(SBezier *sb) {
|
|
|
|
if(sb->deg == 1) {
|
|
|
|
fprintf(f, "PU%d,%d;\r\n",
|
|
|
|
(int)MmToHpglUnits(sb->ctrl[0].x),
|
|
|
|
(int)MmToHpglUnits(sb->ctrl[0].y));
|
|
|
|
fprintf(f, "PD%d,%d;\r\n",
|
|
|
|
(int)MmToHpglUnits(sb->ctrl[1].x),
|
|
|
|
(int)MmToHpglUnits(sb->ctrl[1].y));
|
|
|
|
} else {
|
|
|
|
BezierAsPwl(sb);
|
|
|
|
}
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void HpglFileWriter::FinishAndCloseFile(void) {
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
2010-01-14 04:47:17 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routines for G Code output. Slightly complicated by our ability to generate
|
|
|
|
// multiple passes, and to specify the feeds and depth; those parameters get
|
|
|
|
// set in the configuration screen.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void GCodeFileWriter::StartFile(void) {
|
|
|
|
ZERO(&sel);
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void GCodeFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2010-01-14 04:47:17 +00:00
|
|
|
{
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void GCodeFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2010-01-14 04:47:17 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
void GCodeFileWriter::Triangle(STriangle *tr) {
|
|
|
|
}
|
|
|
|
|
|
|
|
void GCodeFileWriter::Bezier(SBezier *sb) {
|
|
|
|
if(sb->deg == 1) {
|
|
|
|
sel.AddEdge(sb->ctrl[0], sb->ctrl[1]);
|
|
|
|
} else {
|
|
|
|
BezierAsPwl(sb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void GCodeFileWriter::FinishAndCloseFile(void) {
|
|
|
|
SPolygon sp;
|
|
|
|
ZERO(&sp);
|
|
|
|
sel.AssemblePolygon(&sp, NULL);
|
|
|
|
|
|
|
|
int i;
|
|
|
|
for(i = 0; i < SS.gCode.passes; i++) {
|
|
|
|
double depth = (SS.gCode.depth / SS.gCode.passes)*(i+1);
|
|
|
|
|
|
|
|
SContour *sc;
|
|
|
|
for(sc = sp.l.First(); sc; sc = sp.l.NextAfter(sc)) {
|
|
|
|
if(sc->l.n < 2) continue;
|
|
|
|
|
|
|
|
SPoint *pt = sc->l.First();
|
|
|
|
fprintf(f, "G00 X%s Y%s\r\n",
|
|
|
|
SS.MmToString(pt->p.x), SS.MmToString(pt->p.y));
|
|
|
|
fprintf(f, "G01 Z%s F%s\r\n",
|
|
|
|
SS.MmToString(depth), SS.MmToString(SS.gCode.plungeFeed));
|
|
|
|
|
|
|
|
pt = sc->l.NextAfter(pt);
|
|
|
|
for(; pt; pt = sc->l.NextAfter(pt)) {
|
|
|
|
fprintf(f, "G01 X%s Y%s F%s\r\n",
|
|
|
|
SS.MmToString(pt->p.x), SS.MmToString(pt->p.y),
|
|
|
|
SS.MmToString(SS.gCode.feed));
|
|
|
|
}
|
|
|
|
// Move up to a clearance plane 5mm above the work.
|
2015-03-29 00:30:52 +00:00
|
|
|
fprintf(f, "G00 Z%s\r\n",
|
2010-01-14 04:47:17 +00:00
|
|
|
SS.MmToString(SS.gCode.depth < 0 ? +5 : -5));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sp.Clear();
|
|
|
|
sel.Clear();
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-07-08 09:44:13 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Routine for STEP output; just a wrapper around the general STEP stuff that
|
|
|
|
// can also be used for surfaces or 3d curves.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
void Step2dFileWriter::StartFile(void) {
|
|
|
|
ZERO(&sfw);
|
|
|
|
sfw.f = f;
|
|
|
|
sfw.WriteHeader();
|
|
|
|
}
|
|
|
|
|
|
|
|
void Step2dFileWriter::Triangle(STriangle *tr) {
|
|
|
|
}
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
void Step2dFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-10-30 10:38:34 +00:00
|
|
|
{
|
|
|
|
}
|
2015-07-10 11:54:39 +00:00
|
|
|
void Step2dFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,
|
|
|
|
bool filled, RgbaColor fillRgb)
|
2009-09-22 05:46:30 +00:00
|
|
|
{
|
2009-07-08 09:44:13 +00:00
|
|
|
}
|
|
|
|
|
2009-10-30 10:38:34 +00:00
|
|
|
void Step2dFileWriter::Bezier(SBezier *sb) {
|
2009-07-08 09:44:13 +00:00
|
|
|
int c = sfw.ExportCurve(sb);
|
|
|
|
sfw.curves.Add(&c);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Step2dFileWriter::FinishAndCloseFile(void) {
|
|
|
|
sfw.WriteWireframe();
|
|
|
|
sfw.WriteFooter();
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|