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

Eagle Converter: Adjust arcs to use error-based alg 

Implements the revised, difference-error based algorithm in the Eagle
arc import rather than using the hard-coded 32-segments/360°
This commit is contained in:
Seth Hillbrand 2018-03-26 10:39:23 -07:00
parent 1dd4af2972
commit 347f6daddc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/eagle_plugin.cpp
View File

@ -60,6 +60,7 @@ Load() TODO's
#include <fctsys.h> #include <fctsys.h>
#include <trigo.h> #include <trigo.h>
#include <macros.h> #include <macros.h>
#include <geometry/geometry_utils.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <properties.h> #include <properties.h>
#include <wx/filename.h> #include <wx/filename.h>
@ -74,9 +75,6 @@ Load() TODO's
#include <eagle_plugin.h> #include <eagle_plugin.h>
// KiCad doesn't currently have curved tracks, so we use high-def for zone
#define EAGLE_CURVE_DELTA ( 360.0 / ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF )
using namespace std; using namespace std;
@ -1784,6 +1782,7 @@ void EAGLE_PLUGIN::loadSignals( wxXmlNode* aSignals )
double angle = 0.0; double angle = 0.0;
double end_angle = 0.0; double end_angle = 0.0;
double radius = 0.0; double radius = 0.0;
double delta_angle = 0.0;
wxPoint center; wxPoint center;
int width = w.width.ToPcbUnits(); int width = w.width.ToPcbUnits();
@ -1804,9 +1803,12 @@ void EAGLE_PLUGIN::loadSignals( wxXmlNode* aSignals )
radius = sqrt( pow( center.x - kicad_x( w.x1 ), 2 ) + radius = sqrt( pow( center.x - kicad_x( w.x1 ), 2 ) +
pow( center.y - kicad_y( w.y1 ), 2 ) ); pow( center.y - kicad_y( w.y1 ), 2 ) );
delta_angle = angle / static_cast<double>( GetArcToSegmentCount(
static_cast<int>( rint( radius ) ), ARC_HIGH_DEF, *w.curve ) );
} }
while( fabs( angle ) > DEG2RAD( EAGLE_CURVE_DELTA ) ) while( fabs( angle ) > fabs( delta_angle ) )
{ {
wxASSERT( radius > 0.0 ); wxASSERT( radius > 0.0 );
wxPoint end( int( radius * cos( end_angle + angle ) + center.x ), wxPoint end( int( radius * cos( end_angle + angle ) + center.x ),
@ -1824,11 +1826,7 @@ void EAGLE_PLUGIN::loadSignals( wxXmlNode* aSignals )
m_board->m_Track.Insert( t, NULL ); m_board->m_Track.Insert( t, NULL );
start = end; start = end;
angle -= delta_angle;
if( angle < 0 )
angle += DEG2RAD( EAGLE_CURVE_DELTA );
else
angle -= DEG2RAD( EAGLE_CURVE_DELTA );
} }
TRACK* t = new TRACK( m_board ); TRACK* t = new TRACK( m_board );