Export contours in DXF

Author: phma

Diff for: TODO

@@ -15,7 +15,7 @@ Before 0.5.0:
 
 Before 1.0.0:
 •Draw contours, removing wiggles as long as they don't violate the accuracy requirement ✓
-•Export contours in DXF
+•Export contours in DXF ✓
 
 Whenever:
 •Color the triangles of the TIN in PLY format to show which triangles are empty, even if empty triangles are exported, and which have dots out of tolerance (Points, not triangles, are colored in 0.5.1, and it does not indicate dots out of tolerance.)

Diff for: dxf.cpp

@@ -668,7 +668,6 @@ void insertTriangle(vector<GroupCode> &dxfData,triangle &tri,double outUnit)
   colorNumber.integer=0;
   dxfData.push_back(entityType);
   dxfData.push_back(layerName);
-  dxfData.push_back(colorNumber);
   insertXyz(dxfData,10,*tri.a/outUnit);
   insertXyz(dxfData,11,*tri.b/outUnit);
   insertXyz(dxfData,12,*tri.c/outUnit); // A 3DFACE always has four corners. That it's a
@@ -686,10 +685,9 @@ void insertPolyline(vector<GroupCode> &dxfData,polyline &poly,DxfLayer &lay,doub
   colorNumber.integer=0;
   closedFlag.integer=!poly.isopen();
   nVertices.integer=poly.size()+poly.isopen();
-  elev.real=poly.getElevation();
+  elev.real=poly.getElevation()/outUnit;
   dxfData.push_back(entityType);
   dxfData.push_back(layerName);
-  dxfData.push_back(colorNumber);
   dxfData.push_back(nVertices);
   dxfData.push_back(closedFlag);
   dxfData.push_back(elev);

Diff for: dxf.h

@@ -89,3 +89,4 @@ void openEntitySection(std::vector<GroupCode> &dxfData);
 void closeEntitySection(std::vector<GroupCode> &dxfData);
 void dxfEnd(std::vector<GroupCode> &dxfData);
 void insertTriangle(std::vector<GroupCode> &dxfData,triangle &tri,double outUnit);
+void insertPolyline(std::vector<GroupCode> &dxfData,polyline &poly,DxfLayer &lay,double outUnit);

Diff for: fileio.cpp

@@ -337,9 +337,11 @@ void writeDxf(string outputFile,bool asc,double outUnit,int flags)
   vector<GroupCode> dxfCodes;
   vector<DxfLayer> dxfLayers;
   map<ContourLayer,int> contourLayers;
-  int i;
+  int i,n;
   map<ContourLayer,int>::iterator j;
+  map<ContourInterval,vector<polyspiral> >::iterator k;
   DxfLayer layer;
+  ContourLayer cl;
   BoundRect br;
   ofstream dxfFile(outputFile,ofstream::binary|ofstream::trunc);
   br.include(&net);
@@ -370,6 +372,17 @@ void writeDxf(string outputFile,bool asc,double outUnit,int flags)
       else;
     else
       cerr<<"Invalid triangle "<<i<<endl;
+  for (k=net.contours.begin();k!=net.contours.end();++k)
+  {
+    cl.ci=k->first;
+    for (i=0;i<k->second.size();i++)
+    {
+      cl.tp=cl.ci.contourType(k->second[i].getElevation());
+      n=contourLayers[cl]-1;
+      layer=dxfLayers[n];
+      insertPolyline(dxfCodes,k->second[i],layer,outUnit);
+    }
+  }
   closeEntitySection(dxfCodes);
   dxfEnd(dxfCodes);
   writeDxfGroups(dxfFile,dxfCodes,asc);