From cd43dccb18506dc7b6437a56ffb6ccbbf245a049 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 3 May 2023 17:41:26 +0100 Subject: [PATCH] Add missing property to footprint texts table. Fixes https://gitlab.com/kicad/code/kicad/issues/14357 --- pcbnew/fp_text_grid_table.cpp | 11 ++++++++++- pcbnew/fp_text_grid_table.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pcbnew/fp_text_grid_table.cpp b/pcbnew/fp_text_grid_table.cpp index dce4154370..b84e87b1bd 100644 --- a/pcbnew/fp_text_grid_table.cpp +++ b/pcbnew/fp_text_grid_table.cpp @@ -109,6 +109,7 @@ wxString FP_TEXT_GRID_TABLE::GetColLabelValue( int aCol ) case FPT_UPRIGHT: return _( "Keep Upright" ); case FPT_XOFFSET: return _( "X Offset" ); case FPT_YOFFSET: return _( "Y Offset" ); + case FPT_KNOCKOUT: return _( "Knockout" ); default: wxFAIL; return wxEmptyString; } } @@ -141,6 +142,7 @@ bool FP_TEXT_GRID_TABLE::CanGetValueAs( int aRow, int aCol, const wxString& aTyp case FPT_SHOWN: case FPT_ITALIC: case FPT_UPRIGHT: + case FPT_KNOCKOUT: return aTypeName == wxGRID_VALUE_BOOL; case FPT_LAYER: @@ -174,6 +176,7 @@ wxGridCellAttr* FP_TEXT_GRID_TABLE::GetAttr( int aRow, int aCol, wxGridCellAttr: case FPT_SHOWN: case FPT_ITALIC: case FPT_UPRIGHT: + case FPT_KNOCKOUT: m_boolColAttr->IncRef(); return m_boolColAttr; @@ -252,6 +255,7 @@ bool FP_TEXT_GRID_TABLE::GetValueAsBool( int aRow, int aCol ) case FPT_SHOWN: return text.IsVisible(); case FPT_ITALIC: return text.IsItalic(); case FPT_UPRIGHT: return text.IsKeepUpright(); + case FPT_KNOCKOUT: return text.IsKnockout(); default: wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) ); @@ -360,7 +364,12 @@ void FP_TEXT_GRID_TABLE::SetValueAsBool( int aRow, int aCol, bool aValue ) text.SetItalic( aValue ); break; - case FPT_UPRIGHT:text.SetKeepUpright( aValue ); + case FPT_UPRIGHT: + text.SetKeepUpright( aValue ); + break; + + case FPT_KNOCKOUT: + text.SetIsKnockout( aValue ); break; default: diff --git a/pcbnew/fp_text_grid_table.h b/pcbnew/fp_text_grid_table.h index 3164fcc9fb..59e14ca470 100644 --- a/pcbnew/fp_text_grid_table.h +++ b/pcbnew/fp_text_grid_table.h @@ -44,6 +44,7 @@ enum FP_TEXT_COL_ORDER FPT_UPRIGHT, // keep text upright when viewed from bottom or right of board FPT_XOFFSET, FPT_YOFFSET, + FPT_KNOCKOUT, FPT_COUNT // keep as last };