Draft - Allow to export Drawing pages to DXF - fixes #1686

* Uses DXF algos of the Drawing module instead of the Draft dxf library
* Uses a DXF template with the same name as the SVG template, if existing
* Only Draft, Arch, Part and Annotation views are currently supported
* Drawing module's projectToDXF() now returns only a fragment instead of a full DXF file

src/Mod/Drawing/App/ProjectionAlgos.cpp

@@ -273,113 +273,36 @@ std::string ProjectionAlgos::getDXF(ExtractionType type, double scale, double to
     std::stringstream result;
     DXFOutput output;
 
-    result << "0"          << endl
-        << "SECTION"  << endl
-
-        << "2"          << endl
-        << "ENTITIES" << endl;
-
     if (!H.IsNull() && (type & WithHidden)) {
         //float width = 0.15f/scale;
         BRepMesh_IncrementalMesh(H,tolerance);
-        result  //<< "<g"
-                //<< " id=\"" << ViewName << "\"" << endl
-                /*<< "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-                << "   stroke-linecap=\"butt\"" << endl
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   stroke-dasharray=\"5 3\"" << endl
-                << "   fill=\"none\"" << endl
-                << "  >" << endl*/
-                << output.exportEdges(H);
-                //<< "</g>" << endl;
+        result  << output.exportEdges(H);
     }
     if (!HO.IsNull() && (type & WithHidden)) {
         //float width = 0.15f/scale;
         BRepMesh_IncrementalMesh(HO,tolerance);
-        result  //<< "<g"
-                //<< " id=\"" << ViewName << "\"" << endl
-                /*<< "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-                << "   stroke-linecap=\"butt\"" << endl
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   stroke-dasharray=\"5 3\"" << endl
-                << "   fill=\"none\"" << endl
-                << "  >" << endl*/
-                << output.exportEdges(HO);
-                //<< "</g>" << endl;
+        result  << output.exportEdges(HO);
     }
     if (!VO.IsNull()) {
         //float width = 0.35f/scale;
         BRepMesh_IncrementalMesh(VO,tolerance);
-        result  //<< "<g"
-                //<< " id=\"" << ViewName << "\"" << endl
-
-                /*<< "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-                << "   stroke-linecap=\"butt\"" << endl
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   fill=\"none\"" << endl
-                << "  >" << endl*/
-
-                << output.exportEdges(VO);
-                //<< "</g>" << endl;
+        result  << output.exportEdges(VO);
     }
     if (!V.IsNull()) {
         //float width = 0.35f/scale;
         BRepMesh_IncrementalMesh(V,tolerance);
-        result  //<< "<g"
-                //<< " id=\"" << ViewName << "\"" << endl
-                /*<< "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-                << "   stroke-linecap=\"butt\"" << endl
-
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   fill=\"none\"" << endl
-                << "  >" << endl*/
-                << output.exportEdges(V);
-                //<< "</g>" << endl;
-
+        result  << output.exportEdges(V);
     }
     if (!V1.IsNull() && (type & WithSmooth)) {
         //float width = 0.35f/scale;
         BRepMesh_IncrementalMesh(V1,tolerance);
-        result  //<< "<g"
-
-                //<< " id=\"" << ViewName << "\"" << endl
-               /* << "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-                << "   stroke-linecap=\"butt\"" << endl
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   fill=\"none\"" << endl
-
-                << "  >" << endl*/
-                << output.exportEdges(V1);
-                //<< "</g>" << endl;
+        result  << output.exportEdges(V1);
     }
     if (!H1.IsNull() && (type & WithSmooth) && (type & WithHidden)) {
         //float width = 0.15f/scale;
         BRepMesh_IncrementalMesh(H1,tolerance);
-        result  //<< "<g"
-                //<< " id=\"" << ViewName << "\"" << endl
-                /*<< "   stroke=\"rgb(0, 0, 0)\"" << endl
-                << "   stroke-width=\"" << width << "\"" << endl
-
-                << "   stroke-linecap=\"butt\"" << endl
-                << "   stroke-linejoin=\"miter\"" << endl
-                << "   stroke-dasharray=\"5 3\"" << endl
-                << "   fill=\"none\"" << endl
-                << "  >" << endl*/
-
-                << output.exportEdges(H1);
-                //<< "</g>" << endl;
+        result  << output.exportEdges(H1);
     }
 
-
-    result      << 0          << endl
-                << "ENDSEC"   << endl
-                << 0          << endl
-                << "EOF";
-
     return result.str();
 }

src/Mod/Drawing/CMakeLists.txt

@@ -20,5 +20,7 @@ INSTALL(
         Templates
     DESTINATION
         ${CMAKE_INSTALL_DATADIR}/Mod/Drawing
-    FILES_MATCHING PATTERN "*.svg*"
+    FILES_MATCHING 
+        PATTERN "*.svg*"
+        PATTERN "*.dxf*"
 )