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

Eeschema Eagle Import: Disable label creation for unlabeled nets, may have to be renabled for edge cases where a multi segment net is unlabled in Eagle but which would not be connected in Kicad.

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

7
eeschema/sch_eagle_plugin.cpp
View File

@ -655,6 +655,8 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
wxXmlNode* currentSegment = aSegmentsNode->GetChildren(); wxXmlNode* currentSegment = aSegmentsNode->GetChildren();
SCH_SCREEN* screen = m_currentSheet->GetScreen(); SCH_SCREEN* screen = m_currentSheet->GetScreen();
int segmentCount = countChildren(aSegmentsNode, "segment");
// wxCHECK( screen, [>void<] ); // wxCHECK( screen, [>void<] );
while( currentSegment ) while( currentSegment )
{ {
@ -718,7 +720,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
SCH_LINE* wire = segmentWires.begin(); SCH_LINE* wire = segmentWires.begin();
/*
if(labelled == false && wire != NULL ) if(labelled == false && wire != NULL )
{ {
wxString netname = netName; wxString netname = netName;
@ -730,7 +732,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) ); glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
screen->Append( glabel.release() ); screen->Append( glabel.release() );
} }
else else if ( segmentCount > 1)
{ {
std::unique_ptr<SCH_LABEL> label( new SCH_LABEL ); std::unique_ptr<SCH_LABEL> label( new SCH_LABEL );
label->SetPosition( wire->GetStartPoint() ); label->SetPosition( wire->GetStartPoint() );
@ -739,6 +741,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
screen->Append( label.release() ); screen->Append( label.release() );
} }
} }
*/
SCH_LINE* next_wire; SCH_LINE* next_wire;