realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

pcb plots dont need LOCALE_IO anymore

Browse Source
This commit is contained in:
Mark Roszko 2025-08-27 20:44:16 -04:00
parent 4f32146f9a
commit 3e019ee4ae
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/pcbnew_jobs_handler.cpp
View File

@ -1126,9 +1126,6 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
sheetPath = pdfJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); sheetPath = pdfJob->GetVarOverrides().at( wxT( "SHEETPATH" ) );
} }
LOCALE_IO dummy;
if( !pcbPlotter.Plot( outPath, pdfJob->m_plotLayerSequence, if( !pcbPlotter.Plot( outPath, pdfJob->m_plotLayerSequence,
pdfJob->m_plotOnAllLayersSequence, false, plotAllLayersOneFile, pdfJob->m_plotOnAllLayersSequence, false, plotAllLayersOneFile,
layerName, sheetName, sheetPath ) ) layerName, sheetName, sheetPath ) )
@ -1222,8 +1219,6 @@ int PCBNEW_JOBS_HANDLER::JobExportPs( JOB* aJob )
sheetPath = psJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); sheetPath = psJob->GetVarOverrides().at( wxT( "SHEETPATH" ) );
} }
LOCALE_IO dummy;
if( !pcbPlotter.Plot( outPath, psJob->m_plotLayerSequence, psJob->m_plotOnAllLayersSequence, false, isSingle, if( !pcbPlotter.Plot( outPath, psJob->m_plotLayerSequence, psJob->m_plotOnAllLayersSequence, false, isSingle,
layerName, sheetName, sheetPath ) ) layerName, sheetName, sheetPath ) )
{ {
@ -1371,17 +1366,14 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
// We are feeding it one layer at the start here to silence a logic check // We are feeding it one layer at the start here to silence a logic check
GERBER_PLOTTER* plotter; GERBER_PLOTTER* plotter;
{ plotter = (GERBER_PLOTTER*) StartPlotBoard( brd, &plotOpts, layer, layerName,
LOCALE_IO dummy; fn.GetFullPath(), sheetName, sheetPath );
plotter = (GERBER_PLOTTER*) StartPlotBoard( brd, &plotOpts, layer, layerName,
fn.GetFullPath(), sheetName, sheetPath );
}
if( plotter ) if( plotter )
{ {
m_reporter->Report( wxString::Format( _( "Plotted to '%s'.\n" ), fn.GetFullPath() ), m_reporter->Report( wxString::Format( _( "Plotted to '%s'.\n" ), fn.GetFullPath() ),
RPT_SEVERITY_ACTION ); RPT_SEVERITY_ACTION );
LOCALE_IO dummy;
PlotBoardLayers( brd, plotter, plotSequence, plotOpts ); PlotBoardLayers( brd, plotter, plotSequence, plotOpts );
plotter->EndPlot(); plotter->EndPlot();
} }

8
pcbnew/pcbplot.cpp
View File

@ -404,8 +404,6 @@ PLOT_CONTROLLER::~PLOT_CONTROLLER()
*/ */
void PLOT_CONTROLLER::ClosePlot() void PLOT_CONTROLLER::ClosePlot()
{ {
LOCALE_IO toggle;
if( m_plotter ) if( m_plotter )
{ {
m_plotter->EndPlot(); m_plotter->EndPlot();
@ -421,8 +419,6 @@ void PLOT_CONTROLLER::ClosePlot()
bool PLOT_CONTROLLER::OpenPlotfile( const wxString& aSuffix, PLOT_FORMAT aFormat, bool PLOT_CONTROLLER::OpenPlotfile( const wxString& aSuffix, PLOT_FORMAT aFormat,
const wxString& aSheetName, const wxString& aSheetPath ) const wxString& aSheetName, const wxString& aSheetPath )
{ {
LOCALE_IO toggle;
// Save the current format: sadly some plot routines depends on this but the main reason // Save the current format: sadly some plot routines depends on this but the main reason
// is that the StartPlot method uses it to dispatch the plotter creation // is that the StartPlot method uses it to dispatch the plotter creation
GetPlotOptions().SetFormat( aFormat ); GetPlotOptions().SetFormat( aFormat );
@ -477,8 +473,6 @@ bool PLOT_CONTROLLER::OpenPlotfile( const wxString& aSuffix, PLOT_FORMAT aFormat
bool PLOT_CONTROLLER::PlotLayer() bool PLOT_CONTROLLER::PlotLayer()
{ {
LOCALE_IO toggle;
// No plot open, nothing to do... // No plot open, nothing to do...
if( !m_plotter ) if( !m_plotter )
return false; return false;
@ -501,8 +495,6 @@ bool PLOT_CONTROLLER::PlotLayer()
bool PLOT_CONTROLLER::PlotLayers( const LSEQ& aLayerSequence ) bool PLOT_CONTROLLER::PlotLayers( const LSEQ& aLayerSequence )
{ {
LOCALE_IO toggle;
// No plot open, nothing to do... // No plot open, nothing to do...
if( !m_plotter ) if( !m_plotter )
return false; return false;