Commit 9624d323 authored by jean-pierre charras's avatar jean-pierre charras

Pcbnew scripting: fix swig 3.03 compatibility

parents 846b2ae2 6a193155
...@@ -101,7 +101,7 @@ void FOOTPRINT_INFO::load() ...@@ -101,7 +101,7 @@ void FOOTPRINT_INFO::load()
std::auto_ptr<MODULE> m( fptable->FootprintLoad( m_nickname, m_fpname ) ); std::auto_ptr<MODULE> m( fptable->FootprintLoad( m_nickname, m_fpname ) );
m_pad_count = m->GetPadCount( MODULE::DO_NOT_INCLUDE_NPTH ); m_pad_count = m->GetPadCount( DO_NOT_INCLUDE_NPTH );
m_keywords = m->GetKeywords(); m_keywords = m->GetKeywords();
m_doc = m->GetDescription(); m_doc = m->GetDescription();
......
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:25:40 Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 20:57:19
BeginCmp BeginCmp
TimeStamp = /4549F4BE; TimeStamp = /4549F4BE;
...@@ -102,7 +102,7 @@ BeginCmp ...@@ -102,7 +102,7 @@ BeginCmp
TimeStamp = /48B4F266; TimeStamp = /48B4F266;
Reference = U1; Reference = U1;
ValeurCmp = ECC83; ValeurCmp = ECC83;
IdModule = Valves:VALVE-ECC-83-1; IdModule = Valves:VALVE-ECC-83-2;
EndCmp EndCmp
EndListe EndListe
This diff is collapsed.
(export (version D) (export (version D)
(design (design
(source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch) (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch)
(date "01/01/2015 18:25:50") (date "01/01/2015 20:57:24")
(tool "Eeschema (2014-12-31 BZR 5344)-product")) (tool "Eeschema (2014-12-31 BZR 5344)-product"))
(components (components
(comp (ref U1) (comp (ref U1)
(value ECC83) (value ECC83)
(footprint Valves:VALVE-ECC-83-1) (footprint Valves:VALVE-ECC-83-2)
(libsource (lib valves) (part ECC83)) (libsource (lib valves) (part ECC83))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 48B4F266)) (tstamp 48B4F266))
...@@ -95,18 +95,6 @@ ...@@ -95,18 +95,6 @@
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 54A58391))) (tstamp 54A58391)))
(libparts (libparts
(libpart (lib device) (part C)
(description "Condensateur non polarise")
(footprints
(fp SM*)
(fp C?)
(fp C1-1))
(fields
(field (name Reference) C)
(field (name Value) C))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib device) (part R) (libpart (lib device) (part R)
(description Resistance) (description Resistance)
(footprints (footprints
...@@ -138,6 +126,18 @@ ...@@ -138,6 +126,18 @@
(pin (num 7) (name G) (type input)) (pin (num 7) (name G) (type input))
(pin (num 8) (name K) (type BiDi)) (pin (num 8) (name K) (type BiDi))
(pin (num 9) (name F2) (type power_in)))) (pin (num 9) (name F2) (type power_in))))
(libpart (lib device) (part C)
(description "Condensateur non polarise")
(footprints
(fp SM*)
(fp C?)
(fp C1-1))
(fields
(field (name Reference) C)
(field (name Value) C))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib conn) (part CONN_1) (libpart (lib conn) (part CONN_1)
(description "1 pin") (description "1 pin")
(fields (fields
......
...@@ -5,25 +5,6 @@ LIBS:valves ...@@ -5,25 +5,6 @@ LIBS:valves
LIBS:conn LIBS:conn
LIBS:linear LIBS:linear
LIBS:regul LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:microcontrollers
LIBS:microchip
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:digital-audio
LIBS:philips
LIBS:display
LIBS:cypress
LIBS:siliconi
LIBS:contrib
LIBS:ecc83-pp_v2-cache LIBS:ecc83-pp_v2-cache
EELAYER 25 0 EELAYER 25 0
EELAYER END EELAYER END
...@@ -105,7 +86,7 @@ U 3 1 48B4F266 ...@@ -105,7 +86,7 @@ U 3 1 48B4F266
P 2000 6100 P 2000 6100
F 0 "U1" H 2130 6410 50 0000 C CNN F 0 "U1" H 2130 6410 50 0000 C CNN
F 1 "ECC83" H 2350 5800 50 0000 C CNN F 1 "ECC83" H 2350 5800 50 0000 C CNN
F 2 "Valves:VALVE-ECC-83-1" H 2450 5650 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-2" V 1750 6100 30 0000 C CNN
F 3 "" H 2000 6100 60 0001 C CNN F 3 "" H 2000 6100 60 0001 C CNN
3 2000 6100 3 2000 6100
1 0 0 -1 1 0 0 -1
...@@ -116,7 +97,7 @@ U 2 1 48B4F263 ...@@ -116,7 +97,7 @@ U 2 1 48B4F263
P 4950 4450 P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C CNN F 0 "U1" H 5080 4760 50 0000 C CNN
F 1 "ECC83" H 5150 4100 50 0000 C CNN F 1 "ECC83" H 5150 4100 50 0000 C CNN
F 2 "Valves:VALVE-ECC-83-1" H 5150 4000 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-2" H 5150 4000 30 0000 C CNN
F 3 "" H 4950 4450 60 0001 C CNN F 3 "" H 4950 4450 60 0001 C CNN
2 4950 4450 2 4950 4450
1 0 0 -1 1 0 0 -1
...@@ -127,7 +108,7 @@ U 1 1 48B4F256 ...@@ -127,7 +108,7 @@ U 1 1 48B4F256
P 5750 4450 P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C CNN F 0 "U1" H 5880 4760 50 0000 C CNN
F 1 "ECC83" H 5500 4150 50 0000 C CNN F 1 "ECC83" H 5500 4150 50 0000 C CNN
F 2 "Valves:VALVE-ECC-83-1" H 5750 3950 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-2" H 5750 3950 30 0000 C CNN
F 3 "" H 5750 4450 60 0001 C CNN F 3 "" H 5750 4450 60 0001 C CNN
1 5750 4450 1 5750 4450
-1 0 0 -1 -1 0 0 -1
...@@ -193,7 +174,7 @@ U 1 1 456A8ACC ...@@ -193,7 +174,7 @@ U 1 1 456A8ACC
P 2000 7100 P 2000 7100
F 0 "P4" V 1950 7100 40 0000 C CNN F 0 "P4" V 1950 7100 40 0000 C CNN
F 1 "CONN_2" V 2050 7100 40 0000 C CNN F 1 "CONN_2" V 2050 7100 40 0000 C CNN
F 2 "pin_array:pin_array_1x02" V 2150 7100 60 0000 C CNN F 2 "pin_array:pin_array_1x02" V 2150 7100 30 0000 C CNN
F 3 "" H 2000 7100 60 0001 C CNN F 3 "" H 2000 7100 60 0001 C CNN
1 2000 7100 1 2000 7100
0 1 1 0 0 1 1 0
...@@ -204,7 +185,7 @@ U 1 1 4549F4BE ...@@ -204,7 +185,7 @@ U 1 1 4549F4BE
P 6700 4050 P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L CNN F 0 "C1" H 6750 4150 50 0000 L CNN
F 1 "10uF" H 6450 4150 50 0000 L CNN F 1 "10uF" H 6450 4150 50 0000 L CNN
F 2 "discret:C2V10" H 6700 4050 60 0000 C CNN F 2 "discret:C2V10" H 6700 3950 30 0000 C CNN
F 3 "" H 6700 4050 60 0001 C CNN F 3 "" H 6700 4050 60 0001 C CNN
1 6700 4050 1 6700 4050
1 0 0 -1 1 0 0 -1
...@@ -237,7 +218,7 @@ U 1 1 4549F4A5 ...@@ -237,7 +218,7 @@ U 1 1 4549F4A5
P 7300 3950 P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C CNN F 0 "P3" V 7250 3950 40 0000 C CNN
F 1 "POWER" V 7350 3950 40 0000 C CNN F 1 "POWER" V 7350 3950 40 0000 C CNN
F 2 "pin_array:pin_array_1x02" H 7300 4150 60 0000 C CNN F 2 "pin_array:pin_array_1x02" V 7450 3950 30 0000 C CNN
F 3 "" H 7300 3950 60 0001 C CNN F 3 "" H 7300 3950 60 0001 C CNN
1 7300 3950 1 7300 3950
1 0 0 -1 1 0 0 -1
...@@ -248,7 +229,7 @@ U 1 1 4549F46C ...@@ -248,7 +229,7 @@ U 1 1 4549F46C
P 7300 4900 P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C CNN F 0 "P2" V 7250 4900 40 0000 C CNN
F 1 "OUT" V 7350 4900 40 0000 C CNN F 1 "OUT" V 7350 4900 40 0000 C CNN
F 2 "pin_array:pin_array_1x02" H 7300 5100 60 0000 C CNN F 2 "pin_array:pin_array_1x02" V 7450 4900 30 0000 C CNN
F 3 "" H 7300 4900 60 0001 C CNN F 3 "" H 7300 4900 60 0001 C CNN
1 7300 4900 1 7300 4900
1 0 0 -1 1 0 0 -1
...@@ -259,7 +240,7 @@ U 1 1 4549F464 ...@@ -259,7 +240,7 @@ U 1 1 4549F464
P 3800 4900 P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C CNN F 0 "P1" V 3750 4900 40 0000 C CNN
F 1 "IN" V 3850 4900 40 0000 C CNN F 1 "IN" V 3850 4900 40 0000 C CNN
F 2 "pin_array:pin_array_1x02" H 3750 4700 60 0000 C CNN F 2 "pin_array:pin_array_1x02" V 3950 4900 30 0000 C CNN
F 3 "" H 3800 4900 60 0001 C CNN F 3 "" H 3800 4900 60 0001 C CNN
1 3800 4900 1 3800 4900
-1 0 0 1 -1 0 0 1
...@@ -270,7 +251,7 @@ U 1 1 4549F3BE ...@@ -270,7 +251,7 @@ U 1 1 4549F3BE
P 6500 4800 P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L CNN F 0 "C2" H 6550 4900 50 0000 L CNN
F 1 "680nF" H 6550 4700 50 0000 L CNN F 1 "680nF" H 6550 4700 50 0000 L CNN
F 2 "discret:CP8" H 6400 4900 60 0000 C CNN F 2 "discret:CP8" V 6350 4800 30 0000 C CNN
F 3 "" H 6500 4800 60 0001 C CNN F 3 "" H 6500 4800 60 0001 C CNN
1 6500 4800 1 6500 4800
0 1 1 0 0 1 1 0
...@@ -314,7 +295,7 @@ U 1 1 4549F38A ...@@ -314,7 +295,7 @@ U 1 1 4549F38A
P 6300 4250 P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C CNN F 0 "R1" V 6380 4250 50 0000 C CNN
F 1 "1.5K" V 6300 4250 50 0000 C CNN F 1 "1.5K" V 6300 4250 50 0000 C CNN
F 2 "discret:R3" H 6400 4150 60 0000 C CNN F 2 "discret:R3" V 6450 4250 30 0000 C CNN
F 3 "" H 6300 4250 60 0001 C CNN F 3 "" H 6300 4250 60 0001 C CNN
1 6300 4250 1 6300 4250
1 0 0 -1 1 0 0 -1
......
...@@ -200,12 +200,12 @@ public: ...@@ -200,12 +200,12 @@ public:
* @param aColor = text color * @param aColor = text color
* @param aDrawMode = GR_OR, GR_XOR.., -1 to use the current mode. * @param aDrawMode = GR_OR, GR_XOR.., -1 to use the current mode.
* @param aDisplay_mode = LINE, FILLED or SKETCH * @param aDisplay_mode = LINE, FILLED or SKETCH
* @param aAnchor_color = anchor color ( UNSPECIFIED = do not draw anchor ). * @param aAnchor_color = anchor color ( UNSPECIFIED_COLOR = do not draw anchor ).
*/ */
void Draw( EDA_RECT* aClipBox, wxDC* aDC, void Draw( EDA_RECT* aClipBox, wxDC* aDC,
const wxPoint& aOffset, EDA_COLOR_T aColor, const wxPoint& aOffset, EDA_COLOR_T aColor,
GR_DRAWMODE aDrawMode, EDA_DRAW_MODE_T aDisplay_mode = LINE, GR_DRAWMODE aDrawMode, EDA_DRAW_MODE_T aDisplay_mode = LINE,
EDA_COLOR_T aAnchor_color = UNSPECIFIED_COLOR ); EDA_COLOR_T aAnchor_color = EDA_COLOR_T(UNSPECIFIED_COLOR) );
/** /**
* Convert the text shape to a list of segment * Convert the text shape to a list of segment
......
...@@ -52,6 +52,12 @@ class BOARD; ...@@ -52,6 +52,12 @@ class BOARD;
class MSG_PANEL_ITEM; class MSG_PANEL_ITEM;
enum INCLUDE_NPTH_T
{
DO_NOT_INCLUDE_NPTH = false,
INCLUDE_NPTH = true
};
/** /**
* Enum MODULE_ATTR_T * Enum MODULE_ATTR_T
* is the set of attributes allowed within a MODULE, using MODULE::SetAttributes() * is the set of attributes allowed within a MODULE, using MODULE::SetAttributes()
...@@ -425,12 +431,6 @@ public: ...@@ -425,12 +431,6 @@ public:
*/ */
D_PAD* GetPad( const wxPoint& aPosition, LSET aLayerMask = LSET::AllLayersMask() ); D_PAD* GetPad( const wxPoint& aPosition, LSET aLayerMask = LSET::AllLayersMask() );
enum INCLUDE_NPTH_T
{
DO_NOT_INCLUDE_NPTH = false,
INCLUDE_NPTH = true
};
/** /**
* GetPadCount * GetPadCount
* returns the number of pads. * returns the number of pads.
...@@ -439,7 +439,7 @@ public: ...@@ -439,7 +439,7 @@ public:
* non-plated through holes when false. * non-plated through holes when false.
* @return the number of pads according to \a aIncludeNPTH. * @return the number of pads according to \a aIncludeNPTH.
*/ */
unsigned GetPadCount( INCLUDE_NPTH_T aIncludeNPTH = INCLUDE_NPTH ) const; unsigned GetPadCount( INCLUDE_NPTH_T aIncludeNPTH = INCLUDE_NPTH_T( INCLUDE_NPTH ) ) const;
double GetArea() const { return m_Surface; } double GetArea() const { return m_Surface; }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%extend BOARD %extend BOARD
{ {
%pythoncode %pythoncode
{ %{
def GetModules(self): return self.m_Modules def GetModules(self): return self.m_Modules
def GetDrawings(self): return self.m_Drawings def GetDrawings(self): return self.m_Drawings
def GetTracks(self): return self.m_Track def GetTracks(self): return self.m_Track
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
def Add(self,item): def Add(self,item):
item.thisown=0 item.thisown=0
self.AddNative(item) self.AddNative(item)
} %}
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%extend MODULE %extend MODULE
{ {
%pythoncode %pythoncode
{ %{
#def SaveToLibrary(self,filename): #def SaveToLibrary(self,filename):
# return SaveModuleToLibrary(filename,self) # return SaveModuleToLibrary(filename,self)
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
elif type(itemC) in [ TEXTE_PCB, DIMENSION, TEXTE_MODULE, DRAWSEGMENT,EDGE_MODULE]: elif type(itemC) in [ TEXTE_PCB, DIMENSION, TEXTE_MODULE, DRAWSEGMENT,EDGE_MODULE]:
item.thisown = 0 item.thisown = 0
self.GraphicalItems().PushBack(item) self.GraphicalItems().PushBack(item)
} %}
} }
......
...@@ -37,9 +37,12 @@ if (len(lines)<4000): ...@@ -37,9 +37,12 @@ if (len(lines)<4000):
txt = "" txt = ""
for l in lines: for l in lines:
if l.startswith("if version_info >= (2,6,0):"): if l.startswith("if version_info >= (2,6,0):"): # ok with swig version <= 3.0.2
l = l.replace("version_info >= (2,6,0)","False") l = l.replace("version_info >= (2,6,0)","False")
doneOk = True doneOk = True
elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig version 3.0.3
l = l.replace("version_info >= (2, 6, 0)","False")
doneOk = True
elif l.startswith("if False:"): # it was already patched? elif l.startswith("if False:"): # it was already patched?
doneOk = True doneOk = True
txt = txt + l txt = txt + l
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
%extend DLIST %extend DLIST
{ {
%pythoncode %pythoncode
{ %{
class DLISTIter: class DLISTIter:
def __init__(self,aList): def __init__(self,aList):
self.last = aList # last item is the start of list self.last = aList # last item is the start of list
...@@ -63,5 +63,5 @@ ...@@ -63,5 +63,5 @@
def __iter__(self): def __iter__(self):
return self.DLISTIter(self) return self.DLISTIter(self)
} %}
} }
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
const char* Cast_to_CChar() { return (self->c_str()); } const char* Cast_to_CChar() { return (self->c_str()); }
%pythoncode %pythoncode
{ %{
# Get the char buffer of the UTF8 string # Get the char buffer of the UTF8 string
def GetChars(self): def GetChars(self):
...@@ -147,6 +147,6 @@ ...@@ -147,6 +147,6 @@
def __str__(self): def __str__(self):
return self.GetChars() return self.GetChars()
} %}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment