From d41fe9d567f424bb283bc79ea79c6a322133a376 Mon Sep 17 00:00:00 2001 From: Russell Oliver Date: Mon, 17 Jul 2017 02:18:17 +1000 Subject: [PATCH] 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. --- eeschema/sch_eagle_plugin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_eagle_plugin.cpp index 6256d42cbb..33c25abcc6 100644 --- a/eeschema/sch_eagle_plugin.cpp +++ b/eeschema/sch_eagle_plugin.cpp @@ -655,6 +655,8 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n wxXmlNode* currentSegment = aSegmentsNode->GetChildren(); SCH_SCREEN* screen = m_currentSheet->GetScreen(); + int segmentCount = countChildren(aSegmentsNode, "segment"); + // wxCHECK( screen, [>void<] ); while( currentSegment ) { @@ -718,7 +720,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n SCH_LINE* wire = segmentWires.begin(); - + /* if(labelled == false && wire != NULL ) { wxString netname = netName; @@ -730,7 +732,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) ); screen->Append( glabel.release() ); } - else + else if ( segmentCount > 1) { std::unique_ptr label( new SCH_LABEL ); label->SetPosition( wire->GetStartPoint() ); @@ -739,6 +741,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n screen->Append( label.release() ); } } + */ SCH_LINE* next_wire;