pcbnew: Clean up warnings with unit handling in the DXF export

(cherry picked from commit ff9d899ae0)
This commit is contained in:
Ian McInerney
2019-07-10 12:42:54 -04:00
committed by Wayne Stambaugh
parent 09d7d0f1bc
commit 40ba502853
6 changed files with 18 additions and 24 deletions
+8 -8
View File
@@ -1256,7 +1256,7 @@ public:
textAsLines = true;
m_currentColor = COLOR4D::BLACK;
m_currentLineType = 0;
SetUnits( DXF_PLOTTER::INCHES );
SetUnits( DXF_PLOTTER::DXF_UNIT_INCHES );
}
virtual PlotFormat GetPlotterType() const override
@@ -1340,11 +1340,11 @@ public:
void* aData = NULL ) override;
// Should be the same order as in the PCB_PLOT_PARAMS class
enum Units
// Must be in the same order as the drop-down list in the plot dialog inside pcbnew
enum DXF_UNITS
{
INCHES = 0,
MILIMETERS = 1
DXF_UNIT_INCHES = 0,
DXF_UNIT_MILLIMETERS = 1
};
/**
@@ -1352,14 +1352,14 @@ public:
*
* @param aUnit - The units to use
*/
void SetUnits( Units aUnit );
void SetUnits( DXF_UNITS aUnit );
/**
* The units currently enabled for plotting
*
* @return The currently configured units
*/
Units GetUnits() const
DXF_UNITS GetUnits() const
{
return m_plotUnits;
}
@@ -1390,7 +1390,7 @@ protected:
COLOR4D m_currentColor;
int m_currentLineType;
Units m_plotUnits;
DXF_UNITS m_plotUnits;
double m_unitScalingFactor;
unsigned int m_measurementDirective;
};