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

Eagle's coord system matched the old Symbol Editor. 

So now we need to invert the Y axis for symbol items
(as well as all the schematic items which we have always done).
This commit is contained in:
Jeff Young 2024-05-03 14:48:06 +01:00
parent 6b0a20eac0
commit e7f4e29dd1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/sch_io/eagle/sch_io_eagle.cpp
View File

@ -2287,7 +2287,7 @@ SCH_SHAPE* SCH_IO_EAGLE::loadSymbolCircle( wxXmlNode* aCircleNode, int aGateNumb
// Parse the circle properties // Parse the circle properties
ECIRCLE c( aCircleNode ); ECIRCLE c( aCircleNode );
SCH_SHAPE* circle = new SCH_SHAPE( SHAPE_T::CIRCLE, LAYER_DEVICE ); SCH_SHAPE* circle = new SCH_SHAPE( SHAPE_T::CIRCLE, LAYER_DEVICE );
VECTOR2I center( c.x.ToSchUnits(), c.y.ToSchUnits() ); VECTOR2I center( c.x.ToSchUnits(), -c.y.ToSchUnits() );
circle->SetPosition( center ); circle->SetPosition( center );
circle->SetEnd( VECTOR2I( center.x + c.radius.ToSchUnits(), center.y ) ); circle->SetEnd( VECTOR2I( center.x + c.radius.ToSchUnits(), center.y ) );
@ -2303,8 +2303,8 @@ SCH_SHAPE* SCH_IO_EAGLE::loadSymbolRectangle( wxXmlNode* aRectNode, int aGateNum
ERECT rect( aRectNode ); ERECT rect( aRectNode );
SCH_SHAPE* rectangle = new SCH_SHAPE( SHAPE_T::RECTANGLE, LAYER_DEVICE ); SCH_SHAPE* rectangle = new SCH_SHAPE( SHAPE_T::RECTANGLE, LAYER_DEVICE );
rectangle->SetPosition( VECTOR2I( rect.x1.ToSchUnits(), rect.y1.ToSchUnits() ) ); rectangle->SetPosition( VECTOR2I( rect.x1.ToSchUnits(), -rect.y1.ToSchUnits() ) );
rectangle->SetEnd( VECTOR2I( rect.x2.ToSchUnits(), rect.y2.ToSchUnits() ) ); rectangle->SetEnd( VECTOR2I( rect.x2.ToSchUnits(), -rect.y2.ToSchUnits() ) );
if( rect.rot ) if( rect.rot )
{ {
@ -2335,9 +2335,9 @@ SCH_ITEM* SCH_IO_EAGLE::loadSymbolWire( wxXmlNode* aWireNode, int aGateNumber )
VECTOR2I begin, end; VECTOR2I begin, end;
begin.x = ewire.x1.ToSchUnits(); begin.x = ewire.x1.ToSchUnits();
begin.y = ewire.y1.ToSchUnits(); begin.y = -ewire.y1.ToSchUnits();
end.x = ewire.x2.ToSchUnits(); end.x = ewire.x2.ToSchUnits();
end.y = ewire.y2.ToSchUnits(); end.y = -ewire.y2.ToSchUnits();
if( begin == end ) if( begin == end )
return nullptr; return nullptr;
@ -2398,7 +2398,7 @@ SCH_SHAPE* SCH_IO_EAGLE::loadSymbolPolyLine( wxXmlNode* aPolygonNode, int aGateN
if( vertex->GetName() == wxT( "vertex" ) ) // skip <xmlattr> node if( vertex->GetName() == wxT( "vertex" ) ) // skip <xmlattr> node
{ {
EVERTEX evertex( vertex ); EVERTEX evertex( vertex );
pt = VECTOR2I( evertex.x.ToSchUnits(), evertex.y.ToSchUnits() ); pt = VECTOR2I( evertex.x.ToSchUnits(), -evertex.y.ToSchUnits() );
if( prev_curve ) if( prev_curve )
{ {
@ -2430,7 +2430,7 @@ SCH_PIN* SCH_IO_EAGLE::loadPin( std::unique_ptr<LIB_SYMBOL>& aSymbol, wxXmlNode*
EPIN* aEPin, int aGateNumber ) EPIN* aEPin, int aGateNumber )
{ {
std::unique_ptr<SCH_PIN> pin = std::make_unique<SCH_PIN>( aSymbol.get() ); std::unique_ptr<SCH_PIN> pin = std::make_unique<SCH_PIN>( aSymbol.get() );
pin->SetPosition( VECTOR2I( aEPin->x.ToSchUnits(), aEPin->y.ToSchUnits() ) ); pin->SetPosition( VECTOR2I( aEPin->x.ToSchUnits(), -aEPin->y.ToSchUnits() ) );
pin->SetName( aEPin->name ); pin->SetName( aEPin->name );
pin->SetUnit( aGateNumber ); pin->SetUnit( aGateNumber );
@ -2506,7 +2506,7 @@ SCH_PIN* SCH_IO_EAGLE::loadPin( std::unique_ptr<LIB_SYMBOL>& aSymbol, wxXmlNode*
SCH_TEXT* SCH_IO_EAGLE::loadSymbolText( wxXmlNode* aLibText, int aGateNumber ) SCH_TEXT* SCH_IO_EAGLE::loadSymbolText( wxXmlNode* aLibText, int aGateNumber )
{ {
ETEXT etext( aLibText ); ETEXT etext( aLibText );
VECTOR2I pos( etext.x.ToSchUnits(), etext.y.ToSchUnits() ); VECTOR2I pos( etext.x.ToSchUnits(), -etext.y.ToSchUnits() );
const wxString& eagleText = aLibText->GetNodeContent(); const wxString& eagleText = aLibText->GetNodeContent();
wxString adjustedText; wxString adjustedText;
wxStringTokenizer tokenizer( eagleText, "\r\n" ); wxStringTokenizer tokenizer( eagleText, "\r\n" );
@ -2540,8 +2540,8 @@ void SCH_IO_EAGLE::loadSymbolFrame( wxXmlNode* aFrameNode, std::vector<SCH_ITEM*
int xMin = eframe.x1.ToSchUnits(); int xMin = eframe.x1.ToSchUnits();
int xMax = eframe.x2.ToSchUnits(); int xMax = eframe.x2.ToSchUnits();
int yMin = eframe.y1.ToSchUnits(); int yMin = -eframe.y1.ToSchUnits();
int yMax = eframe.y2.ToSchUnits(); int yMax = -eframe.y2.ToSchUnits();
if( xMin > xMax ) if( xMin > xMax )
std::swap( xMin, xMax ); std::swap( xMin, xMax );