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

Add new properties to fields grid table

This commit is contained in:
Jon Evans 2022-11-09 21:43:37 -05:00
parent d9d3ccd6eb
commit 108d5b5433
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
eeschema/fields_grid_table.cpp
View File

@ -338,6 +338,7 @@ wxString FIELDS_GRID_TABLE<T>::GetColLabelValue( int aCol )
case FDC_NAME: return _( "Name" );
case FDC_VALUE: return _( "Value" );
case FDC_SHOWN: return _( "Show" );
case FDC_SHOW_NAME: return _( "Show Name" );
case FDC_H_ALIGN: return _( "H Align" );
case FDC_V_ALIGN: return _( "V Align" );
case FDC_ITALIC: return _( "Italic" );
@ -348,6 +349,7 @@ wxString FIELDS_GRID_TABLE<T>::GetColLabelValue( int aCol )
case FDC_POSY: return _( "Y Position" );
case FDC_FONT: return _( "Font" );
case FDC_COLOR: return _( "Color" );
case FDC_ALLOW_AUTOPLACE: return _( "Allow Autoplacement" );
default: wxFAIL; return wxEmptyString;
}
}
@ -371,8 +373,10 @@ bool FIELDS_GRID_TABLE<T>::CanGetValueAs( int aRow, int aCol, const wxString& aT
return aTypeName == wxGRID_VALUE_STRING;
case FDC_SHOWN:
case FDC_SHOW_NAME:
case FDC_ITALIC:
case FDC_BOLD:
case FDC_ALLOW_AUTOPLACE:
return aTypeName == wxGRID_VALUE_BOOL;
default:
@ -497,8 +501,10 @@ wxGridCellAttr* FIELDS_GRID_TABLE<T>::GetAttr( int aRow, int aCol, wxGridCellAtt
return m_orientationAttr;
case FDC_SHOWN:
case FDC_SHOW_NAME:
case FDC_ITALIC:
case FDC_BOLD:
case FDC_ALLOW_AUTOPLACE:
m_boolAttr->IncRef();
return m_boolAttr;
@ -569,6 +575,9 @@ wxString FIELDS_GRID_TABLE<T>::GetValue( int aRow, int aCol )
case FDC_SHOWN:
return StringFromBool( field.IsVisible() );
case FDC_SHOW_NAME:
return StringFromBool( field.IsNameShown() );
case FDC_H_ALIGN:
switch ( field.GetHorizJustify() )
{
@ -619,6 +628,9 @@ wxString FIELDS_GRID_TABLE<T>::GetValue( int aRow, int aCol )
case FDC_COLOR:
return field.GetTextColor().ToCSSString();
case FDC_ALLOW_AUTOPLACE:
return StringFromBool( field.CanAutoplace() );
default:
// we can't assert here because wxWidgets sometimes calls this without checking
// the column type when trying to see if there's an overflow
@ -637,9 +649,11 @@ bool FIELDS_GRID_TABLE<T>::GetValueAsBool( int aRow, int aCol )
switch( aCol )
{
case FDC_SHOWN: return field.IsVisible();
case FDC_ITALIC: return field.IsItalic();
case FDC_BOLD: return field.IsBold();
case FDC_SHOWN: return field.IsVisible();
case FDC_SHOW_NAME: return field.IsNameShown();
case FDC_ITALIC: return field.IsItalic();
case FDC_BOLD: return field.IsBold();
case FDC_ALLOW_AUTOPLACE: return field.CanAutoplace();
default:
wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) );
return false;
@ -707,6 +721,10 @@ void FIELDS_GRID_TABLE<T>::SetValue( int aRow, int aCol, const wxString &aValue
field.SetVisible( BoolFromString( value ) );
break;
case FDC_SHOW_NAME:
field.SetNameShown( BoolFromString( value ) );
break;
case FDC_H_ALIGN:
if( value == _( "Left" ) )
field.SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
@ -780,6 +798,10 @@ void FIELDS_GRID_TABLE<T>::SetValue( int aRow, int aCol, const wxString &aValue
field.SetTextColor( wxColor( value ) );
break;
case FDC_ALLOW_AUTOPLACE:
field.SetCanAutoplace( BoolFromString( value ) );
break;
default:
wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a string value" ), aCol ) );
break;
@ -803,6 +825,10 @@ void FIELDS_GRID_TABLE<T>::SetValueAsBool( int aRow, int aCol, bool aValue )
field.SetVisible( aValue );
break;
case FDC_SHOW_NAME:
field.SetNameShown( aValue );
break;
case FDC_ITALIC:
field.SetItalic( aValue );
break;
@ -811,6 +837,10 @@ void FIELDS_GRID_TABLE<T>::SetValueAsBool( int aRow, int aCol, bool aValue )
field.SetBold( aValue );
break;
case FDC_ALLOW_AUTOPLACE:
field.SetCanAutoplace( aValue );
break;
default:
wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) );
break;

2
eeschema/fields_grid_table.h
View File

@ -55,6 +55,7 @@ enum FIELDS_DATA_COL_ORDER
FDC_NAME,
FDC_VALUE,
FDC_SHOWN,
FDC_SHOW_NAME,
FDC_H_ALIGN,
FDC_V_ALIGN,
FDC_ITALIC,
@ -65,6 +66,7 @@ enum FIELDS_DATA_COL_ORDER
FDC_POSY,
FDC_FONT,
FDC_COLOR,
FDC_ALLOW_AUTOPLACE,
FDC_COUNT // keep as last
};