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

Honour parent symbol's transform when over-plotting pins.

This commit is contained in:
Jeff Young 2024-04-08 14:26:48 +01:00
parent 1d753e0850
commit 3ade857c7b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/dialogs/dialog_plot_schematic.cpp
View File

@ -371,6 +371,8 @@ void DIALOG_PLOT_SCHEMATIC::plotSchematic( bool aPlotAll )
wxBusyCursor dummy; wxBusyCursor dummy;
SCH_RENDER_SETTINGS renderSettings( *m_parent->GetRenderSettings() ); SCH_RENDER_SETTINGS renderSettings( *m_parent->GetRenderSettings() );
renderSettings.m_ShowHiddenPins = false;
renderSettings.m_ShowHiddenFields = false;
getPlotOptions( &renderSettings ); getPlotOptions( &renderSettings );

18
eeschema/sch_symbol.cpp
View File

@ -2496,7 +2496,9 @@ void SCH_SYMBOL::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PLOT_OPTS&
} }
} }
getRenderSettings( aPlotter )->m_Transform = GetTransform(); SCH_RENDER_SETTINGS* renderSettings = getRenderSettings( aPlotter );
TRANSFORM savedTransform = renderSettings->m_Transform;
renderSettings->m_Transform = GetTransform();
aPlotter->StartBlock( nullptr ); aPlotter->StartBlock( nullptr );
for( bool local_background : { true, false } ) for( bool local_background : { true, false } )
@ -2544,7 +2546,7 @@ void SCH_SYMBOL::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PLOT_OPTS&
} }
aPlotter->EndBlock( nullptr ); aPlotter->EndBlock( nullptr );
getRenderSettings( aPlotter )->m_Transform = TRANSFORM(); renderSettings->m_Transform = savedTransform;
if( !m_part->IsPower() ) if( !m_part->IsPower() )
aPlotter->Bookmark( GetBoundingBox(), GetRef( sheet ), _( "Symbols" ) ); aPlotter->Bookmark( GetBoundingBox(), GetRef( sheet ), _( "Symbols" ) );
@ -2554,6 +2556,10 @@ void SCH_SYMBOL::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PLOT_OPTS&
void SCH_SYMBOL::PlotDNP( PLOTTER* aPlotter ) const void SCH_SYMBOL::PlotDNP( PLOTTER* aPlotter ) const
{ {
SCH_RENDER_SETTINGS* renderSettings = getRenderSettings( aPlotter );
TRANSFORM savedTransform = renderSettings->m_Transform;
renderSettings->m_Transform = GetTransform();
BOX2I bbox = GetBodyAndPinsBoundingBox(); BOX2I bbox = GetBodyAndPinsBoundingBox();
COLOR_SETTINGS* colors = Pgm().GetSettingsManager().GetColorSettings(); COLOR_SETTINGS* colors = Pgm().GetSettingsManager().GetColorSettings();
@ -2568,6 +2574,8 @@ void SCH_SYMBOL::PlotDNP( PLOTTER* aPlotter ) const
bbox.GetOrigin() + VECTOR2I( 0, bbox.GetHeight() ), bbox.GetOrigin() + VECTOR2I( 0, bbox.GetHeight() ),
3.0 * schIUScale.MilsToIU( DEFAULT_LINE_WIDTH_MILS ), 3.0 * schIUScale.MilsToIU( DEFAULT_LINE_WIDTH_MILS ),
FILLED, nullptr ); FILLED, nullptr );
renderSettings->m_Transform = savedTransform;
} }
@ -2575,6 +2583,10 @@ void SCH_SYMBOL::PlotPins( PLOTTER* aPlotter ) const
{ {
if( m_part ) if( m_part )
{ {
SCH_RENDER_SETTINGS* renderSettings = getRenderSettings( aPlotter );
TRANSFORM savedTransform = renderSettings->m_Transform;
renderSettings->m_Transform = GetTransform();
std::vector<LIB_PIN*> libPins; std::vector<LIB_PIN*> libPins;
m_part->GetPins( libPins, GetUnit(), GetBodyStyle() ); m_part->GetPins( libPins, GetUnit(), GetBodyStyle() );
@ -2596,6 +2608,8 @@ void SCH_SYMBOL::PlotPins( PLOTTER* aPlotter ) const
tempPin->SetShape( symbolPin->GetShape() ); tempPin->SetShape( symbolPin->GetShape() );
tempPin->Plot( aPlotter, false, plotOpts, GetUnit(), GetBodyStyle(), m_pos, GetDNP() ); tempPin->Plot( aPlotter, false, plotOpts, GetUnit(), GetBodyStyle(), m_pos, GetDNP() );
} }
renderSettings->m_Transform = savedTransform;
} }
} }