suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applying tanderson's patch to replace invertY with (1,-1) scaling of SVG itself. Commented out invertY as no longer used.

Browse Source
This commit is contained in:
j-dowsett 2014-01-10 11:31:14 +00:00
parent 270d25658d
commit c1a2348e33
3 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Drawing/App/FeatureViewPart.cpp
View File

@ -194,7 +194,7 @@ App::DocumentObjectExecReturn *FeatureViewPart::execute(void)
bool smooth = ShowSmoothLines.getValue(); bool smooth = ShowSmoothLines.getValue();
try { try {
ProjectionAlgos Alg(ProjectionAlgos::invertY(shape),Dir); ProjectionAlgos Alg(shape,Dir);
result << "<g" result << "<g"
<< " id=\"" << ViewName << "\"" << endl << " id=\"" << ViewName << "\"" << endl
<< " transform=\"rotate("<< Rotation.getValue() << ","<< X.getValue()<<","<<Y.getValue()<<") translate("<< X.getValue()<<","<<Y.getValue()<<") scale("<< Scale.getValue()<<","<<Scale.getValue()<<")\"" << endl << " transform=\"rotate("<< Rotation.getValue() << ","<< X.getValue()<<","<<Y.getValue()<<") translate("<< X.getValue()<<","<<Y.getValue()<<") scale("<< Scale.getValue()<<","<<Scale.getValue()<<")\"" << endl

66
src/Mod/Drawing/App/ProjectionAlgos.cpp
View File

@ -90,7 +90,7 @@ using namespace std;
ProjectionAlgos::ProjectionAlgos(const TopoDS_Shape &Input, const Base::Vector3d &Dir) ProjectionAlgos::ProjectionAlgos(const TopoDS_Shape &Input, const Base::Vector3d &Dir)
: Input(Input), Direction(Dir) : Input(Input), Direction(Dir)
{ {
execute(); execute();
@ -99,6 +99,13 @@ ProjectionAlgos::ProjectionAlgos(const TopoDS_Shape &Input, const Base::Vector3d
ProjectionAlgos::~ProjectionAlgos() ProjectionAlgos::~ProjectionAlgos()
{ {
} }
/*
// no longer used, replaced invertY by adding
// << " transform=\"scale(1,-1)\"" << endl
// to getSVG(...) below.
// invertY, as here, wasn't right for intended purpose - always reflected in model Y direction rather
// than SVG projection Y direction. Also better to reflect about (0,0,0) rather than bbox centre
TopoDS_Shape ProjectionAlgos::invertY(const TopoDS_Shape& shape) TopoDS_Shape ProjectionAlgos::invertY(const TopoDS_Shape& shape)
{ {
@ -113,6 +120,7 @@ TopoDS_Shape ProjectionAlgos::invertY(const TopoDS_Shape& shape)
BRepBuilderAPI_Transform mkTrf(shape, mat); BRepBuilderAPI_Transform mkTrf(shape, mat);
return mkTrf.Shape(); return mkTrf.Shape();
} }
*/
void ProjectionAlgos::execute(void) void ProjectionAlgos::execute(void)
{ {
@ -154,14 +162,15 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!H.IsNull() && (type & WithHidden)) { if (!H.IsNull() && (type & WithHidden)) {
double width = hiddenscale; double width = hiddenscale;
BRepMesh::Mesh(H,tolerance); BRepMesh::Mesh(H,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " stroke-dasharray=\"0.2,0.1\"" << endl << " stroke-dasharray=\"0.2,0.1\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(H) << output.exportEdges(H)
<< "</g>" << endl; << "</g>" << endl;
@ -169,14 +178,15 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!HO.IsNull() && (type & WithHidden)) { if (!HO.IsNull() && (type & WithHidden)) {
double width = hiddenscale; double width = hiddenscale;
BRepMesh::Mesh(HO,tolerance); BRepMesh::Mesh(HO,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " stroke-dasharray=\"0.02,0.1\"" << endl << " stroke-dasharray=\"0.02,0.1\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(HO) << output.exportEdges(HO)
<< "</g>" << endl; << "</g>" << endl;
@ -184,13 +194,14 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!VO.IsNull()) { if (!VO.IsNull()) {
double width = scale; double width = scale;
BRepMesh::Mesh(VO,tolerance); BRepMesh::Mesh(VO,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(VO) << output.exportEdges(VO)
<< "</g>" << endl; << "</g>" << endl;
@ -198,13 +209,14 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!V.IsNull()) { if (!V.IsNull()) {
double width = scale; double width = scale;
BRepMesh::Mesh(V,tolerance); BRepMesh::Mesh(V,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(V) << output.exportEdges(V)
<< "</g>" << endl; << "</g>" << endl;
@ -212,13 +224,14 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!V1.IsNull() && (type & WithSmooth)) { if (!V1.IsNull() && (type & WithSmooth)) {
double width = scale; double width = scale;
BRepMesh::Mesh(V1,tolerance); BRepMesh::Mesh(V1,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(V1) << output.exportEdges(V1)
<< "</g>" << endl; << "</g>" << endl;
@ -226,14 +239,15 @@ std::string ProjectionAlgos::getSVG(ExtractionType type, double scale, double to
if (!H1.IsNull() && (type & WithSmooth) && (type & WithHidden)) { if (!H1.IsNull() && (type & WithSmooth) && (type & WithHidden)) {
double width = hiddenscale; double width = hiddenscale;
BRepMesh::Mesh(H1,tolerance); BRepMesh::Mesh(H1,tolerance);
result << "<g" result << "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
<< " stroke=\"rgb(0, 0, 0)\"" << endl << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
<< " stroke-dasharray=\"0.09,0.05\"" << endl << " stroke-dasharray=\"0.09,0.05\"" << endl
<< " fill=\"none\"" << endl << " fill=\"none\"" << endl
<< " transform=\"scale(1,-1)\"" << endl
<< " >" << endl << " >" << endl
<< output.exportEdges(H1) << output.exportEdges(H1)
<< "</g>" << endl; << "</g>" << endl;
@ -247,7 +261,7 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
{ {
std::stringstream result; std::stringstream result;
DXFOutput output; DXFOutput output;
result << "0" << endl result << "0" << endl
<< "SECTION" << endl << "SECTION" << endl
@ -257,9 +271,9 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!H.IsNull() && (type & WithHidden)) { if (!H.IsNull() && (type & WithHidden)) {
//float width = 0.15f/scale; //float width = 0.15f/scale;
BRepMesh::Mesh(H,tolerance); BRepMesh::Mesh(H,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/*<< " stroke=\"rgb(0, 0, 0)\"" << endl /*<< " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
@ -272,9 +286,9 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!HO.IsNull() && (type & WithHidden)) { if (!HO.IsNull() && (type & WithHidden)) {
//float width = 0.15f/scale; //float width = 0.15f/scale;
BRepMesh::Mesh(HO,tolerance); BRepMesh::Mesh(HO,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/*<< " stroke=\"rgb(0, 0, 0)\"" << endl /*<< " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
@ -287,10 +301,10 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!VO.IsNull()) { if (!VO.IsNull()) {
//float width = 0.35f/scale; //float width = 0.35f/scale;
BRepMesh::Mesh(VO,tolerance); BRepMesh::Mesh(VO,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/*<< " stroke=\"rgb(0, 0, 0)\"" << endl /*<< " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
@ -303,9 +317,9 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!V.IsNull()) { if (!V.IsNull()) {
//float width = 0.35f/scale; //float width = 0.35f/scale;
BRepMesh::Mesh(V,tolerance); BRepMesh::Mesh(V,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/*<< " stroke=\"rgb(0, 0, 0)\"" << endl /*<< " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
@ -319,10 +333,10 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!V1.IsNull() && (type & WithSmooth)) { if (!V1.IsNull() && (type & WithSmooth)) {
//float width = 0.35f/scale; //float width = 0.35f/scale;
BRepMesh::Mesh(V1,tolerance); BRepMesh::Mesh(V1,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/* << " stroke=\"rgb(0, 0, 0)\"" << endl /* << " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl
<< " stroke-linejoin=\"miter\"" << endl << " stroke-linejoin=\"miter\"" << endl
@ -335,9 +349,9 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
if (!H1.IsNull() && (type & WithSmooth) && (type & WithHidden)) { if (!H1.IsNull() && (type & WithSmooth) && (type & WithHidden)) {
//float width = 0.15f/scale; //float width = 0.15f/scale;
BRepMesh::Mesh(H1,tolerance); BRepMesh::Mesh(H1,tolerance);
result //<< "<g" result //<< "<g"
//<< " id=\"" << ViewName << "\"" << endl //<< " id=\"" << ViewName << "\"" << endl
/*<< " stroke=\"rgb(0, 0, 0)\"" << endl /*<< " stroke=\"rgb(0, 0, 0)\"" << endl
<< " stroke-width=\"" << width << "\"" << endl << " stroke-width=\"" << width << "\"" << endl
<< " stroke-linecap=\"butt\"" << endl << " stroke-linecap=\"butt\"" << endl

4
src/Mod/Drawing/App/ProjectionAlgos.h
View File

@ -43,9 +43,9 @@ public:
virtual ~ProjectionAlgos(); virtual ~ProjectionAlgos();
void execute(void); void execute(void);
static TopoDS_Shape invertY(const TopoDS_Shape&); // static TopoDS_Shape invertY(const TopoDS_Shape&);
enum ExtractionType { enum ExtractionType {
Plain = 0, Plain = 0,
WithHidden = 1, WithHidden = 1,
WithSmooth = 2 WithSmooth = 2