haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Python compatibility: move DXF_PLOTTER::DXF_UNITS to DXF_UNITS in pcb_plot_params.h 

Fixes #6034
https://gitlab.com/kicad/code/kicad/issues/6034
This commit is contained in:
jean-pierre charras 2020-10-21 18:29:53 +02:00
parent 909dca71cd
commit c87faad344
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/plotters/plotter_dxf.h
View File

@ -119,13 +119,6 @@ public:
void* aData = NULL ) override; void* aData = NULL ) override;
// Must be in the same order as the drop-down list in the plot dialog inside pcbnew
enum class DXF_UNITS
{
INCHES = 0,
MILLIMETERS = 1
};
/** /**
* Set the units to use for plotting the DXF file. * Set the units to use for plotting the DXF file.
* *

10
include/plotter.h
View File

@ -48,6 +48,16 @@ class GBR_NETLIST_METADATA;
using KIGFX::RENDER_SETTINGS; using KIGFX::RENDER_SETTINGS;
// Must be in the same order as the drop-down list in the plot dialog inside pcbnew
// Units (inch/mm for DXF plotter
enum class DXF_UNITS
{
INCHES = 0,
MILLIMETERS = 1
};
/** /**
* The set of supported output plot formats. * The set of supported output plot formats.
* *

4
pcbnew/dialogs/dialog_plot.cpp
View File

@ -196,7 +196,7 @@ void DIALOG_PLOT::init_Dialog()
m_DXF_plotTextStrokeFontOpt->SetValue( m_plotOpts.GetTextMode() == PLOT_TEXT_MODE::DEFAULT ); m_DXF_plotTextStrokeFontOpt->SetValue( m_plotOpts.GetTextMode() == PLOT_TEXT_MODE::DEFAULT );
// DXF units selection // DXF units selection
m_DXF_plotUnits->SetSelection( static_cast<int>( m_plotOpts.GetDXFPlotUnits() ) ); m_DXF_plotUnits->SetSelection( m_plotOpts.GetDXFPlotUnits() == DXF_UNITS::INCHES ? 0 : 1);
// Plot mirror option // Plot mirror option
m_plotMirrorOpt->SetValue( m_plotOpts.GetMirror() ); m_plotMirrorOpt->SetValue( m_plotOpts.GetMirror() );
@ -641,7 +641,7 @@ void DIALOG_PLOT::applyPlotSettings()
tempOptions.SetDXFPlotPolygonMode( m_DXF_plotModeOpt->GetValue() ); tempOptions.SetDXFPlotPolygonMode( m_DXF_plotModeOpt->GetValue() );
sel = m_DXF_plotUnits->GetSelection(); sel = m_DXF_plotUnits->GetSelection();
tempOptions.SetDXFPlotUnits( static_cast<DXF_PLOTTER::DXF_UNITS>( sel ) ); tempOptions.SetDXFPlotUnits( sel == 0 ? DXF_UNITS::INCHES : DXF_UNITS::MILLIMETERS );
tempOptions.SetPlotViaOnMaskLayer( m_plotNoViaOnMaskOpt->GetValue() ); tempOptions.SetPlotViaOnMaskLayer( m_plotNoViaOnMaskOpt->GetValue() );

4
pcbnew/exporters/gen_drill_report_files.cpp
View File

@ -160,9 +160,9 @@ bool GENDRILL_WRITER_BASE::genDrillMapFile( const wxString& aFullFileName, PLOT_
DXF_PLOTTER* dxf_plotter = new DXF_PLOTTER; DXF_PLOTTER* dxf_plotter = new DXF_PLOTTER;
if( m_unitsMetric ) if( m_unitsMetric )
dxf_plotter->SetUnits( DXF_PLOTTER::DXF_UNITS::MILLIMETERS ); dxf_plotter->SetUnits( DXF_UNITS::MILLIMETERS );
else else
dxf_plotter->SetUnits( DXF_PLOTTER::DXF_UNITS::INCHES ); dxf_plotter->SetUnits( DXF_UNITS::INCHES );
plotter = dxf_plotter; plotter = dxf_plotter;
plotter->SetPageSettings( page_info ); plotter->SetPageSettings( page_info );

2
pcbnew/pcb_plot_params.cpp
View File

@ -111,7 +111,7 @@ PCB_PLOT_PARAMS::PCB_PLOT_PARAMS()
m_plotViaOnMaskLayer = false; m_plotViaOnMaskLayer = false;
m_plotMode = FILLED; m_plotMode = FILLED;
m_DXFplotPolygonMode = true; m_DXFplotPolygonMode = true;
m_DXFplotUnits = DXF_PLOTTER::DXF_UNITS::INCHES; m_DXFplotUnits = DXF_UNITS::INCHES;
m_useAuxOrigin = false; m_useAuxOrigin = false;
m_HPGLPenNum = 1; m_HPGLPenNum = 1;
m_HPGLPenSpeed = 20; // this param is always in cm/s m_HPGLPenSpeed = 20; // this param is always in cm/s

6
pcbnew/pcb_plot_params.h
View File

@ -64,7 +64,7 @@ private:
/** /**
* DXF format: Units to use when plotting the DXF * DXF format: Units to use when plotting the DXF
*/ */
DXF_PLOTTER::DXF_UNITS m_DXFplotUnits; DXF_UNITS m_DXFplotUnits;
/// Plot format type (chooses the driver to be used) /// Plot format type (chooses the driver to be used)
PLOT_FORMAT m_format; PLOT_FORMAT m_format;
@ -229,12 +229,12 @@ public:
void SetDXFPlotPolygonMode( bool aFlag ) { m_DXFplotPolygonMode = aFlag; } void SetDXFPlotPolygonMode( bool aFlag ) { m_DXFplotPolygonMode = aFlag; }
bool GetDXFPlotPolygonMode() const { return m_DXFplotPolygonMode; } bool GetDXFPlotPolygonMode() const { return m_DXFplotPolygonMode; }
void SetDXFPlotUnits( DXF_PLOTTER::DXF_UNITS aUnit ) void SetDXFPlotUnits( DXF_UNITS aUnit )
{ {
m_DXFplotUnits = aUnit; m_DXFplotUnits = aUnit;
} }
DXF_PLOTTER::DXF_UNITS GetDXFPlotUnits() const DXF_UNITS GetDXFPlotUnits() const
{ {
return m_DXFplotUnits; return m_DXFplotUnits;
} }

3
pcbnew/plot_board_layers.cpp
View File

@ -1029,8 +1029,7 @@ PLOTTER* StartPlotBoard( BOARD *aBoard, PCB_PLOT_PARAMS *aPlotOpts, int aLayer,
case PLOT_FORMAT::DXF: case PLOT_FORMAT::DXF:
DXF_PLOTTER* DXF_plotter; DXF_PLOTTER* DXF_plotter;
DXF_plotter = new DXF_PLOTTER(); DXF_plotter = new DXF_PLOTTER();
DXF_plotter->SetUnits( DXF_plotter->SetUnits( aPlotOpts->GetDXFPlotUnits() );
static_cast<DXF_PLOTTER::DXF_UNITS>( aPlotOpts->GetDXFPlotUnits() ) );
plotter = DXF_plotter; plotter = DXF_plotter;
break; break;