diff --git a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp index 0c7c75c974..78338ef9e0 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp @@ -84,7 +84,7 @@ BOARD* PCAD_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, const P LOCALE_IO toggle; // toggles on, then off, the C locale. LoadInputFile( aFileName, &xmlDoc ); - pcb.Parse( NULL, &xmlDoc, wxT( "PCB" ) ); + pcb.ParseBoard( NULL, &xmlDoc, wxT( "PCB" ) ); pcb.AddToBoard(); return m_board; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb.cpp index 67a360899d..8b9535b66e 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcb.cpp @@ -666,7 +666,7 @@ void PCB::GetBoardOutline( wxXmlDocument* aXmlDoc, wxString aActualConversion ) } } -void PCB::Parse( wxStatusBar* aStatusBar, wxXmlDocument* aXmlDoc, wxString aActualConversion ) +void PCB::ParseBoard( wxStatusBar* aStatusBar, wxXmlDocument* aXmlDoc, wxString aActualConversion ) { XNODE* aNode;//, *aaNode; PCB_NET* net; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb.h b/pcbnew/pcad2kicadpcb_plugin/pcb.h index 97f6f98ad9..a8cfdf3029 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb.h @@ -59,9 +59,9 @@ public: int GetNewTimestamp() override; int GetNetCode( wxString aNetName ) override; - void Parse( wxStatusBar* aStatusBar, + void ParseBoard( wxStatusBar* aStatusBar, wxXmlDocument* aXmlDoc, - wxString aActualConversion ); + wxString aActualConversion ); void AddToBoard() override; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.cpp index 16c7c220fa..3d60888b09 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.cpp @@ -52,19 +52,12 @@ PCB_COPPER_POUR::~PCB_COPPER_POUR() bool PCB_COPPER_POUR::Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ) + wxString aActualConversion ) { XNODE* lNode; wxString pourType, str, propValue; int pourSpacing, thermalWidth; - // aStatusBar->SetStatusText( aStatusBar->GetStatusText() + wxT( " CooperPour..." ) ); - - //str = FindNode( aNode, wxT( "pourType" ) )->GetNodeContent(); - //str.Trim( false ); - //pourType = str.MakeUpper(); - lNode = FindNode( aNode, wxT( "netNameRef" ) ); if( lNode ) diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h index 5de462efcf..b556fa8b41 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_copper_pour.h @@ -45,8 +45,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ) override; + wxString aActualConversion ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_cutout.h b/pcbnew/pcad2kicadpcb_plugin/pcb_cutout.h index 9f8fa6be96..1265df2edb 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_cutout.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_cutout.h @@ -45,7 +45,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString actualConversion ); + wxString aActualConversion ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_module.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb_module.cpp index be3304ac0c..849bcb048d 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_module.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_module.cpp @@ -327,8 +327,7 @@ void PCB_MODULE::DoLayerContentsObjects( XNODE* aNode, polygon = new PCB_POLYGON( m_callbacks, m_board, PCadLayer ); if( polygon->Parse( lNode, aDefaultMeasurementUnit, - aActualConversion, - aStatusBar ) ) + aActualConversion ) ) aList->Add( polygon ); else delete polygon; @@ -339,8 +338,7 @@ void PCB_MODULE::DoLayerContentsObjects( XNODE* aNode, { copperPour = new PCB_COPPER_POUR( m_callbacks, m_board, PCadLayer ); - if( copperPour->Parse( lNode, aDefaultMeasurementUnit, aActualConversion, - aStatusBar ) ) + if( copperPour->Parse( lNode, aDefaultMeasurementUnit, aActualConversion ) ) aList->Add( copperPour ); else delete copperPour; @@ -360,8 +358,7 @@ void PCB_MODULE::DoLayerContentsObjects( XNODE* aNode, { plane = new PCB_PLANE( m_callbacks, m_board, PCadLayer ); - if( plane->Parse( lNode, aDefaultMeasurementUnit, aActualConversion, - aStatusBar ) ) + if( plane->Parse( lNode, aDefaultMeasurementUnit, aActualConversion ) ) aList->Add( plane ); else delete plane; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h b/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h index 87e9fccf81..3bf76ddc8d 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_pad.h @@ -52,6 +52,10 @@ public: wxString aDefaultMeasurementUnit, wxString aActualConversion ); virtual void Flip() override; + void AddToModule( MODULE* aModule ) override + { + AddToModule( aModule, 0, true ); + } void AddToModule( MODULE* aModule, int aRotation, bool aEncapsulatedPad ); void AddToBoard() override; diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.cpp index be89e50e0a..29e8b2bbaf 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.cpp @@ -51,14 +51,11 @@ PCB_PLANE::~PCB_PLANE() bool PCB_PLANE::Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ) + wxString aActualConversion ) { XNODE* lNode; wxString pourType, str, propValue; - // aStatusBar->SetStatusText( aStatusBar->GetStatusText() + wxT( " Plane..." ) ); - lNode = FindNode( aNode, wxT( "netNameRef" ) ); if( lNode ) diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h index 95fbab4f3c..93a8524fcf 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_plane.h @@ -44,8 +44,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ) override; + wxString aActualConversion ) override; }; } // namespace PCAD2KICAD diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.cpp b/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.cpp index 9a5f2530bb..d3fb6bd9b9 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.cpp +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.cpp @@ -125,14 +125,11 @@ void PCB_POLYGON::FormPolygon( XNODE* aNode, VERTICES_ARRAY* aPolygon, bool PCB_POLYGON::Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ) + wxString aActualConversion ) { XNODE* lNode; wxString propValue; - // aStatusBar->SetStatusText( aStatusBar->GetStatusText() + wxT( " Polygon..." ) ); - lNode = FindNode( aNode, wxT( "netNameRef" ) ); if( lNode ) diff --git a/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.h b/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.h index a37be8fc54..fe35832894 100644 --- a/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.h +++ b/pcbnew/pcad2kicadpcb_plugin/pcb_polygon.h @@ -53,8 +53,7 @@ public: virtual bool Parse( XNODE* aNode, wxString aDefaultMeasurementUnit, - wxString aActualConversion, - wxStatusBar* aStatusBar ); + wxString aActualConversion ); virtual void SetPosOffset( int aX_offs, int aY_offs ) override; void AddToModule( MODULE* aModule ) override;