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

Use default text properties for textboxes.

Browse Source 
Also make sure text is mirrored when placed on back of board.

Fixes https://gitlab.com/kicad/code/kicad/issues/11739
This commit is contained in:
Jeff Young 2022-06-03 18:47:03 +01:00
parent 13bece06cf
commit d31bd4ea3e
4 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/eda_text.h
View File

@ -169,6 +169,7 @@ public:
void CopyText( const EDA_TEXT& aSrc ); void CopyText( const EDA_TEXT& aSrc );
void SetAttributes( const TEXT_ATTRIBUTES& aTextAttrs ) { m_attributes = aTextAttrs; }
const TEXT_ATTRIBUTES& GetAttributes() const { return m_attributes; } const TEXT_ATTRIBUTES& GetAttributes() const { return m_attributes; }
/** /**

9
include/gr_text.h
View File

@ -79,6 +79,15 @@ int GetPenSizeForBold( const wxSize& aTextSize );
int GetPenSizeForNormal( int aTextSize ); int GetPenSizeForNormal( int aTextSize );
int GetPenSizeForNormal( const wxSize& aTextSize ); int GetPenSizeForNormal( const wxSize& aTextSize );
inline void InferBold( TEXT_ATTRIBUTES* aAttrs )
{
int penSize( aAttrs->m_StrokeWidth );
wxSize textSize( aAttrs->m_Size.x, aAttrs->m_Size.y );
aAttrs->m_Bold = abs( penSize - GetPenSizeForBold( textSize ) )
< abs( penSize - GetPenSizeForNormal( textSize ) );
}
/** /**
* Returns the margin for knockout text. * Returns the margin for knockout text.

69
pcbnew/tools/drawing_tool.cpp
View File

@ -365,7 +365,7 @@ int DRAWING_TOOL::DrawRectangle( const TOOL_EVENT& aEvent )
rect = makeNew(); rect = makeNew();
rect->SetShape( SHAPE_T::RECT ); rect->SetShape( SHAPE_T::RECT );
rect->SetFilled( false ); rect->SetFilled( false );
rect->SetFlags(IS_NEW ); rect->SetFlags( IS_NEW );
if( aEvent.HasPosition() ) if( aEvent.HasPosition() )
startingPoint = getViewControls()->GetCursorPosition( !aEvent.DisableGridSnapping() ); startingPoint = getViewControls()->GetCursorPosition( !aEvent.DisableGridSnapping() );
@ -398,7 +398,7 @@ int DRAWING_TOOL::DrawRectangle( const TOOL_EVENT& aEvent )
rect = makeNew(); rect = makeNew();
rect->SetShape( SHAPE_T::RECT ); rect->SetShape( SHAPE_T::RECT );
rect->SetFilled( false ); rect->SetFilled( false );
rect->SetFlags(IS_NEW ); rect->SetFlags( IS_NEW );
startingPoint = NULLOPT; startingPoint = NULLOPT;
} }
@ -521,7 +521,7 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
COMMON_SETTINGS* common_settings = Pgm().GetCommonSettings(); COMMON_SETTINGS* common_settings = Pgm().GetCommonSettings();
BOARD_ITEM* text = nullptr; BOARD_ITEM* text = nullptr;
bool ignorePrimePosition = false; bool ignorePrimePosition = false;
const BOARD_DESIGN_SETTINGS& dsnSettings = m_frame->GetDesignSettings(); const BOARD_DESIGN_SETTINGS& bds = m_frame->GetDesignSettings();
BOARD_COMMIT commit( m_frame ); BOARD_COMMIT commit( m_frame );
SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::TEXT ); SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::TEXT );
@ -616,10 +616,16 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
m_controls->ForceCursorPosition( true, m_controls->GetCursorPosition() ); m_controls->ForceCursorPosition( true, m_controls->GetCursorPosition() );
PCB_LAYER_ID layer = m_frame->GetActiveLayer();
wxSize textSize = dsnSettings.GetTextSize( layer ); PCB_LAYER_ID layer = m_frame->GetActiveLayer();
int thickness = dsnSettings.GetTextThickness( layer ); TEXT_ATTRIBUTES textAttrs;
textAttrs.m_Size = bds.GetTextSize( layer );
textAttrs.m_StrokeWidth = bds.GetTextThickness( layer );
InferBold( &textAttrs );
textAttrs.m_Italic = bds.GetTextItalic( layer );
textAttrs.m_KeepUpright = bds.GetTextUpright( layer );
textAttrs.m_Mirrored = IsBackLayer( layer );
// Init the new item attributes // Init the new item attributes
if( m_isFootprintEditor ) if( m_isFootprintEditor )
@ -627,12 +633,7 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
FP_TEXT* fpText = new FP_TEXT( (FOOTPRINT*) m_frame->GetModel() ); FP_TEXT* fpText = new FP_TEXT( (FOOTPRINT*) m_frame->GetModel() );
fpText->SetLayer( layer ); fpText->SetLayer( layer );
fpText->SetTextSize( textSize ); fpText->SetAttributes( textAttrs );
fpText->SetTextThickness( thickness );
fpText->SetBold( abs( thickness - GetPenSizeForBold( textSize ) ) <
abs( thickness - GetPenSizeForNormal( textSize ) ) );
fpText->SetItalic( dsnSettings.GetTextItalic( layer ) );
fpText->SetKeepUpright( dsnSettings.GetTextUpright( layer ) );
fpText->SetTextPos( cursorPos ); fpText->SetTextPos( cursorPos );
text = fpText; text = fpText;
@ -663,16 +664,7 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
pcbText->SetFlags( IS_NEW ); pcbText->SetFlags( IS_NEW );
pcbText->SetLayer( layer ); pcbText->SetLayer( layer );
pcbText->SetAttributes( textAttrs );
// Set the mirrored option for layers on the BACK side of the board
if( IsBackLayer( layer ) )
pcbText->SetMirrored( true );
pcbText->SetTextSize( textSize );
pcbText->SetTextThickness( thickness );
pcbText->SetBold( abs( thickness - GetPenSizeForBold( textSize ) ) <
abs( thickness - GetPenSizeForNormal( textSize ) ) );
pcbText->SetItalic( dsnSettings.GetTextItalic( layer ) );
pcbText->SetTextPos( cursorPos ); pcbText->SetTextPos( cursorPos );
RunMainStack( [&]() RunMainStack( [&]()
@ -1519,9 +1511,10 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
// Only three shapes are currently supported // Only three shapes are currently supported
wxASSERT( shape == SHAPE_T::SEGMENT || shape == SHAPE_T::CIRCLE || shape == SHAPE_T::RECT ); wxASSERT( shape == SHAPE_T::SEGMENT || shape == SHAPE_T::CIRCLE || shape == SHAPE_T::RECT );
EDA_UNITS userUnits = m_frame->GetUserUnits(); const BOARD_DESIGN_SETTINGS& bds = m_frame->GetDesignSettings();
PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() ); EDA_UNITS userUnits = m_frame->GetUserUnits();
PCB_SHAPE*& graphic = *aGraphic; PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() );
PCB_SHAPE*& graphic = *aGraphic;
if( m_layer != m_frame->GetActiveLayer() ) if( m_layer != m_frame->GetActiveLayer() )
{ {
@ -1529,6 +1522,13 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
m_stroke.SetWidth( getSegmentWidth( m_layer ) ); m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT ); m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED ); m_stroke.SetColor( COLOR4D::UNSPECIFIED );
m_textAttrs.m_Size = bds.GetTextSize( m_layer );
m_textAttrs.m_StrokeWidth = bds.GetTextThickness( m_layer );
InferBold( &m_textAttrs );
m_textAttrs.m_Italic = bds.GetTextItalic( m_layer );
m_textAttrs.m_KeepUpright = bds.GetTextUpright( m_layer );
m_textAttrs.m_Mirrored = IsBackLayer( m_layer );
} }
// geometric construction manager // geometric construction manager
@ -1633,6 +1633,13 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
m_stroke.SetWidth( getSegmentWidth( m_layer ) ); m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT ); m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED ); m_stroke.SetColor( COLOR4D::UNSPECIFIED );
m_textAttrs.m_Size = bds.GetTextSize( m_layer );
m_textAttrs.m_StrokeWidth = bds.GetTextThickness( m_layer );
InferBold( &m_textAttrs );
m_textAttrs.m_Italic = bds.GetTextItalic( m_layer );
m_textAttrs.m_KeepUpright = bds.GetTextUpright( m_layer );
m_textAttrs.m_Mirrored = IsBackLayer( m_layer );
} }
if( graphic ) if( graphic )
@ -1645,6 +1652,12 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
graphic->SetLayer( m_layer ); graphic->SetLayer( m_layer );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
if( FP_TEXTBOX* fp_textbox = dynamic_cast<FP_TEXTBOX*>( graphic ) )
fp_textbox->SetAttributes( m_textAttrs );
else if( PCB_TEXTBOX* pcb_textbox = dynamic_cast<PCB_TEXTBOX*>( graphic ) )
pcb_textbox->SetAttributes( m_textAttrs );
m_view->Update( &preview ); m_view->Update( &preview );
frame()->SetMsgPanel( graphic ); frame()->SetMsgPanel( graphic );
} }
@ -1688,6 +1701,12 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
graphic->SetFilled( false ); graphic->SetFilled( false );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
graphic->SetLayer( m_layer ); graphic->SetLayer( m_layer );
if( FP_TEXTBOX* fp_textbox = dynamic_cast<FP_TEXTBOX*>( graphic ) )
fp_textbox->SetAttributes( m_textAttrs );
else if( PCB_TEXTBOX* pcb_textbox = dynamic_cast<PCB_TEXTBOX*>( graphic ) )
pcb_textbox->SetAttributes( m_textAttrs );
grid.SetSkipPoint( cursorPos ); grid.SetSkipPoint( cursorPos );
twoPointManager.SetOrigin( cursorPos ); twoPointManager.SetOrigin( cursorPos );

3
pcbnew/tools/drawing_tool.h
View File

@ -278,8 +278,9 @@ private:
PCB_LAYER_ID m_layer; // The layer we last drew on PCB_LAYER_ID m_layer; // The layer we last drew on
STROKE_PARAMS m_stroke; // Current stroke for multi-segment drawing STROKE_PARAMS m_stroke; // Current stroke for multi-segment drawing
static const unsigned int WIDTH_STEP; // Amount of width change for one -/+ key press TEXT_ATTRIBUTES m_textAttrs;
static const unsigned int WIDTH_STEP; // Amount of width change for one -/+ key press
friend class ZONE_CREATE_HELPER; // give internal access to helper classes friend class ZONE_CREATE_HELPER; // give internal access to helper classes
}; };