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

Fix some issues related to new textboxes and python: 

- Fix duplicate class names returned by GetClass().
- replace MTEXT name (in GetClass) by better name (FP_TEXT, FP_TEXTBOX...)
- Add missing Cast_to_PCB_TEXTBOX and Cast_to_FP_TEXTBOX
This commit is contained in:
jean-pierre charras 2022-02-03 13:55:37 +01:00
parent 3d0b03515d
commit a970acd0bc
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/fp_text.h
View File

@ -173,7 +173,7 @@ public:
wxString GetClass() const override
{
return wxT( "MTEXT" );
return wxT( "FP_TEXT" );
}
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;

2
pcbnew/fp_textbox.h
View File

@ -115,7 +115,7 @@ public:
wxString GetClass() const override
{
return wxT( "MTEXT" );
return wxT( "FP_TEXTBOX" );
}
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;

16
pcbnew/python/swig/board_item.i
View File

@ -43,6 +43,7 @@
%{
class PCB_TEXT;
class PCB_TEXTBOX;
class PCB_DIM_ALIGNED;
class PCB_DIM_ORTHOGONAL;
class PCB_DIM_LEADER;
@ -50,6 +51,7 @@ class PCB_DIM_CENTER;
class FOOTPRINT;
class PCB_GROUP;
class FP_TEXT;
class FP_TEXTBOX;
class PCB_SHAPE;
class MARKER_PCB;
class BOARD;
@ -69,6 +71,7 @@ extern "C" {
#endif
static PCB_TEXT* Cast_to_PCB_TEXT( BOARD_ITEM* );
static PCB_TEXTBOX* Cast_to_PCB_TEXTBOX( BOARD_ITEM* );
static PCB_DIM_ALIGNED* Cast_to_PCB_DIM_ALIGNED( BOARD_ITEM* );
static PCB_DIM_ORTHOGONAL* Cast_to_PCB_DIM_ORTHOGONAL( BOARD_ITEM* );
static PCB_DIM_LEADER* Cast_to_PCB_DIM_LEADER( BOARD_ITEM* );
@ -76,6 +79,7 @@ static PCB_DIM_CENTER* Cast_to_PCB_DIM_CENTER( BOARD_ITEM* );
static FOOTPRINT* Cast_to_FOOTPRINT( BOARD_ITEM* );
static PCB_GROUP* Cast_to_PCB_GROUP( BOARD_ITEM* );
static FP_TEXT* Cast_to_FP_TEXT( BOARD_ITEM* );
static FP_TEXTBOX* Cast_to_FP_TEXTBOX( BOARD_ITEM* );
static PCB_SHAPE* Cast_to_PCB_SHAPE( BOARD_ITEM* );
static PCB_MARKER* Cast_to_PCB_MARKER( BOARD_ITEM* );
static BOARD* Cast_to_BOARD( BOARD_ITEM* );
@ -95,6 +99,7 @@ static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
static PCB_TEXT* Cast_to_PCB_TEXT( BOARD_ITEM* );
static PCB_TEXTBOX* Cast_to_PCB_TEXTBOX( BOARD_ITEM* );
static PCB_DIM_ALIGNED* Cast_to_PCB_DIM_ALIGNED( BOARD_ITEM* );
static PCB_DIM_ORTHOGONAL* Cast_to_PCB_DIM_ORTHOGONAL( BOARD_ITEM* );
static PCB_DIM_LEADER* Cast_to_PCB_DIM_LEADER( BOARD_ITEM* );
@ -102,6 +107,7 @@ static PCB_DIM_CENTER* Cast_to_PCB_DIM_CENTER( BOARD_ITEM* );
static FOOTPRINT* Cast_to_FOOTPRINT( BOARD_ITEM* );
static PCB_GROUP* Cast_to_PCB_GROUP( BOARD_ITEM* );
static FP_TEXT* Cast_to_FP_TEXT( BOARD_ITEM* );
static FP_TEXTBOX* Cast_to_FP_TEXTBOX( BOARD_ITEM* );
static PCB_SHAPE* Cast_to_PCB_SHAPE( BOARD_ITEM* );
static PCB_MARKER* Cast_to_PCB_MARKER( BOARD_ITEM* );
static BOARD* Cast_to_BOARD( BOARD_ITEM* );
@ -123,8 +129,10 @@ static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
ct = self.GetClass()
if ct=="PTEXT":
if ct=="PCB_TEXT":
return Cast_to_PCB_TEXT(self)
if ct=="PCB_TEXTBOX":
return Cast_to_PCB_TEXTBOX(self)
elif ct=="BOARD":
return Cast_to_BOARD(self)
elif ct=="PCB_DIM_ALIGNED":
@ -145,8 +153,10 @@ static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
return Cast_to_PCB_GROUP(self)
elif ct=="PAD":
return Cast_to_PAD(self)
elif ct=="MTEXT":
elif ct=="FP_TEXT":
return Cast_to_FP_TEXT(self)
elif ct=="FP_TEXTBOX":
return Cast_to_FP_TEXTBOX(self)
elif ct=="PCB_VIA":
return Cast_to_PCB_VIA(self)
elif ct=="PCB_TRACK":
@ -186,6 +196,7 @@ static PCB_TARGET* Cast_to_PCB_TARGET( BOARD_ITEM* );
// the %header section. See section 5.6.2 of SWIG 3.0 documentation.
%wrapper %{
static PCB_TEXT* Cast_to_PCB_TEXT( BOARD_ITEM* self ) { return dynamic_cast<PCB_TEXT*>(self); }
static PCB_TEXTBOX* Cast_to_PCB_TEXTBOX( BOARD_ITEM* self ) { return dynamic_cast<PCB_TEXTBOX*>(self); }
static PCB_DIM_ALIGNED* Cast_to_PCB_DIM_ALIGNED( BOARD_ITEM* self ) { return dynamic_cast<PCB_DIM_ALIGNED *>(self); }
static PCB_DIM_ORTHOGONAL* Cast_to_PCB_DIM_ORTHOGONAL( BOARD_ITEM* self ) { return dynamic_cast<PCB_DIM_ORTHOGONAL *>(self); }
static PCB_DIM_LEADER* Cast_to_PCB_DIM_LEADER( BOARD_ITEM* self ) { return dynamic_cast<PCB_DIM_LEADER *>(self); }
@ -193,6 +204,7 @@ static PCB_DIM_CENTER* Cast_to_PCB_DIM_CENTER( BOARD_ITEM* self ) {
static FOOTPRINT* Cast_to_FOOTPRINT( BOARD_ITEM* self ) { return dynamic_cast<FOOTPRINT*>(self); }
static PCB_GROUP* Cast_to_PCB_GROUP( BOARD_ITEM* self ) { return dynamic_cast<PCB_GROUP*>(self); }
static FP_TEXT* Cast_to_FP_TEXT( BOARD_ITEM* self ) { return dynamic_cast<FP_TEXT*>(self); }
static FP_TEXTBOX* Cast_to_FP_TEXTBOX( BOARD_ITEM* self ) { return dynamic_cast<FP_TEXTBOX*>(self); }
static PCB_SHAPE* Cast_to_PCB_SHAPE( BOARD_ITEM* self ) { return dynamic_cast<PCB_SHAPE*>(self); }
static PCB_MARKER* Cast_to_PCB_MARKER( BOARD_ITEM* self ) { return dynamic_cast<PCB_MARKER*>(self); }
static BOARD* Cast_to_BOARD( BOARD_ITEM* self ) { return dynamic_cast<BOARD*>(self); }

2
pcbnew/python/swig/fp_text.i
View File

@ -1,6 +1,8 @@
%include fp_text.h
%include fp_textbox.h
%{
#include <fp_text.h>
#include <fp_textbox.h>
%}

2
pcbnew/python/swig/pcb_text.i
View File

@ -1,7 +1,9 @@
%include pcb_text.h
%include pcb_textbox.h
%{
#include <pcb_text.h>
#include <pcb_textbox.h>
%}

2
qa/testcases/test_001_pcb_load.py
View File

@ -54,7 +54,7 @@ class TestPCBLoad(unittest.TestCase):
def test_pcb_text(self):
drawings = list(self.pcb.GetDrawings())
text = [d for d in drawings if d.GetClass() == "PTEXT"]
text = [d for d in drawings if d.GetClass() == "PCB_TEXT"]
self.verify_text(text[0], 173355000, 68453000, pcbnew.F_Cu,
u'Actionneur\nPiezo New Amp\nV02')
self.verify_text(text[1], 176149000, 64643000, pcbnew.B_Cu,