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

Eeschema: use worksheet color when plotting 

Fixes: lp:1825568
* https://bugs.launchpad.net/kicad/+bug/1825568

(cherry picked from commit e35be13b23)
This commit is contained in:
Jon Evans 2019-05-26 12:20:54 -04:00
parent 15cf25a6fc
commit b40289c1bd
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/plotters/common_plot_functions.cpp
View File

@ -53,13 +53,17 @@ wxString GetDefaultPlotExtension( PlotFormat aFormat )
void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
const PAGE_INFO& aPageInfo, int aSheetNumber, int aNumberOfSheets, const PAGE_INFO& aPageInfo, int aSheetNumber, int aNumberOfSheets,
const wxString &aSheetDesc, const wxString &aFilename ) const wxString &aSheetDesc, const wxString &aFilename, const COLOR4D aColor )
{ {
/* Note: Page sizes values are given in mils /* Note: Page sizes values are given in mils
*/ */
double iusPerMil = plotter->GetIUsPerDecimil() * 10.0; double iusPerMil = plotter->GetIUsPerDecimil() * 10.0;
COLOR4D plotColor = plotter->GetColorMode() ? COLOR4D( RED ) : COLOR4D::BLACK; COLOR4D plotColor = plotter->GetColorMode() ? aColor : COLOR4D::BLACK;
if( plotColor == COLOR4D::UNSPECIFIED )
plotColor = COLOR4D( RED );
plotter->SetColor( plotColor ); plotter->SetColor( plotColor );
WS_DRAW_ITEM_LIST drawList; WS_DRAW_ITEM_LIST drawList;

3
eeschema/plot_schematic_DXF.cpp
View File

@ -136,7 +136,8 @@ bool DIALOG_PLOT_SCHEMATIC::PlotOneSheetDXF( const wxString& aFileName,
m_parent->GetPageSettings(), m_parent->GetPageSettings(),
aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens,
m_parent->GetScreenDesc(), m_parent->GetScreenDesc(),
aScreen->GetFileName() ); aScreen->GetFileName(),
GetLayerColor( ( SCH_LAYER_ID )LAYER_WORKSHEET ) );
} }
aScreen->Plot( plotter ); aScreen->Plot( plotter );

3
eeschema/plot_schematic_HPGL.cpp
View File

@ -208,7 +208,8 @@ bool DIALOG_PLOT_SCHEMATIC::Plot_1_Page_HPGL( const wxString& aFileName,
m_parent->GetPageSettings(), m_parent->GetPageSettings(),
aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens,
m_parent->GetScreenDesc(), m_parent->GetScreenDesc(),
aScreen->GetFileName() ); aScreen->GetFileName(),
GetLayerColor( ( SCH_LAYER_ID )LAYER_WORKSHEET ) );
aScreen->Plot( plotter ); aScreen->Plot( plotter );

4
eeschema/plot_schematic_PDF.cpp
View File

@ -31,6 +31,7 @@
#include <base_units.h> #include <base_units.h>
#include <sch_sheet_path.h> #include <sch_sheet_path.h>
#include <project.h> #include <project.h>
#include <general.h>
#include <reporter.h> #include <reporter.h>
@ -153,7 +154,8 @@ void DIALOG_PLOT_SCHEMATIC::plotOneSheetPDF( PLOTTER* aPlotter,
m_parent->GetPageSettings(), m_parent->GetPageSettings(),
aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens,
m_parent->GetScreenDesc(), m_parent->GetScreenDesc(),
aScreen->GetFileName() ); aScreen->GetFileName(),
GetLayerColor( ( SCH_LAYER_ID )LAYER_WORKSHEET ) );
} }
aScreen->Plot( aPlotter ); aScreen->Plot( aPlotter );

3
eeschema/plot_schematic_PS.cpp
View File

@ -162,7 +162,8 @@ bool DIALOG_PLOT_SCHEMATIC::plotOneSheetPS( const wxString& aFileName,
m_parent->GetPageSettings(), m_parent->GetPageSettings(),
aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens,
m_parent->GetScreenDesc(), m_parent->GetScreenDesc(),
aScreen->GetFileName() ); aScreen->GetFileName(),
GetLayerColor( ( SCH_LAYER_ID )LAYER_WORKSHEET ) );
} }
aScreen->Plot( plotter ); aScreen->Plot( plotter );

3
eeschema/plot_schematic_SVG.cpp
View File

@ -136,7 +136,8 @@ bool DIALOG_PLOT_SCHEMATIC::plotOneSheetSVG( EDA_DRAW_FRAME* aFrame,
aFrame->GetPageSettings(), aFrame->GetPageSettings(),
aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber, aScreen->m_NumberOfScreens,
aFrame->GetScreenDesc(), aFrame->GetScreenDesc(),
aScreen->GetFileName() ); aScreen->GetFileName(),
GetLayerColor( ( SCH_LAYER_ID )LAYER_WORKSHEET ) );
} }
aScreen->Plot( plotter ); aScreen->Plot( plotter );

3
include/plotter.h
View File

@ -1352,7 +1352,8 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
const PAGE_INFO& aPageInfo, const PAGE_INFO& aPageInfo,
int aSheetNumber, int aNumberOfSheets, int aSheetNumber, int aNumberOfSheets,
const wxString &aSheetDesc, const wxString &aSheetDesc,
const wxString &aFilename ); const wxString &aFilename,
const COLOR4D aColor = COLOR4D::UNSPECIFIED );
/** Returns the default plot extension for a format /** Returns the default plot extension for a format
*/ */