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

Whack-a-mole on another case of "module".

This commit is contained in:
Jeff Young 2021-02-02 23:16:37 +00:00
parent b07c8110c8
commit 6dee7f30fa
7 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/CMakeLists.txt
View File

@ -312,7 +312,7 @@ set( PCBNEW_CLASS_SRCS
specctra_import_export/specctra.cpp specctra_import_export/specctra.cpp
specctra_import_export/specctra_export.cpp specctra_import_export/specctra_export.cpp
specctra_import_export/specctra_import.cpp specctra_import_export/specctra_import.cpp
text_mod_grid_table.cpp fp_text_grid_table.cpp
toolbars_footprint_editor.cpp toolbars_footprint_editor.cpp
toolbars_footprint_viewer.cpp toolbars_footprint_viewer.cpp
toolbars_pcb_editor.cpp toolbars_pcb_editor.cpp

4
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
View File

@ -64,7 +64,7 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP
m_frame = aParent; m_frame = aParent;
m_footprint = aFootprint; m_footprint = aFootprint;
m_texts = new TEXT_MOD_GRID_TABLE( m_units, m_frame ); m_texts = new FP_TEXT_GRID_TABLE( m_units, m_frame );
m_delayedErrorMessage = wxEmptyString; m_delayedErrorMessage = wxEmptyString;
m_delayedFocusCtrl = nullptr; m_delayedFocusCtrl = nullptr;
@ -573,7 +573,7 @@ bool DIALOG_FOOTPRINT_FP_EDITOR::Validate()
m_delayedErrorMessage = _( "Text items must have some content." ); m_delayedErrorMessage = _( "Text items must have some content." );
m_delayedFocusGrid = m_itemsGrid; m_delayedFocusGrid = m_itemsGrid;
m_delayedFocusColumn = TMC_TEXT; m_delayedFocusColumn = FPT_TEXT;
m_delayedFocusRow = i; m_delayedFocusRow = i;
return false; return false;

4
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h
View File

@ -26,7 +26,7 @@
#define DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_H #define DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_H
#include <vector> #include <vector>
#include <text_mod_grid_table.h> #include <fp_text_grid_table.h>
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <footprint.h> #include <footprint.h>
#include <dialog_edit_footprint_for_fp_editor_base.h> #include <dialog_edit_footprint_for_fp_editor_base.h>
@ -44,7 +44,7 @@ private:
static int m_page; // remember the last open page during session static int m_page; // remember the last open page during session
TEXT_MOD_GRID_TABLE* m_texts; FP_TEXT_GRID_TABLE* m_texts;
UNIT_BINDER m_netClearance; UNIT_BINDER m_netClearance;
UNIT_BINDER m_solderMask; UNIT_BINDER m_solderMask;

4
pcbnew/dialogs/dialog_footprint_properties.cpp
View File

@ -73,7 +73,7 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
for( size_t i = 0; i < m_NoteBook->GetPageCount(); ++i ) for( size_t i = 0; i < m_NoteBook->GetPageCount(); ++i )
m_macHack.push_back( true ); m_macHack.push_back( true );
m_texts = new TEXT_MOD_GRID_TABLE( m_units, m_frame ); m_texts = new FP_TEXT_GRID_TABLE( m_units, m_frame );
m_delayedErrorMessage = wxEmptyString; m_delayedErrorMessage = wxEmptyString;
m_delayedFocusGrid = nullptr; m_delayedFocusGrid = nullptr;
@ -628,7 +628,7 @@ bool DIALOG_FOOTPRINT_PROPERTIES::Validate()
m_delayedFocusGrid = m_itemsGrid; m_delayedFocusGrid = m_itemsGrid;
m_delayedErrorMessage = _( "Text items must have some content." ); m_delayedErrorMessage = _( "Text items must have some content." );
m_delayedFocusColumn = TMC_TEXT; m_delayedFocusColumn = FPT_TEXT;
m_delayedFocusRow = i; m_delayedFocusRow = i;
return false; return false;

4
pcbnew/dialogs/dialog_footprint_properties.h
View File

@ -29,7 +29,7 @@
#include <dialog_footprint_properties_base.h> #include <dialog_footprint_properties_base.h>
#include <wx/valnum.h> #include <wx/valnum.h>
#include <text_mod_grid_table.h> #include <fp_text_grid_table.h>
#include <footprint.h> #include <footprint.h>
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
@ -58,7 +58,7 @@ private:
static int m_page; // remember the last open page during session static int m_page; // remember the last open page during session
TEXT_MOD_GRID_TABLE* m_texts; FP_TEXT_GRID_TABLE* m_texts;
UNIT_BINDER m_posX; UNIT_BINDER m_posX;
UNIT_BINDER m_posY; UNIT_BINDER m_posY;
wxFloatingPointValidator<double> m_OrientValidator; wxFloatingPointValidator<double> m_OrientValidator;

142
pcbnew/text_mod_grid_table.cpp → pcbnew/fp_text_grid_table.cpp
View File

@ -23,7 +23,7 @@
#include <kiway.h> #include <kiway.h>
#include <kiway_player.h> #include <kiway_player.h>
#include <text_mod_grid_table.h> #include <fp_text_grid_table.h>
#include <widgets/grid_icon_text_helpers.h> #include <widgets/grid_icon_text_helpers.h>
#include <widgets/grid_combobox.h> #include <widgets/grid_combobox.h>
#include <trigo.h> #include <trigo.h>
@ -39,7 +39,7 @@ enum
wxArrayString g_menuOrientations; wxArrayString g_menuOrientations;
TEXT_MOD_GRID_TABLE::TEXT_MOD_GRID_TABLE( EDA_UNITS aUserUnits, PCB_BASE_FRAME* aFrame ) FP_TEXT_GRID_TABLE::FP_TEXT_GRID_TABLE( EDA_UNITS aUserUnits, PCB_BASE_FRAME* aFrame )
: m_userUnits( aUserUnits ), m_frame( aFrame ) : m_userUnits( aUserUnits ), m_frame( aFrame )
{ {
// Build the column attributes. // Build the column attributes.
@ -73,7 +73,7 @@ TEXT_MOD_GRID_TABLE::TEXT_MOD_GRID_TABLE( EDA_UNITS aUserUnits, PCB_BASE_FRAME*
} }
TEXT_MOD_GRID_TABLE::~TEXT_MOD_GRID_TABLE() FP_TEXT_GRID_TABLE::~FP_TEXT_GRID_TABLE()
{ {
m_readOnlyAttr->DecRef(); m_readOnlyAttr->DecRef();
m_boolColAttr->DecRef(); m_boolColAttr->DecRef();
@ -82,27 +82,27 @@ TEXT_MOD_GRID_TABLE::~TEXT_MOD_GRID_TABLE()
} }
wxString TEXT_MOD_GRID_TABLE::GetColLabelValue( int aCol ) wxString FP_TEXT_GRID_TABLE::GetColLabelValue( int aCol )
{ {
switch( aCol ) switch( aCol )
{ {
case TMC_TEXT: return _( "Text Items" ); case FPT_TEXT: return _( "Text Items" );
case TMC_SHOWN: return _( "Show" ); case FPT_SHOWN: return _( "Show" );
case TMC_WIDTH: return _( "Width" ); case FPT_WIDTH: return _( "Width" );
case TMC_HEIGHT: return _( "Height" ); case FPT_HEIGHT: return _( "Height" );
case TMC_THICKNESS: return _( "Thickness" ); case FPT_THICKNESS: return _( "Thickness" );
case TMC_ITALIC: return _( "Italic" ); case FPT_ITALIC: return _( "Italic" );
case TMC_LAYER: return _( "Layer" ); case FPT_LAYER: return _( "Layer" );
case TMC_ORIENTATION: return _( "Orientation" ); case FPT_ORIENTATION: return _( "Orientation" );
case TMC_UPRIGHT: return _( "Keep Upright" ); case FPT_UPRIGHT: return _( "Keep Upright" );
case TMC_XOFFSET: return _( "X Offset" ); case FPT_XOFFSET: return _( "X Offset" );
case TMC_YOFFSET: return _( "Y Offset" ); case FPT_YOFFSET: return _( "Y Offset" );
default: wxFAIL; return wxEmptyString; default: wxFAIL; return wxEmptyString;
} }
} }
wxString TEXT_MOD_GRID_TABLE::GetRowLabelValue( int aRow ) wxString FP_TEXT_GRID_TABLE::GetRowLabelValue( int aRow )
{ {
switch( aRow ) switch( aRow )
{ {
@ -113,25 +113,25 @@ wxString TEXT_MOD_GRID_TABLE::GetRowLabelValue( int aRow )
} }
bool TEXT_MOD_GRID_TABLE::CanGetValueAs( int aRow, int aCol, const wxString& aTypeName ) bool FP_TEXT_GRID_TABLE::CanGetValueAs( int aRow, int aCol, const wxString& aTypeName )
{ {
switch( aCol ) switch( aCol )
{ {
case TMC_TEXT: case FPT_TEXT:
case TMC_WIDTH: case FPT_WIDTH:
case TMC_HEIGHT: case FPT_HEIGHT:
case TMC_THICKNESS: case FPT_THICKNESS:
case TMC_ORIENTATION: case FPT_ORIENTATION:
case TMC_XOFFSET: case FPT_XOFFSET:
case TMC_YOFFSET: case FPT_YOFFSET:
return aTypeName == wxGRID_VALUE_STRING; return aTypeName == wxGRID_VALUE_STRING;
case TMC_SHOWN: case FPT_SHOWN:
case TMC_ITALIC: case FPT_ITALIC:
case TMC_UPRIGHT: case FPT_UPRIGHT:
return aTypeName == wxGRID_VALUE_BOOL; return aTypeName == wxGRID_VALUE_BOOL;
case TMC_LAYER: case FPT_LAYER:
return aTypeName == wxGRID_VALUE_NUMBER; return aTypeName == wxGRID_VALUE_NUMBER;
default: default:
@ -141,35 +141,35 @@ bool TEXT_MOD_GRID_TABLE::CanGetValueAs( int aRow, int aCol, const wxString& aTy
} }
bool TEXT_MOD_GRID_TABLE::CanSetValueAs( int aRow, int aCol, const wxString& aTypeName ) bool FP_TEXT_GRID_TABLE::CanSetValueAs( int aRow, int aCol, const wxString& aTypeName )
{ {
return CanGetValueAs( aRow, aCol, aTypeName ); return CanGetValueAs( aRow, aCol, aTypeName );
} }
wxGridCellAttr* TEXT_MOD_GRID_TABLE::GetAttr( int aRow, int aCol, wxGridCellAttr::wxAttrKind ) wxGridCellAttr* FP_TEXT_GRID_TABLE::GetAttr( int aRow, int aCol, wxGridCellAttr::wxAttrKind )
{ {
switch( aCol ) switch( aCol )
{ {
case TMC_TEXT: case FPT_TEXT:
case TMC_WIDTH: case FPT_WIDTH:
case TMC_HEIGHT: case FPT_HEIGHT:
case TMC_THICKNESS: case FPT_THICKNESS:
case TMC_XOFFSET: case FPT_XOFFSET:
case TMC_YOFFSET: case FPT_YOFFSET:
return nullptr; return nullptr;
case TMC_SHOWN: case FPT_SHOWN:
case TMC_ITALIC: case FPT_ITALIC:
case TMC_UPRIGHT: case FPT_UPRIGHT:
m_boolColAttr->IncRef(); m_boolColAttr->IncRef();
return m_boolColAttr; return m_boolColAttr;
case TMC_LAYER: case FPT_LAYER:
m_layerColAttr->IncRef(); m_layerColAttr->IncRef();
return m_layerColAttr; return m_layerColAttr;
case TMC_ORIENTATION: case FPT_ORIENTATION:
m_orientationColAttr->IncRef(); m_orientationColAttr->IncRef();
return m_orientationColAttr; return m_orientationColAttr;
@ -180,35 +180,35 @@ wxGridCellAttr* TEXT_MOD_GRID_TABLE::GetAttr( int aRow, int aCol, wxGridCellAttr
} }
wxString TEXT_MOD_GRID_TABLE::GetValue( int aRow, int aCol ) wxString FP_TEXT_GRID_TABLE::GetValue( int aRow, int aCol )
{ {
const FP_TEXT& text = this->at((size_t) aRow ); const FP_TEXT& text = this->at((size_t) aRow );
switch( aCol ) switch( aCol )
{ {
case TMC_TEXT: case FPT_TEXT:
return text.GetText(); return text.GetText();
case TMC_WIDTH: case FPT_WIDTH:
return StringFromValue( m_userUnits, text.GetTextWidth() ); return StringFromValue( m_userUnits, text.GetTextWidth() );
case TMC_HEIGHT: case FPT_HEIGHT:
return StringFromValue( m_userUnits, text.GetTextHeight() ); return StringFromValue( m_userUnits, text.GetTextHeight() );
case TMC_THICKNESS: case FPT_THICKNESS:
return StringFromValue( m_userUnits, text.GetTextThickness() ); return StringFromValue( m_userUnits, text.GetTextThickness() );
case TMC_LAYER: case FPT_LAYER:
return text.GetLayerName(); return text.GetLayerName();
case TMC_ORIENTATION: case FPT_ORIENTATION:
return StringFromValue( EDA_UNITS::DEGREES, (int) NormalizeAnglePos( text.GetTextAngle() ), return StringFromValue( EDA_UNITS::DEGREES, (int) NormalizeAnglePos( text.GetTextAngle() ),
true ); true );
case TMC_XOFFSET: case FPT_XOFFSET:
return StringFromValue( m_userUnits, text.GetPos0().x ); return StringFromValue( m_userUnits, text.GetPos0().x );
case TMC_YOFFSET: case FPT_YOFFSET:
return StringFromValue( m_userUnits, text.GetPos0().y ); return StringFromValue( m_userUnits, text.GetPos0().y );
default: default:
@ -219,15 +219,15 @@ wxString TEXT_MOD_GRID_TABLE::GetValue( int aRow, int aCol )
} }
bool TEXT_MOD_GRID_TABLE::GetValueAsBool( int aRow, int aCol ) bool FP_TEXT_GRID_TABLE::GetValueAsBool( int aRow, int aCol )
{ {
FP_TEXT& text = this->at((size_t) aRow ); FP_TEXT& text = this->at((size_t) aRow );
switch( aCol ) switch( aCol )
{ {
case TMC_SHOWN: return text.IsVisible(); case FPT_SHOWN: return text.IsVisible();
case TMC_ITALIC: return text.IsItalic(); case FPT_ITALIC: return text.IsItalic();
case TMC_UPRIGHT: return text.IsKeepUpright(); case FPT_UPRIGHT: return text.IsKeepUpright();
default: default:
wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) ); wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) );
return false; return false;
@ -235,13 +235,13 @@ bool TEXT_MOD_GRID_TABLE::GetValueAsBool( int aRow, int aCol )
} }
long TEXT_MOD_GRID_TABLE::GetValueAsLong( int aRow, int aCol ) long FP_TEXT_GRID_TABLE::GetValueAsLong( int aRow, int aCol )
{ {
FP_TEXT& text = this->at((size_t) aRow ); FP_TEXT& text = this->at((size_t) aRow );
switch( aCol ) switch( aCol )
{ {
case TMC_LAYER: return text.GetLayer(); case FPT_LAYER: return text.GetLayer();
default: default:
wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a long value" ), aCol ) ); wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a long value" ), aCol ) );
return 0; return 0;
@ -249,38 +249,38 @@ long TEXT_MOD_GRID_TABLE::GetValueAsLong( int aRow, int aCol )
} }
void TEXT_MOD_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue ) void FP_TEXT_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue )
{ {
FP_TEXT& text = this->at((size_t) aRow ); FP_TEXT& text = this->at((size_t) aRow );
wxPoint pos; wxPoint pos;
switch( aCol ) switch( aCol )
{ {
case TMC_TEXT: case FPT_TEXT:
text.SetText( aValue ); text.SetText( aValue );
break; break;
case TMC_WIDTH: case FPT_WIDTH:
text.SetTextWidth( ValueFromString( m_userUnits, aValue ) ); text.SetTextWidth( ValueFromString( m_userUnits, aValue ) );
break; break;
case TMC_HEIGHT: case FPT_HEIGHT:
text.SetTextHeight( ValueFromString( m_userUnits, aValue ) ); text.SetTextHeight( ValueFromString( m_userUnits, aValue ) );
break; break;
case TMC_THICKNESS:text.SetTextThickness( ValueFromString( m_userUnits, aValue ) ); case FPT_THICKNESS:text.SetTextThickness( ValueFromString( m_userUnits, aValue ) );
break; break;
case TMC_ORIENTATION: case FPT_ORIENTATION:
text.SetTextAngle( DoubleValueFromString( EDA_UNITS::DEGREES, aValue ) ); text.SetTextAngle( DoubleValueFromString( EDA_UNITS::DEGREES, aValue ) );
text.SetDrawCoord(); text.SetDrawCoord();
break; break;
case TMC_XOFFSET: case FPT_XOFFSET:
case TMC_YOFFSET: case FPT_YOFFSET:
pos = text.GetPos0(); pos = text.GetPos0();
if( aCol == TMC_XOFFSET ) if( aCol == FPT_XOFFSET )
pos.x = ValueFromString( m_userUnits, aValue ); pos.x = ValueFromString( m_userUnits, aValue );
else else
pos.y = ValueFromString( m_userUnits, aValue ); pos.y = ValueFromString( m_userUnits, aValue );
@ -298,21 +298,21 @@ void TEXT_MOD_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue )
} }
void TEXT_MOD_GRID_TABLE::SetValueAsBool( int aRow, int aCol, bool aValue ) void FP_TEXT_GRID_TABLE::SetValueAsBool( int aRow, int aCol, bool aValue )
{ {
FP_TEXT& text = this->at((size_t) aRow ); FP_TEXT& text = this->at((size_t) aRow );
switch( aCol ) switch( aCol )
{ {
case TMC_SHOWN: case FPT_SHOWN:
text.SetVisible( aValue ); text.SetVisible( aValue );
break; break;
case TMC_ITALIC: case FPT_ITALIC:
text.SetItalic( aValue ); text.SetItalic( aValue );
break; break;
case TMC_UPRIGHT:text.SetKeepUpright( aValue ); case FPT_UPRIGHT:text.SetKeepUpright( aValue );
break; break;
default: default:
@ -322,13 +322,13 @@ void TEXT_MOD_GRID_TABLE::SetValueAsBool( int aRow, int aCol, bool aValue )
} }
void TEXT_MOD_GRID_TABLE::SetValueAsLong( int aRow, int aCol, long aValue ) void FP_TEXT_GRID_TABLE::SetValueAsLong( int aRow, int aCol, long aValue )
{ {
FP_TEXT& text = this->at((size_t) aRow ); FP_TEXT& text = this->at((size_t) aRow );
switch( aCol ) switch( aCol )
{ {
case TMC_LAYER: case FPT_LAYER:
text.SetLayer( ToLAYER_ID( (int) aValue ) ); text.SetLayer( ToLAYER_ID( (int) aValue ) );
text.SetMirrored( IsBackLayer( text.GetLayer() ) ); text.SetMirrored( IsBackLayer( text.GetLayer() ) );
break; break;

40
pcbnew/text_mod_grid_table.h → pcbnew/fp_text_grid_table.h
View File

@ -21,8 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef TEXT_MOD_GRID_TABLE_H #ifndef FP_TEXT_GRID_TABLE_H
#define TEXT_MOD_GRID_TABLE_H #define FP_TEXT_GRID_TABLE_H
#include <base_units.h> #include <base_units.h>
#include <wx/grid.h> #include <wx/grid.h>
@ -33,32 +33,32 @@
class FOOTPRINT; class FOOTPRINT;
class PCB_BASE_FRAME; class PCB_BASE_FRAME;
enum TEXT_MOD_COL_ORDER enum FP_TEXT_COL_ORDER
{ {
TMC_TEXT, FPT_TEXT,
TMC_SHOWN, FPT_SHOWN,
TMC_WIDTH, FPT_WIDTH,
TMC_HEIGHT, FPT_HEIGHT,
TMC_THICKNESS, FPT_THICKNESS,
TMC_ITALIC, FPT_ITALIC,
TMC_LAYER, FPT_LAYER,
TMC_ORIENTATION, FPT_ORIENTATION,
TMC_UPRIGHT, // keep text upright when viewed from bottom or right of board FPT_UPRIGHT, // keep text upright when viewed from bottom or right of board
TMC_XOFFSET, FPT_XOFFSET,
TMC_YOFFSET, FPT_YOFFSET,
TMC_COUNT // keep as last FPT_COUNT // keep as last
}; };
class TEXT_MOD_GRID_TABLE : public wxGridTableBase, public std::vector<FP_TEXT> class FP_TEXT_GRID_TABLE : public wxGridTableBase, public std::vector<FP_TEXT>
{ {
public: public:
TEXT_MOD_GRID_TABLE( EDA_UNITS userUnits, PCB_BASE_FRAME* aFrame ); FP_TEXT_GRID_TABLE( EDA_UNITS userUnits, PCB_BASE_FRAME* aFrame );
~TEXT_MOD_GRID_TABLE(); ~FP_TEXT_GRID_TABLE();
int GetNumberRows() override { return (int) size(); } int GetNumberRows() override { return (int) size(); }
int GetNumberCols() override { return TMC_COUNT; } int GetNumberCols() override { return FPT_COUNT; }
wxString GetColLabelValue( int aCol ) override; wxString GetColLabelValue( int aCol ) override;
wxString GetRowLabelValue( int aRow ) override; wxString GetRowLabelValue( int aRow ) override;
@ -91,4 +91,4 @@ private:
}; };
#endif // TEXT_MOD_GRID_TABLE_H #endif // FP_TEXT_GRID_TABLE_H