electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a collision with a Windows define and our use of the same var name.

Browse Source 
We use IN for INCH as units, but IN is defined in a Windows header
This commit is contained in:
jean-pierre charras
2025-03-02 11:34:30 +01:00
parent 307798ac92
commit eaa1e6d594
65 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/pcb_plot_params.cpp
+3 -3
View File
@@ -105,7 +105,7 @@ PCB_PLOT_PARAMS::PCB_PLOT_PARAMS()
m_plotDrawingSheet = false;
m_plotMode = FILLED;
m_DXFPolygonMode = true;
m_DXFUnits = DXF_UNITS::IN;
m_DXFUnits = DXF_UNITS::INCH;
m_useAuxOrigin = false;
m_HPGLPenNum = 1;
m_HPGLPenSpeed = 20; // this param is always in cm/s
@@ -219,7 +219,7 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter ) const
// DXF options
KICAD_FORMAT::FormatBool( aFormatter, getTokenName( T_dxfpolygonmode ), m_DXFPolygonMode );
KICAD_FORMAT::FormatBool( aFormatter, getTokenName( T_dxfimperialunits ),
m_DXFUnits == DXF_UNITS::IN );
m_DXFUnits == DXF_UNITS::INCH );
KICAD_FORMAT::FormatBool( aFormatter, getTokenName( T_dxfusepcbnewfont ),
m_textMode != PLOT_TEXT_MODE::NATIVE );
@@ -776,7 +776,7 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams )
break;
case T_dxfimperialunits:
aPcbPlotParams->m_DXFUnits = parseBool() ? DXF_UNITS::IN : DXF_UNITS::MM;
aPcbPlotParams->m_DXFUnits = parseBool() ? DXF_UNITS::INCH : DXF_UNITS::MM;
break;
case T_dxfusepcbnewfont: