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

Eeschema Eagle Import: Parse plain wires as lines on the notes layer.

This commit is contained in:
Russell Oliver 2017-07-17 02:18:58 +10:00 committed by Maciej Suminski
parent d41fe9d567
commit 7f8ac1cf02
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/sch_eagle_plugin.cpp
View File

@ -147,7 +147,7 @@ static SCH_LAYER_ID kicadLayer( int aEagleLayer )
break; break;
case 97: case 97:
break; return LAYER_NOTES;
case 98: case 98:
break; break;
@ -593,10 +593,14 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode )
{ {
wxString nodeName = plainNode->GetName(); wxString nodeName = plainNode->GetName();
if( nodeName =="text" ) if( nodeName == "text" )
{ {
m_currentSheet->GetScreen()->Append( loadplaintext( plainNode ) ); m_currentSheet->GetScreen()->Append( loadplaintext( plainNode ) );
} }
else if( nodeName == "wire" )
{
m_currentSheet->GetScreen()->Append( loadWire( plainNode ) );
}
plainNode = plainNode->GetNext(); plainNode = plainNode->GetNext();
} }
@ -676,7 +680,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
{ {
if( segmentAttribute->GetName() == "wire" ) if( segmentAttribute->GetName() == "wire" )
{ {
segmentWires.Append( loadSignalWire( segmentAttribute ) ); segmentWires.Append( loadWire( segmentAttribute ) );
} }
segmentAttribute = segmentAttribute->GetNext(); segmentAttribute = segmentAttribute->GetNext();
@ -757,7 +761,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
} }
SCH_LINE* SCH_EAGLE_PLUGIN::loadSignalWire( wxXmlNode* aWireNode ) SCH_LINE* SCH_EAGLE_PLUGIN::loadWire( wxXmlNode* aWireNode )
{ {
std::unique_ptr<SCH_LINE> wire( new SCH_LINE ); std::unique_ptr<SCH_LINE> wire( new SCH_LINE );
@ -1202,11 +1206,13 @@ void SCH_EAGLE_PLUGIN::loadSymbol( wxXmlNode* aSymbolNode,
{ {
if( connect.gate == gateName and pin->GetName().ToStdString() == connect.pin ) if( connect.gate == gateName and pin->GetName().ToStdString() == connect.pin )
{ {
wxString padname( connect.pad ); wxString padname( connect.pad );
pin->SetPinNumFromString( padname ); pin->SetPinNumFromString( padname );
pin->SetPartNumber( gateNumber ); pin->SetPartNumber( gateNumber );
pin->SetUnit( gateNumber ); pin->SetUnit( gateNumber );
string pinname = pin->GetName().ToStdString(); string pinname = pin->GetName().ToStdString();
if(pinname[0] == '!'){ if(pinname[0] == '!'){
pinname[0] = '~'; pinname[0] = '~';

2
eeschema/sch_eagle_plugin.h
View File

@ -141,7 +141,7 @@ private:
void loadSegments( wxXmlNode* aSegmentsNode, const wxString& aNetName, void loadSegments( wxXmlNode* aSegmentsNode, const wxString& aNetName,
const wxString& aNetClass ); const wxString& aNetClass );
SCH_LINE* loadSignalWire( wxXmlNode* aWireNode ); SCH_LINE* loadWire( wxXmlNode* aWireNode );
SCH_TEXT* loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName, const DLIST< SCH_LINE >& segmentWires); SCH_TEXT* loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName, const DLIST< SCH_LINE >& segmentWires);
SCH_JUNCTION* loadJunction( wxXmlNode* aJunction ); SCH_JUNCTION* loadJunction( wxXmlNode* aJunction );
SCH_TEXT* loadplaintext( wxXmlNode* aSchText ); SCH_TEXT* loadplaintext( wxXmlNode* aSchText );