Remove duplicate source code

src/Mod/Path/libarea/CMakeLists.txt

@@ -8,8 +8,11 @@ if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4244)
 endif(MSVC)
 
-include_directories(${PYTHON_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(
+    ${PYTHON_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf
+)
 
 
 if(NOT FREECAD_USE_PYBIND11)
@@ -52,7 +55,6 @@ set(AREA_SRC_COMMON
     AreaPocket.cpp
     Circle.cpp
     Curve.cpp
-    dxf.cpp
     kurve/Construction.cpp
     kurve/Finite.cpp
     kurve/kurve.cpp
@@ -62,7 +64,7 @@ set(AREA_SRC_COMMON
 
 set(AREA_SRC_CLIPPER
     AreaClipper.cpp
-	Adaptive.cpp
+    Adaptive.cpp
     clipper.cpp
 )
 
@@ -150,7 +152,7 @@ else(MSVC)
     endif(BUILD_DYNAMIC_LINK_PYTHON)
 endif(MSVC)
 
-target_link_libraries(area-native ${area_native_LIBS})
+target_link_libraries(area-native ${area_native_LIBS} Import)
 SET_BIN_DIR(area-native area-native /Mod/Path)
 
 target_link_libraries(area area-native ${area_LIBS} ${area_native_LIBS})

src/Mod/Path/libarea/dxf.h

@@ -1,157 +0,0 @@
-// dxf.h
-// Copyright (c) 2009, Dan Heeks
-// This program is released under the BSD license. See the file COPYING for details.
-#pragma once
-
-#include <algorithm>
-#include <list>
-#include <vector>
-#include <map>
-#include <set>
-#include <string>
-#include <iosfwd>
-#include <cstdio>
-#include <cstring>
-#include <cmath>
-
-//Following is required to be defined on Ubuntu with OCC 6.3.1
-#ifndef HAVE_IOSTREAM
-#define HAVE_IOSTREAM
-#endif
-
-typedef int Aci_t; // AutoCAD color index
-
-typedef enum
-{
-	eUnspecified = 0,	// Unspecified (No units)
-	eInches,
-	eFeet,
-	eMiles,
-	eMillimeters,
-	eCentimeters,
-	eMeters,
-	eKilometers,
-	eMicroinches,
-	eMils,
-	eYards,
-	eAngstroms,
-	eNanometers,
-	eMicrons,
-	eDecimeters,
-	eDekameters,
-	eHectometers,
-	eGigameters,
-	eAstronomicalUnits,
-	eLightYears,
-	eParsecs
-} eDxfUnits_t;
-
-
-struct SplineData
-{
-	double norm[3];
-	int degree;
-	int knots;
-	int control_points;
-	int fit_points;
-	int flag;
-	std::list<double> starttanx;
-	std::list<double> starttany;
-	std::list<double> starttanz;
-	std::list<double> endtanx;
-	std::list<double> endtany;
-	std::list<double> endtanz;
-	std::list<double> knot;
-	std::list<double> weight;
-	std::list<double> controlx;
-	std::list<double> controly;
-	std::list<double> controlz;
-	std::list<double> fitx;
-	std::list<double> fity;
-	std::list<double> fitz;
-};
-
-class CDxfWrite{
-private:
-	std::ofstream* m_ofs;
-	bool m_fail;
-
-public:
-	CDxfWrite(const char* filepath);
-	~CDxfWrite();
-
-	bool Failed(){return m_fail;}
-
-	void WriteLine(const double* s, const double* e, const char* layer_name );
-	void WritePoint(const double*, const char*);
-	void WriteArc(const double* s, const double* e, const double* c, bool dir, const char* layer_name );
-    void WriteEllipse(const double* c, double major_radius, double minor_radius, double rotation, double start_angle, double end_angle, bool dir, const char* layer_name );
-	void WriteCircle(const double* c, double radius, const char* layer_name );
-};
-
-// derive a class from this and implement it's virtual functions
-class CDxfRead{
-private:
-	std::ifstream* m_ifs;
-
-	bool m_fail;
-	char m_str[1024];
-	char m_unused_line[1024];
-	eDxfUnits_t m_eUnits;
-	char m_layer_name[1024];
-	char m_section_name[1024];
-	char m_block_name[1024];
-	bool m_ignore_errors;
-
-
-	typedef std::map< std::string,Aci_t > LayerAciMap_t;
-	LayerAciMap_t m_layer_aci;  // layer names -> layer color aci map
-
-	bool ReadUnits();
-	bool ReadLayer();
-	bool ReadLine();
-	bool ReadText();
-	bool ReadArc();
-	bool ReadCircle();
-	bool ReadEllipse();
-	bool ReadPoint();
-	bool ReadSpline();
-	bool ReadLwPolyLine();
-	bool ReadPolyLine();
-	bool ReadVertex(double *pVertex, bool *bulge_found, double *bulge);
-	void OnReadArc(double start_angle, double end_angle, double radius, const double* c);
-	void OnReadCircle(const double* c, double radius);
-	void OnReadEllipse(const double* c, const double* m, double ratio, double start_angle, double end_angle);
-	bool ReadInsert();
-
-	void get_line();
-	void put_line(const char *value);
-	void DerefACI();
-
-protected:
-	Aci_t m_aci; // manifest color name or 256 for layer color
-
-public:
-	CDxfRead(const char* filepath); // this opens the file
-	virtual ~CDxfRead(); // this closes the file
-
-	bool Failed(){return m_fail;}
-	void DoRead(const bool ignore_errors = false); // this reads the file and calls the following functions
-
-	double mm( const double & value ) const;
-
-	bool IgnoreErrors() const { return(m_ignore_errors); }
-
-	virtual void OnReadLine(const double* /*s*/, const double* /*e*/){}
-	virtual void OnReadPoint(const double* /*s*/){}
-	virtual void OnReadText(const double* /*point*/, const double /*height*/, const char* /*text*/){}
-	virtual void OnReadArc(const double* /*s*/, const double* /*e*/, const double* /*c*/, bool /*dir*/){}
-	virtual void OnReadCircle(const double* /*s*/, const double* /*c*/, bool /*dir*/){}
-	virtual void OnReadEllipse(const double* /*c*/, double /*major_radius*/, double /*minor_radius*/, double /*rotation*/, double /*start_angle*/, double /*end_angle*/, bool /*dir*/){}
-	virtual void OnReadSpline(struct SplineData& /*sd*/){}
-	virtual void OnReadInsert(const double* /*point*/, const double* /*scale*/, const char* /*name*/, double /*rotation*/){}
-	virtual void AddGraphics() const { }
-
-	std::string LayerName() const;
-
-};