caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DXF: refactor.

Browse Source
This commit is contained in:
EvilSpirit 2016-03-21 17:11:41 +06:00 committed by whitequark
parent f88cb1195b
commit 27b403faf5
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/exportvector.cpp
View File

@ -19,8 +19,6 @@ VectorFileWriter::~VectorFileWriter() {
class DxfWriteInterface : public DRW_Interface { class DxfWriteInterface : public DRW_Interface {
DxfFileWriter *writer; DxfFileWriter *writer;
dxfRW *dxf; dxfRW *dxf;
int currentColor;
double currentWidth;
static DRW_Coord toCoord(const Vector &v) { static DRW_Coord toCoord(const Vector &v) {
return DRW_Coord(v.x, v.y, v.z); return DRW_Coord(v.x, v.y, v.z);
@ -132,8 +130,6 @@ public:
virtual void writeEntities() { virtual void writeEntities() {
for(DxfFileWriter::BezierPath &path : writer->paths) { for(DxfFileWriter::BezierPath &path : writer->paths) {
currentColor = path.color;
currentWidth = path.width;
for(SBezier *sb : path.beziers) { for(SBezier *sb : path.beziers) {
writeBezier(sb); writeBezier(sb);
} }
@ -245,32 +241,31 @@ public:
} }
} }
void assignEntityDefaults(DRW_Entity *entity, const SBezier &sb) { void assignEntityDefaults(DRW_Entity *entity, uint32_t style) {
hStyle hs = { (uint32_t)sb.auxA }; hStyle hs = { style };
Style *s = Style::Get(hs); Style *s = Style::Get(hs);
entity->color24 = currentColor; entity->color24 = s->Color(hs, true).ToPackedIntBGRA();
entity->layer = s->DescriptionString(); entity->layer = s->DescriptionString();
entity->lineType = lineTypeName(s->stippleType); entity->lineType = lineTypeName(s->stippleType);
entity->ltypeScale = Style::StippleScaleMm(s->h); entity->ltypeScale = Style::StippleScaleMm(s->h);
entity->setWidthMm(Style::WidthMm(hs.v));
if(currentWidth > 0.0) entity->setWidthMm(currentWidth);
} }
void assignDimensionDefaults(DRW_Dimension *dimension) { void assignDimensionDefaults(DRW_Dimension *dimension) {
dimension->layer = "dimensions"; dimension->layer = "dimensions";
} }
void writeLine(const Vector &p0, const Vector &p1, const SBezier &sb) { void writeLine(const Vector &p0, const Vector &p1, uint32_t style) {
DRW_Line line; DRW_Line line;
assignEntityDefaults(&line, sb); assignEntityDefaults(&line, style);
line.basePoint = toCoord(p0); line.basePoint = toCoord(p0);
line.secPoint = toCoord(p1); line.secPoint = toCoord(p1);
dxf->writeLine(&line); dxf->writeLine(&line);
} }
void writeArc(const Vector &c, double r, double sa, double ea, const SBezier &sb) { void writeArc(const Vector &c, double r, double sa, double ea, uint32_t style) {
DRW_Arc arc; DRW_Arc arc;
assignEntityDefaults(&arc, sb); assignEntityDefaults(&arc, style);
arc.radious = r; arc.radious = r;
arc.basePoint = toCoord(c); arc.basePoint = toCoord(c);
arc.staangle = sa; arc.staangle = sa;
@ -282,7 +277,7 @@ public:
List<Vector> lv = {}; List<Vector> lv = {};
sb->MakePwlInto(&lv, SS.ExportChordTolMm()); sb->MakePwlInto(&lv, SS.ExportChordTolMm());
DRW_LWPolyline polyline; DRW_LWPolyline polyline;
assignEntityDefaults(&polyline, *sb); assignEntityDefaults(&polyline, sb->auxA);
for(int i = 0; i < lv.n; i++) { for(int i = 0; i < lv.n; i++) {
Vector *v = &lv.elem[i]; Vector *v = &lv.elem[i];
DRW_Vertex2D *vertex = new DRW_Vertex2D(); DRW_Vertex2D *vertex = new DRW_Vertex2D();
@ -322,7 +317,7 @@ public:
void writeSpline(SBezier *sb) { void writeSpline(SBezier *sb) {
bool isRational = sb->IsRational(); bool isRational = sb->IsRational();
DRW_Spline spline; DRW_Spline spline;
assignEntityDefaults(&spline, *sb); assignEntityDefaults(&spline, sb->auxA);
spline.flags = (isRational) ? 0x04 : 0x08; spline.flags = (isRational) ? 0x04 : 0x08;
spline.degree = sb->deg; spline.degree = sb->deg;
spline.ncontrol = sb->deg + 1; spline.ncontrol = sb->deg + 1;
@ -341,7 +336,7 @@ public:
if(sb->deg == 1) { if(sb->deg == 1) {
// Line // Line
writeLine(sb->ctrl[0], sb->ctrl[1], *sb); writeLine(sb->ctrl[0], sb->ctrl[1], sb->auxA);
} else if(sb->IsInPlane(n, 0) && sb->IsCircle(n, &c, &r)) { } else if(sb->IsInPlane(n, 0) && sb->IsCircle(n, &c, &r)) {
// Circle perpendicular to camera // Circle perpendicular to camera
double theta0 = atan2(sb->ctrl[0].y - c.y, sb->ctrl[0].x - c.x); double theta0 = atan2(sb->ctrl[0].y - c.y, sb->ctrl[0].x - c.x);
@ -349,7 +344,7 @@ public:
double dtheta = WRAP_SYMMETRIC(theta1 - theta0, 2.0 * PI); double dtheta = WRAP_SYMMETRIC(theta1 - theta0, 2.0 * PI);
if(dtheta < 0.0) swap(theta0, theta1); if(dtheta < 0.0) swap(theta0, theta1);
writeArc(c, r, theta0, theta1, *sb); writeArc(c, r, theta0, theta1, sb->auxA);
} else if(sb->IsRational()) { } else if(sb->IsRational()) {
// Rational bezier // Rational bezier
// We'd like to export rational beziers exactly, but the resulting DXF // We'd like to export rational beziers exactly, but the resulting DXF
@ -464,8 +459,6 @@ void DxfFileWriter::StartPath(RgbaColor strokeRgb, double lineWidth,
bool filled, RgbaColor fillRgb, uint32_t style) bool filled, RgbaColor fillRgb, uint32_t style)
{ {
BezierPath path = {}; BezierPath path = {};
path.color = strokeRgb.ToPackedIntBGRA();
path.width = lineWidth;
paths.push_back(path); paths.push_back(path);
} }
void DxfFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth, void DxfFileWriter::FinishPath(RgbaColor strokeRgb, double lineWidth,

2
src/solvespace.h
View File

@ -535,8 +535,6 @@ class DxfFileWriter : public VectorFileWriter {
public: public:
struct BezierPath { struct BezierPath {
std::vector<SBezier *> beziers; std::vector<SBezier *> beziers;
int color;
double width;
}; };
std::vector<BezierPath> paths; std::vector<BezierPath> paths;