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

Rename the `plot.one_page_per_layer` option to avoid cconfusion. 

Now named `plot.all_layers_on_one_page` as @craftyjon suggested.
In this way a `1` means that all layers will be printed to the same page.
Fixes #5633
This commit is contained in:
Salvador E. Tropea 2020-10-21 17:23:28 -03:00 committed by Wayne Stambaugh
parent 36a139acb3
commit 61fb271957
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/pcbnew_printout.cpp
View File

@ -50,7 +50,7 @@ void PCBNEW_PRINTOUT_SETTINGS::Load( APP_SETTINGS_BASE* aConfig )
if( auto cfg = dynamic_cast<PCBNEW_SETTINGS*>( aConfig ) )
{
m_drillMarks = static_cast<DRILL_MARK_SHAPE_T>( cfg->m_Plot.pads_drill_mode );
m_pagination = static_cast<PAGINATION_T>( cfg->m_Plot.one_page_per_layer );
m_pagination = static_cast<PAGINATION_T>( cfg->m_Plot.all_layers_on_one_page );
m_mirror = cfg->m_Plot.mirror;
}
}
@ -62,9 +62,9 @@ void PCBNEW_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
if( auto cfg = dynamic_cast<PCBNEW_SETTINGS*>( aConfig ) )
{
cfg->m_Plot.pads_drill_mode = m_drillMarks;
cfg->m_Plot.one_page_per_layer = m_pagination;
cfg->m_Plot.mirror = m_mirror;
cfg->m_Plot.pads_drill_mode = m_drillMarks;
cfg->m_Plot.all_layers_on_one_page = m_pagination;
cfg->m_Plot.mirror = m_mirror;
}
}

6
pcbnew/pcbnew_settings.cpp
View File

@ -366,8 +366,8 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS()
m_params.emplace_back( new PARAM<bool>(
"place_file.include_board_edge", &m_PlaceFile.include_board_edge, false ) );
m_params.emplace_back( new PARAM<int>( "plot.one_page_per_layer",
&m_Plot.one_page_per_layer, 1 ) );
m_params.emplace_back( new PARAM<int>( "plot.all_layers_on_one_page",
&m_Plot.all_layers_on_one_page, 1 ) );
m_params.emplace_back(
new PARAM<int>( "plot.pads_drill_mode", &m_Plot.pads_drill_mode, 2 ) );
@ -656,7 +656,7 @@ bool PCBNEW_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
ret &= fromLegacy<int>( aCfg, "PlaceFileFormat", "place_file.file_format" );
ret &= fromLegacy<bool>( aCfg, "PlaceFileIncludeBrdEdge", "place_file.include_board_edge" );
ret &= fromLegacy<int>( aCfg, "PrintSinglePage", "plot.one_page_per_layer" );
ret &= fromLegacy<int>( aCfg, "PrintSinglePage", "plot.all_layers_on_one_page" );
ret &= fromLegacy<int>( aCfg, "PrintPadsDrillOpt", "plot.pads_drill_mode" );
ret &= fromLegacy<double>( aCfg, "PlotXFineScaleAdj", "plot.fine_scale_x" );
ret &= fromLegacy<double>( aCfg, "PlotYFineScaleAdj", "plot.fine_scale_y" );

2
pcbnew/pcbnew_settings.h
View File

@ -180,7 +180,7 @@ public:
struct DIALOG_PLOT
{
int one_page_per_layer;
int all_layers_on_one_page;
int pads_drill_mode;
double fine_scale_x;
double fine_scale_y;