diff --git a/pcbnew/import_gfx/dxf_import_plugin.h b/pcbnew/import_gfx/dxf_import_plugin.h index 6d3a88e444..dc2151741c 100644 --- a/pcbnew/import_gfx/dxf_import_plugin.h +++ b/pcbnew/import_gfx/dxf_import_plugin.h @@ -324,7 +324,7 @@ private: virtual void addDimDiametric( const DL_DimensionData&, const DL_DimDiametricData& ) override { ON_UNSUPPORTED( "addDimDiametric" ); } virtual void addDimAngular( const DL_DimensionData&, - const DL_DimAngularData& ) override { ON_UNSUPPORTED( "addDimAngular" ); } + const DL_DimAngular2LData& ) override { ON_UNSUPPORTED( "addDimAngular" ); } virtual void addDimAngular3P( const DL_DimensionData&, const DL_DimAngular3PData& ) override { ON_UNSUPPORTED( "addDimAngular3P" ); } virtual void addDimOrdinate( const DL_DimensionData&, diff --git a/thirdparty/dxflib_qcad/dl_creationadapter.h b/thirdparty/dxflib_qcad/dl_creationadapter.h index 326dbb5fcc..ebafcaa760 100644 --- a/thirdparty/dxflib_qcad/dl_creationadapter.h +++ b/thirdparty/dxflib_qcad/dl_creationadapter.h @@ -84,7 +84,7 @@ public: virtual void addDimDiametric( const DL_DimensionData&, const DL_DimDiametricData& ) override {} virtual void addDimAngular( const DL_DimensionData&, - const DL_DimAngularData& ) override {} + const DL_DimAngular2LData& ) override {} virtual void addDimAngular3P( const DL_DimensionData&, const DL_DimAngular3PData& ) override {} virtual void addDimOrdinate( const DL_DimensionData&, diff --git a/thirdparty/dxflib_qcad/dl_creationinterface.h b/thirdparty/dxflib_qcad/dl_creationinterface.h index 80eeacee73..61b346dd3d 100644 --- a/thirdparty/dxflib_qcad/dl_creationinterface.h +++ b/thirdparty/dxflib_qcad/dl_creationinterface.h @@ -196,7 +196,7 @@ public: * Called for every angular dimension (2 lines version) entity. */ virtual void addDimAngular( const DL_DimensionData& data, - const DL_DimAngularData& edata ) = 0; + const DL_DimAngular2LData& edata ) = 0; /** * Called for every angular dimension (3 points version) entity. diff --git a/thirdparty/dxflib_qcad/dl_dxf.cpp b/thirdparty/dxflib_qcad/dl_dxf.cpp index 99950e9adf..f902fc7360 100644 --- a/thirdparty/dxflib_qcad/dl_dxf.cpp +++ b/thirdparty/dxflib_qcad/dl_dxf.cpp @@ -2168,7 +2168,7 @@ void DL_Dxf::addDimAngular( DL_CreationInterface* creationInterface ) DL_DimensionData d = getDimData(); // angular dimension: - DL_DimAngularData da( + DL_DimAngular2LData da( // definition point 1 getRealValue( 13, 0.0 ), getRealValue( 23, 0.0 ), @@ -3806,9 +3806,9 @@ void DL_Dxf::writeDimDiametric( DL_WriterA& dw, * @param data Specific angular dimension data from the file * @param aAttrib Attributes */ -void DL_Dxf::writeDimAngular( DL_WriterA& dw, +void DL_Dxf::writeDimAngular2L( DL_WriterA& dw, const DL_DimensionData& data, - const DL_DimAngularData& edata, + const DL_DimAngular2LData& edata, const DL_Attributes& aAttrib ) { dw.entity( "DIMENSION" ); diff --git a/thirdparty/dxflib_qcad/dl_dxf.h b/thirdparty/dxflib_qcad/dl_dxf.h index 14e6dd0aec..2954cba7a3 100644 --- a/thirdparty/dxflib_qcad/dl_dxf.h +++ b/thirdparty/dxflib_qcad/dl_dxf.h @@ -293,9 +293,9 @@ public: const DL_DimensionData& data, const DL_DimDiametricData& edata, const DL_Attributes& attrib ); - void writeDimAngular( DL_WriterA& dw, + void writeDimAngular2L( DL_WriterA& dw, const DL_DimensionData& data, - const DL_DimAngularData& edata, + const DL_DimAngular2LData& edata, const DL_Attributes& attrib ); void writeDimAngular3P( DL_WriterA& dw, const DL_DimensionData& data, diff --git a/thirdparty/dxflib_qcad/dl_entities.h b/thirdparty/dxflib_qcad/dl_entities.h index 33bb56f515..a65ad3aa76 100644 --- a/thirdparty/dxflib_qcad/dl_entities.h +++ b/thirdparty/dxflib_qcad/dl_entities.h @@ -1402,13 +1402,13 @@ struct DXFLIB_EXPORT DL_DimDiametricData /** * Angular Dimension Data. */ -struct DXFLIB_EXPORT DL_DimAngularData +struct DXFLIB_EXPORT DL_DimAngular2LData { /** * Constructor. * Parameters: see member variables. */ - DL_DimAngularData( double ddpx1, double ddpy1, double ddpz1, + DL_DimAngular2LData( double ddpx1, double ddpy1, double ddpz1, double ddpx2, double ddpy2, double ddpz2, double ddpx3, double ddpy3, double ddpz3, double ddpx4, double ddpy4, double ddpz4 ) @@ -1430,7 +1430,7 @@ struct DXFLIB_EXPORT DL_DimAngularData dpz4 = ddpz4; } - /*! X Coordinate of definition point 1. */ + /*! X Coordinate of definition point 1. (extension line 1 end). */ double dpx1; /*! Y Coordinate of definition point 1. */ @@ -1439,7 +1439,7 @@ struct DXFLIB_EXPORT DL_DimAngularData /*! Z Coordinate of definition point 1. */ double dpz1; - /*! X Coordinate of definition point 2. */ + /*! X Coordinate of definition point 2. (extension line 2 end). */ double dpx2; /*! Y Coordinate of definition point 2. */ @@ -1448,7 +1448,7 @@ struct DXFLIB_EXPORT DL_DimAngularData /*! Z Coordinate of definition point 2. */ double dpz2; - /*! X Coordinate of definition point 3. */ + /*! X Coordinate of definition point 3. (center). */ double dpx3; /*! Y Coordinate of definition point 3. */