Move zone fill check for plot to a checkbox option.

Fixes: lp:1712579
* https://bugs.launchpad.net/kicad/+bug/1712579
This commit is contained in:
Jeff Young
2018-05-08 00:22:45 +01:00
parent 5c5b74b29e
commit ad6956b05d
6 changed files with 139 additions and 150 deletions
+9 -16
View File
@@ -54,8 +54,7 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
// We use a sdbSizer here to get the order right, which is platform-dependent
m_sdbSizer1OK->SetLabel( _( "Plot" ) );
m_sdbSizer1Apply->SetLabel( _( "Draft Plot" ) );
m_sdbSizer1Apply->SetToolTip( _( "Plot without running zone fill checks." ) );
m_sdbSizer1Apply->SetLabel( _( "Generate Drill Files..." ) );
m_sdbSizer1Cancel->SetLabel( _( "Close" ) );
m_sdbSizer1OK->SetDefault();
@@ -74,6 +73,10 @@ void DIALOG_PLOT::init_Dialog()
m_config->Read( OPTKEY_PLOT_X_FINESCALE_ADJ, &m_XScaleAdjust );
m_config->Read( OPTKEY_PLOT_Y_FINESCALE_ADJ, &m_YScaleAdjust );
bool checkZones;
m_config->Read( OPTKEY_PLOT_CHECK_ZONES, &checkZones, true );
m_zoneFillCheck->SetValue( checkZones );
m_browseButton->SetBitmap( KiBitmap( browse_files_xpm ) );
// m_PSWidthAdjust is stored in mm in user config
@@ -679,6 +682,8 @@ void DIALOG_PLOT::applyPlotSettings()
ConfigBaseWriteDouble( m_config, OPTKEY_PLOT_Y_FINESCALE_ADJ, m_YScaleAdjust );
m_config->Write( OPTKEY_PLOT_CHECK_ZONES, m_zoneFillCheck->GetValue() );
// PS Width correction
msg = m_PSFineAdjustWidthOpt->GetValue();
int itmp = ValueFromString( g_UserUnit, msg );
@@ -761,19 +766,7 @@ void DIALOG_PLOT::OnGerberX2Checked( wxCommandEvent& event )
}
void DIALOG_PLOT::Plot( wxCommandEvent& )
{
doPlot( true );
}
void DIALOG_PLOT::DraftPlot( wxCommandEvent& )
{
doPlot( false );
}
void DIALOG_PLOT::doPlot( bool aCheckZones )
void DIALOG_PLOT::Plot( wxCommandEvent& event )
{
BOARD* board = m_parent->GetBoard();
@@ -802,7 +795,7 @@ void DIALOG_PLOT::doPlot( bool aCheckZones )
return;
}
if( aCheckZones )
if( m_zoneFillCheck->GetValue() )
m_parent->Check_All_Zones( this );
m_plotOpts.SetAutoScale( false );