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

Eeschema Eagle Import: Load labels as global or local depending on if the net is shared accross multiple eagle sheets. Test created kicad labels to check if they are on a wire, otherwise movethem to the nearest wire start, midpoint or end.

This commit is contained in:
Russell Oliver 2017-07-13 22:42:06 +10:00 committed by Maciej Suminski
parent dcdc66b79e
commit afa5ef0ca6
4 changed files with 235 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
eeschema/sch_eagle_plugin.cpp
View File

@ -43,7 +43,6 @@
#include <lib_text.h>
#include <sch_text.h>
#include <drawtxt.h>
#include <sch_marker.h>
#include <sch_bus_entry.h>
#include <eagle_parser.h>
@ -317,10 +316,39 @@ void SCH_EAGLE_PLUGIN::loadDrawing( wxXmlNode* aDrawingNode )
// TODO: handle settings nodes
// wxXmlNode* settings = drawingChildren["settings"]
// Load schematic
loadSchematic( drawingChildren["schematic"] );
}
void SCH_EAGLE_PLUGIN::countNets( wxXmlNode* aSchematicNode )
{
// Map all children into a readable dictionary
NODE_MAP schematicChildren = mapChildren( aSchematicNode );
// Loop through all the sheets
wxXmlNode* sheetNode = schematicChildren["sheets"]->GetChildren();
while( sheetNode )
{
NODE_MAP sheetChildren = mapChildren( sheetNode );
// Loop through all nets
// From the DTD: "Net is an electrical connection in a schematic."
wxXmlNode* netNode = getChildrenNodes( sheetChildren, "nets" );
while( netNode )
{
std::string netName = netNode->GetAttribute( "name" ).ToStdString();
if( m_NetCounts.count(netName) ) m_NetCounts[netName] = m_NetCounts[netName]+1;
else m_NetCounts[netName]=1;
// Get next net
netNode = netNode->GetNext();
}
sheetNode = sheetNode->GetNext();
}
}
void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
{
@ -366,6 +394,10 @@ void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
libraryNode = libraryNode->GetNext();
}
// find all nets and count how many sheets they appear on.
// local labels will be used for nets found only on that sheet.
countNets(aSchematicNode);
// Loop through all the sheets
wxXmlNode* sheetNode = schematicChildren["sheets"]->GetChildren();
@ -570,33 +602,42 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
// wxCHECK( screen, [>void<] );
while( currentSegment )
{
bool labelled = false; // has a label been added to this continously connected segment
NODE_MAP segmentChildren = mapChildren( currentSegment );
// Loop through all segment children
wxXmlNode* segmentAttribute = currentSegment->GetChildren();
// load wire nodes first
// label positions will then be tested for an underlying wire, since eagle labels can be seperated from the wire
DLIST<SCH_LINE> segmentWires;
segmentWires.SetOwnership( false );
while( segmentAttribute )
{
if( segmentAttribute->GetName() == "wire" )
{
segmentWires.Append( loadSignalWire( segmentAttribute ) );
}
segmentAttribute = segmentAttribute->GetNext();
}
segmentAttribute = currentSegment->GetChildren();
while( segmentAttribute )
{
wxString nodeName = segmentAttribute->GetName();
if( nodeName == "junction" )
{
// TODO: handle junctions attributes
segmentAttribute->GetAttribute( "x" );
segmentAttribute->GetAttribute( "y" );
screen->Append( loadJunction( segmentAttribute ) );
}
else if( nodeName == "label" )
{
// TODO: handle labels attributes
segmentAttribute->GetAttribute( "x" ); // REQUIRED
segmentAttribute->GetAttribute( "y" ); // REQUIRED
segmentAttribute->GetAttribute( "size" ); // REQUIRED
segmentAttribute->GetAttribute( "layer" ); // REQUIRED
segmentAttribute->GetAttribute( "font" ); // Defaults to "proportional"
segmentAttribute->GetAttribute( "ratio" ); // Defaults to "8"
segmentAttribute->GetAttribute( "rot" ); // Defaults to "R0"
segmentAttribute->GetAttribute( "xref" ); // Defaults to "no"
screen->Append( loadLabel( segmentAttribute, netName ) );
screen->Append( loadLabel( segmentAttribute, netName, segmentWires ) );
labelled = true;
}
else if( nodeName == "pinref" )
{
@ -605,24 +646,9 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
segmentAttribute->GetAttribute( "part" ); // REQUIRED
segmentAttribute->GetAttribute( "pin" ); // REQUIRED
}
else if( nodeName == "portref" )
{
// TODO: handle portref attributes
segmentAttribute->GetAttribute( "moduleinst" ); // REQUIRED
segmentAttribute->GetAttribute( "port" ); // REQUIRED
}
else if( nodeName == "wire" )
{
screen->Append( loadSignalWire( segmentAttribute ) );
}
else if( nodeName == "segment" )
{
// loadSegments( segmentAttribute );
}
else if( nodeName == "text" )
{
// TODO
// loadSegments( segmentAttribute );
// already handled;
}
else // DEFAULT
{
@ -634,6 +660,37 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
segmentAttribute = segmentAttribute->GetNext();
}
SCH_LINE* wire = segmentWires.begin();
if(labelled == false && wire != NULL )
{
if(m_NetCounts[netName.ToStdString()]>1){
std::unique_ptr<SCH_GLOBALLABEL> glabel( new SCH_GLOBALLABEL );
glabel->SetPosition( wire->GetStartPoint() );
glabel->SetText( netName);
glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
screen->Append( glabel.release() );
}
else
{
std::unique_ptr<SCH_LABEL> label( new SCH_LABEL );
label->SetPosition( wire->GetStartPoint() );
label->SetText( netName );
label->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
screen->Append( label.release() );
}
}
SCH_LINE* next_wire;
while( wire != NULL )
{
next_wire = wire->Next();
screen->Append( wire ) ;
wire = next_wire;
}
currentSegment = currentSegment->GetNext();
}
}
@ -674,23 +731,144 @@ SCH_JUNCTION* SCH_EAGLE_PLUGIN::loadJunction( wxXmlNode* aJunction )
}
SCH_GLOBALLABEL* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName )
{
std::unique_ptr<SCH_GLOBALLABEL> glabel( new SCH_GLOBALLABEL );
SCH_TEXT* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName, const DLIST< SCH_LINE >& segmentWires )
{
auto elabel = ELABEL( aLabelNode, aNetName );
glabel->SetPosition( wxPoint( elabel.x * EUNIT_TO_MIL, -elabel.y * EUNIT_TO_MIL ) );
glabel->SetText( elabel.netname );
glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
wxPoint elabelpos( elabel.x * EUNIT_TO_MIL, -elabel.y * EUNIT_TO_MIL );
glabel->SetLabelSpinStyle(0);
if( elabel.rot )
{
glabel->SetLabelSpinStyle( int( 360-elabel.rot->degrees / 90) % 4 );
if(elabel.rot->mirror && ( glabel->GetLabelSpinStyle() == 0 || glabel->GetLabelSpinStyle() == 2 )) glabel->SetLabelSpinStyle((glabel->GetLabelSpinStyle()+2)%4);
if(m_NetCounts[aNetName.ToStdString()]>1){
std::unique_ptr<SCH_GLOBALLABEL> glabel( new SCH_GLOBALLABEL );
glabel->SetPosition( elabelpos );
glabel->SetText( elabel.netname );
glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
glabel->SetLabelSpinStyle(0);
if( elabel.rot )
{
glabel->SetLabelSpinStyle( int( elabel.rot->degrees / 90) % 4 );
if(elabel.rot->mirror && ( glabel->GetLabelSpinStyle() == 0 || glabel->GetLabelSpinStyle() == 2 )) glabel->SetLabelSpinStyle((glabel->GetLabelSpinStyle()+2)%4);
}
SCH_LINE* wire;
SCH_LINE* next_wire;
bool labelOnWire = false;
auto glabelPosition = glabel->GetPosition();
for( wire = segmentWires.begin(); wire; wire = next_wire )
{
next_wire = wire->Next();
if( wire->HitTest( glabelPosition, 0) )
{
labelOnWire = true;
break;
}
}
wire = segmentWires.begin();
if( labelOnWire == false )
{
wxPoint newLabelPos = findNearestLinePoint(elabelpos, segmentWires);
if( wire )
{
glabel->SetPosition( newLabelPos );
}
}
return glabel.release();
}
return glabel.release();
else
{
std::unique_ptr<SCH_LABEL> label( new SCH_LABEL );
label->SetPosition(elabelpos);
label->SetText( elabel.netname );
label->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
label->SetLabelSpinStyle(0);
if( elabel.rot )
{
label->SetLabelSpinStyle( int( elabel.rot->degrees / 90) % 4 );
if(elabel.rot->mirror && ( label->GetLabelSpinStyle() == 0 || label->GetLabelSpinStyle() == 2 )) label->SetLabelSpinStyle((label->GetLabelSpinStyle()+2)%4);
}
SCH_LINE* wire;
SCH_LINE* next_wire;
bool labelOnWire = false;
auto labelPosition = label->GetPosition();
for( wire = segmentWires.begin(); wire; wire = next_wire )
{
next_wire = wire->Next();
if( wire->HitTest( labelPosition, 0) )
{
labelOnWire = true;
break;
}
}
wire = segmentWires.begin();
if( labelOnWire == false )
{
if( wire )
{
wxPoint newLabelPos = findNearestLinePoint( elabelpos , segmentWires);
label->SetPosition( newLabelPos );
}
}
return label.release();
}
}
wxPoint SCH_EAGLE_PLUGIN::findNearestLinePoint( const wxPoint aPoint, const DLIST< SCH_LINE >& lines)
{
wxPoint nearestPoint;
float mindistance = std::numeric_limits<float>::max();
float d;
SCH_LINE* line = lines.begin();
while( line != NULL )
{
auto testpoint = line->GetStartPoint();
d = sqrt( abs( ( (aPoint.x-testpoint.x)^2 ) + ( (aPoint.y-testpoint.y)^2 ) ) );
if( d < mindistance )
{
mindistance = d;
nearestPoint = testpoint;
}
testpoint = line->MidPoint();
d = sqrt( abs( ( (aPoint.x-testpoint.x)^2 ) + ( (aPoint.y-testpoint.y)^2 ) ) );
if( d < mindistance )
{
mindistance = d;
nearestPoint = testpoint;
}
testpoint = line->GetEndPoint();
d = sqrt( abs( ( (aPoint.x-testpoint.x)^2 ) + ( (aPoint.y-testpoint.y)^2 ) ) );
if( d < mindistance )
{
mindistance = d;
nearestPoint = testpoint;
}
line = line->Next();
}
return nearestPoint;
}
@ -959,9 +1137,7 @@ void SCH_EAGLE_PLUGIN::loadSymbol( wxXmlNode* aSymbolNode,
{
LIB_TEXT* libtext = loadSymboltext( aPart, currentNode );
libtext->SetUnit( gateNumber );
// TODO: Reimplement mandatory field positioning.
std::cout << libtext->GetText() << '\n';
if( libtext->GetText() ==">NAME" )
{
aPart->GetField( REFERENCE )->SetTextPos( libtext->GetPosition() );

7
eeschema/sch_eagle_plugin.h
View File

@ -27,6 +27,7 @@
#include <sch_io_mgr.h>
#include <eagle_parser.h>
#include <lib_draw_item.h>
#include <dlist.h>
class KIWAY;
class LINE_READER;
@ -133,12 +134,15 @@ private:
void loadInstance( wxXmlNode* aInstanceNode );
void loadModuleinst( wxXmlNode* aModuleinstNode );
EAGLE_LIBRARY* loadLibrary( wxXmlNode* aLibraryNode );
void countNets( wxXmlNode* aSchematicNode );
void addBusEntries();
wxPoint findNearestLinePoint(wxPoint aPoint, const DLIST< SCH_LINE >& lines);
void loadSegments( wxXmlNode* aSegmentsNode, const wxString& aNetName,
const wxString& aNetClass );
SCH_LINE* loadSignalWire( wxXmlNode* aWireNode );
SCH_GLOBALLABEL* loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName );
SCH_TEXT* loadLabel( wxXmlNode* aLabelNode, const wxString& aNetName, const DLIST< SCH_LINE >& segmentWires);
SCH_JUNCTION* loadJunction( wxXmlNode* aJunction );
SCH_TEXT* loadplaintext( wxXmlNode* aSchText );
@ -161,6 +165,7 @@ private:
std::map<std::string, EAGLE_LIBRARY*> m_eaglelibraries;
EDA_RECT sheetBoundingBox;
std::map<std::string, int > m_NetCounts;
protected:

6
eeschema/sch_line.cpp
View File

@ -598,3 +598,9 @@ void SCH_LINE::SetPosition( const wxPoint& aPosition )
m_end = m_end - ( m_start - aPosition );
m_start = aPosition;
}
wxPoint SCH_LINE::MidPoint()
{
return wxPoint( (m_start.x+m_end.x)/2.0, (m_start.y+m_end.y)/2.0 );
}

2
eeschema/sch_line.h
View File

@ -143,6 +143,8 @@ public:
void Plot( PLOTTER* aPlotter ) override;
wxPoint MidPoint();
EDA_ITEM* Clone() const override;
#if defined(DEBUG)