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

Fix build due to gdicmn removal 

My VS build state is in psuedo-outerspace mode atm that this worked before this haha
This commit is contained in:
Marek Roszko 2023-09-06 18:40:15 -04:00
parent a4d8c021aa
commit 8bcc4e52aa
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sch_plugins/altium/altium_parser_sch.cpp
View File

@ -299,8 +299,8 @@ ASCH_TEXT_FRAME::ASCH_TEXT_FRAME( const std::map<wxString, wxString>& aProps ) :
Location = VECTOR2I( ReadKiCadUnitFrac( aProps, "LOCATION.X" ),
-ReadKiCadUnitFrac( aProps, "LOCATION.Y" ) );
Size = wxSize( ReadKiCadUnitFrac( aProps, "CORNER.X" ) - Location.x,
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) - Location.y );
Size = VECTOR2I( ReadKiCadUnitFrac( aProps, "CORNER.X" ) - Location.x,
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) - Location.y );
Text = ALTIUM_PARSER::ReadString( aProps, "TEXT", "" );
Text.Replace( "~1", "\n", true );
@ -405,7 +405,7 @@ ASCH_ROUND_RECTANGLE::ASCH_ROUND_RECTANGLE( const std::map<wxString, wxString>&
TopRight = VECTOR2I( ReadKiCadUnitFrac( aProps, "CORNER.X" ),
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) );
CornerRadius = wxSize( ReadKiCadUnitFrac( aProps, "CORNERXRADIUS" ),
CornerRadius = VECTOR2I( ReadKiCadUnitFrac( aProps, "CORNERXRADIUS" ),
-ReadKiCadUnitFrac( aProps, "CORNERYRADIUS" ) );
}

4
eeschema/sch_plugins/altium/altium_parser_sch.h
View File

@ -382,7 +382,7 @@ struct ASCH_HYPERLINK : ASCH_LABEL
struct ASCH_TEXT_FRAME : ASCH_OWNER_INTERFACE
{
VECTOR2I Location;
wxSize Size;
VECTOR2I Size;
// have both coordinates, for convenience
VECTOR2I BottomLeft;
@ -464,7 +464,7 @@ struct ASCH_ROUND_RECTANGLE : ASCH_OWNER_INTERFACE, ASCH_FILL_INTERFACE, ASCH_BO
VECTOR2I BottomLeft;
VECTOR2I TopRight;
wxSize CornerRadius;
VECTOR2I CornerRadius;
bool IsTransparent;

6
eeschema/sch_plugins/altium/sch_altium_plugin.cpp
View File

@ -1804,14 +1804,14 @@ void SCH_ALTIUM_PLUGIN::ParseRoundRectangle( const std::map<wxString, wxString>&
LIB_SHAPE* rect = nullptr;
// If it is a circle, make it a circle
if( std::abs( elem.CornerRadius.GetX() )
if( std::abs( elem.CornerRadius.x )
>= std::abs( elem.TopRight.x - elem.BottomLeft.x ) / 2
&& std::abs( elem.CornerRadius.GetY() )
&& std::abs( elem.CornerRadius.y )
>= std::abs( elem.TopRight.y - elem.BottomLeft.y ) / 2 )
{
rect = new LIB_SHAPE( symbol, SHAPE_T::CIRCLE );
rect->SetPosition( GetLibEditPosition( ( sheetTopRight + sheetBottomLeft ) / 2 ) );
rect->SetEnd( VECTOR2I( rect->GetPosition().x + std::abs( elem.CornerRadius.GetX() ),
rect->SetEnd( VECTOR2I( rect->GetPosition().x + std::abs( elem.CornerRadius.x ),
rect->GetPosition().y ) );
}