2021-07-14 20:03:32 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
|
|
|
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
2021-10-25 19:50:33 +00:00
|
|
|
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
|
2022-01-14 08:40:15 +00:00
|
|
|
* Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
|
2021-07-14 20:03:32 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <bezier_curves.h>
|
|
|
|
#include <base_units.h>
|
2021-10-25 19:50:33 +00:00
|
|
|
#include <convert_basic_shapes_to_polygon.h>
|
2021-07-14 20:03:32 +00:00
|
|
|
#include <eda_draw_frame.h>
|
|
|
|
#include <geometry/shape_simple.h>
|
|
|
|
#include <geometry/shape_segment.h>
|
|
|
|
#include <geometry/shape_circle.h>
|
|
|
|
#include <macros.h>
|
|
|
|
#include <math/util.h> // for KiROUND
|
|
|
|
#include <eda_shape.h>
|
2021-10-14 23:39:31 +00:00
|
|
|
#include <plotters/plotter.h>
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-08-27 11:37:43 +00:00
|
|
|
EDA_SHAPE::EDA_SHAPE( SHAPE_T aType, int aLineWidth, FILL_T aFill ) :
|
2022-01-16 23:54:59 +00:00
|
|
|
m_endsSwapped( false ),
|
|
|
|
m_shape( aType ),
|
|
|
|
m_stroke( aLineWidth, PLOT_DASH_TYPE::DEFAULT, COLOR4D::UNSPECIFIED ),
|
|
|
|
m_fill( aFill ),
|
|
|
|
m_fillColor( COLOR4D::UNSPECIFIED ),
|
2022-09-14 23:45:03 +00:00
|
|
|
m_editState( 0 ),
|
|
|
|
m_annotationProxy( false )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
EDA_SHAPE::~EDA_SHAPE()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wxString EDA_SHAPE::ShowShape() const
|
|
|
|
{
|
2022-09-14 10:34:10 +00:00
|
|
|
if( IsAnnotationProxy() )
|
|
|
|
return _( "Number Box" );
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::SEGMENT: return _( "Line" );
|
|
|
|
case SHAPE_T::RECT: return _( "Rect" );
|
|
|
|
case SHAPE_T::ARC: return _( "Arc" );
|
|
|
|
case SHAPE_T::CIRCLE: return _( "Circle" );
|
|
|
|
case SHAPE_T::BEZIER: return _( "Bezier Curve" );
|
|
|
|
case SHAPE_T::POLY: return _( "Polygon" );
|
|
|
|
default: return wxT( "??" );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wxString EDA_SHAPE::SHAPE_T_asString() const
|
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::SEGMENT: return "S_SEGMENT";
|
|
|
|
case SHAPE_T::RECT: return "S_RECT";
|
|
|
|
case SHAPE_T::ARC: return "S_ARC";
|
|
|
|
case SHAPE_T::CIRCLE: return "S_CIRCLE";
|
|
|
|
case SHAPE_T::POLY: return "S_POLYGON";
|
|
|
|
case SHAPE_T::BEZIER: return "S_CURVE";
|
|
|
|
case SHAPE_T::LAST: return "!S_LAST!"; // Synthetic value, but if we come across it then
|
|
|
|
// we're going to want to know.
|
|
|
|
}
|
|
|
|
|
|
|
|
return wxEmptyString; // Just to quiet GCC.
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::setPosition( const VECTOR2I& aPos )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
move( aPos - getPosition() );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I EDA_SHAPE::getPosition() const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
if( m_shape == SHAPE_T::ARC )
|
|
|
|
return getCenter();
|
|
|
|
else if( m_shape == SHAPE_T::POLY )
|
2022-01-01 06:04:08 +00:00
|
|
|
return m_poly.CVertex( 0 );
|
2021-07-14 20:03:32 +00:00
|
|
|
else
|
|
|
|
return m_start;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double EDA_SHAPE::GetLength() const
|
|
|
|
{
|
|
|
|
double length = 0.0;
|
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
for( size_t ii = 1; ii < m_bezierPoints.size(); ++ii )
|
|
|
|
length += GetLineLength( m_bezierPoints[ ii - 1], m_bezierPoints[ii] );
|
|
|
|
|
|
|
|
return length;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
return GetLineLength( GetStart(), GetEnd() );
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
for( int ii = 0; ii < m_poly.COutline( 0 ).SegmentCount(); ii++ )
|
|
|
|
length += m_poly.COutline( 0 ).CSegment( ii ).Length();
|
|
|
|
|
|
|
|
return length;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
2022-01-14 15:34:41 +00:00
|
|
|
return GetRadius() * GetArcAngle().AsRadians();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-11-27 18:29:41 +00:00
|
|
|
bool EDA_SHAPE::IsClosed() const
|
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
return false;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
if( m_poly.IsEmpty() )
|
|
|
|
return false;
|
|
|
|
else
|
|
|
|
return m_poly.Outline( 0 ).IsClosed();
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
if( m_bezierPoints.size() < 3 )
|
|
|
|
return false;
|
|
|
|
else
|
|
|
|
return m_bezierPoints[0] == m_bezierPoints[ m_bezierPoints.size() - 1 ];
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::move( const VECTOR2I& aMoveVector )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
switch ( m_shape )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::ARC:
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
2021-07-14 20:03:32 +00:00
|
|
|
m_start += aMoveVector;
|
|
|
|
m_end += aMoveVector;
|
2021-07-17 19:56:18 +00:00
|
|
|
m_arcCenter += aMoveVector;
|
|
|
|
break;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
m_poly.Move( VECTOR2I( aMoveVector ) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
2021-07-17 19:56:18 +00:00
|
|
|
m_start += aMoveVector;
|
|
|
|
m_end += aMoveVector;
|
2021-07-14 20:03:32 +00:00
|
|
|
m_bezierC1 += aMoveVector;
|
|
|
|
m_bezierC2 += aMoveVector;
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( VECTOR2I& pt : m_bezierPoints )
|
2021-07-14 20:03:32 +00:00
|
|
|
pt += aMoveVector;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void EDA_SHAPE::scale( double aScale )
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
auto scalePt = [&]( VECTOR2I& pt )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
pt.x = KiROUND( pt.x * aScale );
|
|
|
|
pt.y = KiROUND( pt.y * aScale );
|
|
|
|
};
|
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
scalePt( m_start );
|
|
|
|
scalePt( m_end );
|
|
|
|
scalePt( m_arcCenter );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::CIRCLE: // ring or circle
|
2021-07-17 19:56:18 +00:00
|
|
|
scalePt( m_start );
|
2021-07-18 23:08:54 +00:00
|
|
|
m_end.x = m_start.x + KiROUND( GetRadius() * aScale );
|
2021-07-14 20:03:32 +00:00
|
|
|
m_end.y = m_start.y;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY: // polygon
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
for( int ii = 0; ii < m_poly.OutlineCount(); ++ ii )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-11-09 00:03:59 +00:00
|
|
|
for( const VECTOR2I& pt : m_poly.Outline( ii ).CPoints() )
|
|
|
|
{
|
|
|
|
pts.emplace_back( pt );
|
|
|
|
scalePt( pts.back() );
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SetPolyPoints( pts );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
scalePt( m_start );
|
|
|
|
scalePt( m_end );
|
|
|
|
scalePt( m_bezierC1 );
|
|
|
|
scalePt( m_bezierC2 );
|
|
|
|
break;
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-16 21:15:20 +00:00
|
|
|
void EDA_SHAPE::rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( m_start, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_end, aRotCentre, aAngle );
|
2021-07-18 23:08:54 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( m_start, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_end, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_arcCenter, aRotCentre, aAngle );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
2022-01-16 21:15:20 +00:00
|
|
|
if( aAngle.IsCardinal() )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( m_start, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_end, aRotCentre, aAngle );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2022-01-30 10:52:52 +00:00
|
|
|
// Convert non-cardinally-rotated rect to a diamond
|
2021-07-14 20:03:32 +00:00
|
|
|
m_shape = SHAPE_T::POLY;
|
|
|
|
m_poly.RemoveAllContours();
|
|
|
|
m_poly.NewOutline();
|
|
|
|
m_poly.Append( m_start );
|
|
|
|
m_poly.Append( m_end.x, m_start.y );
|
|
|
|
m_poly.Append( m_end );
|
|
|
|
m_poly.Append( m_start.x, m_end.y );
|
|
|
|
|
|
|
|
KI_FALLTHROUGH;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
2022-01-20 20:54:22 +00:00
|
|
|
m_poly.Rotate( aAngle, aRotCentre );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( m_start, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_end, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_bezierC1, aRotCentre, aAngle );
|
|
|
|
RotatePoint( m_bezierC2, aRotCentre, aAngle );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( VECTOR2I& pt : m_bezierPoints )
|
|
|
|
RotatePoint( pt, aRotCentre, aAngle);
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
switch ( m_shape )
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::RECT:
|
2021-07-18 23:08:54 +00:00
|
|
|
if( aFlipLeftRight )
|
|
|
|
{
|
|
|
|
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
|
|
|
|
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
|
|
|
|
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
|
|
|
|
}
|
|
|
|
|
|
|
|
std::swap( m_start, m_end );
|
|
|
|
break;
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::CIRCLE:
|
2021-07-18 23:08:54 +00:00
|
|
|
if( aFlipLeftRight )
|
|
|
|
{
|
|
|
|
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
|
|
|
|
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
|
|
|
|
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
case SHAPE_T::ARC:
|
|
|
|
if( aFlipLeftRight )
|
2021-07-17 19:56:18 +00:00
|
|
|
{
|
2021-07-18 23:08:54 +00:00
|
|
|
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
|
|
|
|
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
|
2021-07-17 19:56:18 +00:00
|
|
|
m_arcCenter.x = aCentre.x - ( m_arcCenter.x - aCentre.x );
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
else
|
2021-07-17 19:56:18 +00:00
|
|
|
{
|
2021-07-18 23:08:54 +00:00
|
|
|
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
|
|
|
|
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
|
2021-07-17 19:56:18 +00:00
|
|
|
m_arcCenter.y = aCentre.y - ( m_arcCenter.y - aCentre.y );
|
|
|
|
}
|
2021-07-18 23:08:54 +00:00
|
|
|
|
|
|
|
std::swap( m_start, m_end );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
2022-01-01 06:04:08 +00:00
|
|
|
m_poly.Mirror( aFlipLeftRight, !aFlipLeftRight, aCentre );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
if( aFlipLeftRight )
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
|
|
|
|
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
|
2021-07-14 20:03:32 +00:00
|
|
|
m_bezierC1.x = aCentre.x - ( m_bezierC1.x - aCentre.x );
|
|
|
|
m_bezierC2.x = aCentre.x - ( m_bezierC2.x - aCentre.x );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
|
|
|
|
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
|
2021-07-14 20:03:32 +00:00
|
|
|
m_bezierC1.y = aCentre.y - ( m_bezierC1.y - aCentre.y );
|
|
|
|
m_bezierC2.y = aCentre.y - ( m_bezierC2.y - aCentre.y );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rebuild the poly points shape
|
2021-07-18 23:08:54 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> ctrlPoints = { m_start, m_bezierC1, m_bezierC2, m_end };
|
2021-07-18 23:08:54 +00:00
|
|
|
BEZIER_POLY converter( ctrlPoints );
|
2021-07-17 19:56:18 +00:00
|
|
|
converter.GetPoly( m_bezierPoints, m_stroke.GetWidth() );
|
2021-07-18 23:08:54 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void EDA_SHAPE::RebuildBezierToSegmentsPointsList( int aMinSegLen )
|
|
|
|
{
|
2022-07-16 15:25:23 +00:00
|
|
|
// Has meaning only for SHAPE_T::BEZIER
|
2021-07-14 20:03:32 +00:00
|
|
|
if( m_shape != SHAPE_T::BEZIER )
|
|
|
|
{
|
|
|
|
m_bezierPoints.clear();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rebuild the m_BezierPoints vertex list that approximate the Bezier curve
|
|
|
|
m_bezierPoints = buildBezierToSegmentsPointsList( aMinSegLen );
|
2022-12-10 16:59:50 +00:00
|
|
|
|
|
|
|
// Ensure last point respects aMinSegLen parameter
|
|
|
|
if( m_bezierPoints.size() > 2 )
|
|
|
|
{
|
|
|
|
int idx = m_bezierPoints.size()-1;
|
|
|
|
|
|
|
|
if( VECTOR2I( m_bezierPoints[idx] - m_bezierPoints[idx]-1 ).EuclideanNorm() < aMinSegLen )
|
|
|
|
{
|
|
|
|
m_bezierPoints[idx]-1 = m_bezierPoints[idx];
|
|
|
|
m_bezierPoints.pop_back();
|
|
|
|
}
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
const std::vector<VECTOR2I> EDA_SHAPE::buildBezierToSegmentsPointsList( int aMinSegLen ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> bezierPoints;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
// Rebuild the m_BezierPoints vertex list that approximate the Bezier curve
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> ctrlPoints = { m_start, m_bezierC1, m_bezierC2, m_end };
|
2021-07-14 20:03:32 +00:00
|
|
|
BEZIER_POLY converter( ctrlPoints );
|
|
|
|
converter.GetPoly( bezierPoints, aMinSegLen );
|
|
|
|
|
|
|
|
return bezierPoints;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I EDA_SHAPE::getCenter() const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
2021-07-17 19:56:18 +00:00
|
|
|
return m_arcCenter;
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
case SHAPE_T::CIRCLE:
|
2021-07-17 19:56:18 +00:00
|
|
|
return m_start;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
// Midpoint of the line
|
2021-07-17 19:56:18 +00:00
|
|
|
return ( m_start + m_end ) / 2;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
case SHAPE_T::BEZIER:
|
2022-01-01 06:04:08 +00:00
|
|
|
return getBoundingBox().Centre();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2022-01-01 06:04:08 +00:00
|
|
|
return VECTOR2I();
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::SetCenter( const VECTOR2I& aCenter )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
2021-07-17 19:56:18 +00:00
|
|
|
m_arcCenter = aCenter;
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
m_start = aCenter;
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I EDA_SHAPE::GetArcMid() const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-03-04 23:18:34 +00:00
|
|
|
// If none of the input data have changed since we loaded the arc,
|
|
|
|
// keep the original mid point data to minimize churn
|
|
|
|
if( m_arcMidData.start == m_start && m_arcMidData.end == m_end
|
|
|
|
&& m_arcMidData.center == m_arcCenter )
|
|
|
|
return m_arcMidData.mid;
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I mid = m_start;
|
|
|
|
RotatePoint( mid, m_arcCenter, -GetArcAngle() / 2.0 );
|
2021-07-17 19:56:18 +00:00
|
|
|
return mid;
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-16 01:06:25 +00:00
|
|
|
void EDA_SHAPE::CalcArcAngles( EDA_ANGLE& aStartAngle, EDA_ANGLE& aEndAngle ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-10-14 23:39:31 +00:00
|
|
|
VECTOR2D startRadial( GetStart() - getCenter() );
|
|
|
|
VECTOR2D endRadial( GetEnd() - getCenter() );
|
2021-07-17 19:56:18 +00:00
|
|
|
|
2022-01-16 01:06:25 +00:00
|
|
|
aStartAngle = EDA_ANGLE( startRadial );
|
|
|
|
aEndAngle = EDA_ANGLE( endRadial );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2021-10-14 23:39:31 +00:00
|
|
|
if( aEndAngle == aStartAngle )
|
2022-01-16 01:06:25 +00:00
|
|
|
aEndAngle = aStartAngle + ANGLE_360; // ring, not null
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2021-10-14 23:39:31 +00:00
|
|
|
if( aStartAngle > aEndAngle )
|
|
|
|
{
|
2022-01-16 01:06:25 +00:00
|
|
|
if( aEndAngle < ANGLE_0 )
|
|
|
|
aEndAngle.Normalize();
|
2021-10-14 23:39:31 +00:00
|
|
|
else
|
2022-01-16 01:06:25 +00:00
|
|
|
aStartAngle = aStartAngle.Normalize() - ANGLE_360;
|
2021-10-14 23:39:31 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int EDA_SHAPE::GetRadius() const
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
double radius = 0.0;
|
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
radius = GetLineLength( m_arcCenter, m_start );
|
|
|
|
break;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
radius = GetLineLength( m_start, m_end );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
}
|
|
|
|
|
|
|
|
// don't allow degenerate circles/arcs
|
2021-07-14 20:03:32 +00:00
|
|
|
return std::max( 1, KiROUND( radius ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-03-04 23:18:34 +00:00
|
|
|
void EDA_SHAPE::SetCachedArcData( const VECTOR2I& aStart, const VECTOR2I& aMid, const VECTOR2I& aEnd, const VECTOR2I& aCenter )
|
|
|
|
{
|
|
|
|
m_arcMidData.start = aStart;
|
|
|
|
m_arcMidData.end = aEnd;
|
|
|
|
m_arcMidData.center = aCenter;
|
|
|
|
m_arcMidData.mid = aMid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::SetArcGeometry( const VECTOR2I& aStart, const VECTOR2I& aMid, const VECTOR2I& aEnd )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-03-04 23:18:34 +00:00
|
|
|
m_arcMidData = {};
|
2021-07-17 19:56:18 +00:00
|
|
|
m_start = aStart;
|
|
|
|
m_end = aEnd;
|
|
|
|
m_arcCenter = CalcArcCenter( aStart, aMid, aEnd );
|
2022-03-04 23:18:34 +00:00
|
|
|
VECTOR2I new_mid = GetArcMid();
|
|
|
|
|
2021-10-17 14:22:07 +00:00
|
|
|
m_endsSwapped = false;
|
2021-12-07 18:51:43 +00:00
|
|
|
|
2022-03-04 23:18:34 +00:00
|
|
|
// Watch the ordering here. GetArcMid above needs to be called prior to initializing the
|
|
|
|
// m_arcMidData structure in order to ensure we get the calculated variant, not the cached
|
|
|
|
SetCachedArcData( aStart, aMid, aEnd, m_arcCenter );
|
|
|
|
|
2022-01-19 22:21:37 +00:00
|
|
|
/*
|
|
|
|
* If the input winding doesn't match our internal winding, the calculated midpoint will end
|
|
|
|
* up on the other side of the arc. In this case, we need to flip the start/end points and
|
|
|
|
* flag this change for the system.
|
2021-12-07 18:51:43 +00:00
|
|
|
*/
|
|
|
|
VECTOR2D dist( new_mid - aMid );
|
|
|
|
VECTOR2D dist2( new_mid - m_arcCenter );
|
|
|
|
|
|
|
|
if( dist.SquaredEuclideanNorm() > dist2.SquaredEuclideanNorm() )
|
|
|
|
{
|
|
|
|
std::swap( m_start, m_end );
|
|
|
|
m_endsSwapped = true;
|
|
|
|
}
|
2021-10-14 23:39:31 +00:00
|
|
|
}
|
2021-07-17 19:56:18 +00:00
|
|
|
|
|
|
|
|
2022-01-14 15:34:41 +00:00
|
|
|
EDA_ANGLE EDA_SHAPE::GetArcAngle() const
|
2021-10-14 23:39:31 +00:00
|
|
|
{
|
2022-01-16 01:06:25 +00:00
|
|
|
EDA_ANGLE startAngle;
|
|
|
|
EDA_ANGLE endAngle;
|
2021-07-17 19:56:18 +00:00
|
|
|
|
2021-10-20 05:28:06 +00:00
|
|
|
CalcArcAngles( startAngle, endAngle );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-16 01:06:25 +00:00
|
|
|
return endAngle - startAngle;
|
2021-07-17 19:56:18 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
|
2022-01-16 16:15:07 +00:00
|
|
|
void EDA_SHAPE::SetArcAngleAndEnd( const EDA_ANGLE& aAngle, bool aCheckNegativeAngle )
|
2021-07-17 19:56:18 +00:00
|
|
|
{
|
2022-01-16 16:15:07 +00:00
|
|
|
EDA_ANGLE angle( aAngle );
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
m_end = m_start;
|
2022-01-16 16:15:07 +00:00
|
|
|
RotatePoint( m_end, m_arcCenter, -angle.Normalize720() );
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-01-16 16:15:07 +00:00
|
|
|
if( aCheckNegativeAngle && aAngle < ANGLE_0 )
|
2021-10-17 14:22:07 +00:00
|
|
|
{
|
2021-10-14 23:39:31 +00:00
|
|
|
std::swap( m_start, m_end );
|
2021-10-17 14:22:07 +00:00
|
|
|
m_endsSwapped = true;
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-11-25 16:54:25 +00:00
|
|
|
wxString EDA_SHAPE::GetFriendlyName() const
|
|
|
|
{
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE: return _( "Circle" );
|
|
|
|
case SHAPE_T::ARC: return _( "Arc" );
|
|
|
|
case SHAPE_T::BEZIER: return _( "Curve" );
|
|
|
|
case SHAPE_T::POLY: return _( "Polygon" );
|
|
|
|
case SHAPE_T::RECT: return IsAnnotationProxy() ? _( "Pad Number Box" ) : _( "Rectangle" );
|
|
|
|
case SHAPE_T::SEGMENT: return _( "Segment" );
|
|
|
|
default: return _( "Unrecognized" );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList )
|
|
|
|
{
|
|
|
|
ORIGIN_TRANSFORMS originTransforms = aFrame->GetOriginTransforms();
|
|
|
|
wxString msg;
|
|
|
|
|
|
|
|
wxString shape = _( "Shape" );
|
2022-11-25 16:54:25 +00:00
|
|
|
aList.emplace_back( shape, GetFriendlyName() );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE:
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Radius" ), aFrame->MessageTextFromValue( GetRadius() ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
2022-09-16 04:38:10 +00:00
|
|
|
msg = EDA_UNIT_UTILS::UI::MessageTextFromValue( GetArcAngle() );
|
2021-07-14 20:03:32 +00:00
|
|
|
aList.emplace_back( _( "Angle" ), msg );
|
|
|
|
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Radius" ), aFrame->MessageTextFromValue( GetRadius() ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Length" ), aFrame->MessageTextFromValue( GetLength() ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
msg.Printf( "%d", GetPolyShape().Outline(0).PointCount() );
|
|
|
|
aList.emplace_back( _( "Points" ), msg );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Width" ),
|
|
|
|
aFrame->MessageTextFromValue( std::abs( GetEnd().x - GetStart().x ) ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Height" ),
|
|
|
|
aFrame->MessageTextFromValue( std::abs( GetEnd().y - GetStart().y ) ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
{
|
2022-09-19 09:25:20 +00:00
|
|
|
aList.emplace_back( _( "Length" ),
|
|
|
|
aFrame->MessageTextFromValue( GetLineLength( GetStart(), GetEnd() ) ));
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
// angle counter-clockwise from 3'o-clock
|
2022-02-27 11:54:03 +00:00
|
|
|
EDA_ANGLE angle( atan2( (double)( GetStart().y - GetEnd().y ),
|
|
|
|
(double)( GetEnd().x - GetStart().x ) ), RADIANS_T );
|
2022-09-16 04:38:10 +00:00
|
|
|
aList.emplace_back( _( "Angle" ), EDA_UNIT_UTILS::UI::MessageTextFromValue( angle ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
2022-01-18 13:45:00 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2022-09-19 16:09:59 +00:00
|
|
|
m_stroke.GetMsgPanelInfo( aFrame, aList );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-08-30 23:28:18 +00:00
|
|
|
const BOX2I EDA_SHAPE::getBoundingBox() const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-08-30 23:28:18 +00:00
|
|
|
BOX2I bbox;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::RECT:
|
2022-01-01 06:04:08 +00:00
|
|
|
for( VECTOR2I& pt : GetRectCorners() )
|
2021-07-14 20:03:32 +00:00
|
|
|
bbox.Merge( pt );
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
2021-07-17 19:56:18 +00:00
|
|
|
bbox.SetOrigin( GetStart() );
|
|
|
|
bbox.SetEnd( GetEnd() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::CIRCLE:
|
2021-07-17 19:56:18 +00:00
|
|
|
bbox.SetOrigin( GetStart() );
|
2021-07-14 20:03:32 +00:00
|
|
|
bbox.Inflate( GetRadius() );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
computeArcBBox( bbox );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
if( m_poly.IsEmpty() )
|
|
|
|
break;
|
|
|
|
|
|
|
|
for( auto iter = m_poly.CIterate(); iter; iter++ )
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I pt( iter->x, iter->y );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( pt, getParentOrientation() );
|
2021-07-14 20:03:32 +00:00
|
|
|
pt += getParentPosition();
|
|
|
|
|
|
|
|
bbox.Merge( pt );
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
2021-07-17 19:56:18 +00:00
|
|
|
bbox.SetOrigin( GetStart() );
|
|
|
|
bbox.Merge( GetBezierC1() );
|
|
|
|
bbox.Merge( GetBezierC2() );
|
|
|
|
bbox.Merge( GetEnd() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
bbox.Inflate( std::max( 0, GetWidth() ) / 2 );
|
2021-07-14 20:03:32 +00:00
|
|
|
bbox.Normalize();
|
|
|
|
|
|
|
|
return bbox;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
bool EDA_SHAPE::hitTest( const VECTOR2I& aPosition, int aAccuracy ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2021-07-18 23:08:54 +00:00
|
|
|
int maxdist = aAccuracy;
|
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
if( GetWidth() > 0 )
|
|
|
|
maxdist += GetWidth() / 2;
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
{
|
|
|
|
int radius = GetRadius();
|
2022-07-16 19:33:33 +00:00
|
|
|
|
|
|
|
VECTOR2I::extended_type dist = KiROUND<double, VECTOR2I::extended_type>(
|
|
|
|
EuclideanNorm( aPosition - getCenter() ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
if( IsFilled() )
|
|
|
|
return dist <= radius + maxdist; // Filled circle hit-test
|
|
|
|
else
|
|
|
|
return abs( radius - dist ) <= maxdist; // Ring hit-test
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
{
|
2021-10-26 12:18:08 +00:00
|
|
|
if( EuclideanNorm( aPosition - m_start ) <= maxdist )
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if( EuclideanNorm( aPosition - m_end ) <= maxdist )
|
|
|
|
return true;
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I relPos = aPosition - getCenter();
|
|
|
|
int radius = GetRadius();
|
2022-07-16 19:33:33 +00:00
|
|
|
|
|
|
|
VECTOR2I::extended_type dist =
|
|
|
|
KiROUND<double, VECTOR2I::extended_type>( EuclideanNorm( relPos ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-04-01 21:40:05 +00:00
|
|
|
if( IsFilled() )
|
|
|
|
{
|
|
|
|
// Check distance from arc center
|
|
|
|
if( dist > radius + maxdist )
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-04-01 21:40:05 +00:00
|
|
|
// Check distance from arc circumference
|
|
|
|
if( abs( radius - dist ) > maxdist )
|
|
|
|
return false;
|
|
|
|
}
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-04-01 21:40:05 +00:00
|
|
|
// Finally, check to see if it's within arc's swept angle.
|
|
|
|
EDA_ANGLE startAngle;
|
|
|
|
EDA_ANGLE endAngle;
|
|
|
|
CalcArcAngles( startAngle, endAngle );
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-04-01 21:40:05 +00:00
|
|
|
EDA_ANGLE relPosAngle( relPos );
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-04-01 21:40:05 +00:00
|
|
|
startAngle.Normalize();
|
|
|
|
endAngle.Normalize();
|
|
|
|
relPosAngle.Normalize();
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-04-01 21:40:05 +00:00
|
|
|
if( endAngle > startAngle )
|
|
|
|
return relPosAngle >= startAngle && relPosAngle <= endAngle;
|
|
|
|
else
|
|
|
|
return relPosAngle >= startAngle || relPosAngle <= endAngle;
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
2021-07-17 19:56:18 +00:00
|
|
|
const_cast<EDA_SHAPE*>( this )->RebuildBezierToSegmentsPointsList( GetWidth() );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
for( unsigned int i= 1; i < m_bezierPoints.size(); i++)
|
|
|
|
{
|
|
|
|
if( TestSegmentHit( aPosition, m_bezierPoints[ i - 1], m_bezierPoints[i], maxdist ) )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
2021-07-17 19:56:18 +00:00
|
|
|
return TestSegmentHit( aPosition, GetStart(), GetEnd(), maxdist );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
2022-09-14 10:34:10 +00:00
|
|
|
if( IsAnnotationProxy() || IsFilled() ) // Filled rect hit-test
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
SHAPE_POLY_SET poly;
|
|
|
|
poly.NewOutline();
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( const VECTOR2I& pt : GetRectCorners() )
|
2021-07-14 20:03:32 +00:00
|
|
|
poly.Append( pt );
|
|
|
|
|
2022-08-05 22:57:37 +00:00
|
|
|
return poly.Collide( aPosition, maxdist );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
2022-09-14 10:34:10 +00:00
|
|
|
else // Open rect hit-test
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts = GetRectCorners();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
return TestSegmentHit( aPosition, pts[0], pts[1], maxdist )
|
|
|
|
|| TestSegmentHit( aPosition, pts[1], pts[2], maxdist )
|
|
|
|
|| TestSegmentHit( aPosition, pts[2], pts[3], maxdist )
|
|
|
|
|| TestSegmentHit( aPosition, pts[3], pts[0], maxdist );
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
if( IsFilled() )
|
2022-08-05 22:57:37 +00:00
|
|
|
return m_poly.Collide( aPosition, maxdist );
|
2021-07-14 20:03:32 +00:00
|
|
|
else
|
2022-08-05 22:57:37 +00:00
|
|
|
return m_poly.CollideEdge( aPosition, nullptr, maxdist );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
default:
|
2021-07-18 23:08:54 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-08-31 09:33:46 +00:00
|
|
|
bool EDA_SHAPE::hitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
BOX2I arect = aRect;
|
2021-07-14 20:03:32 +00:00
|
|
|
arect.Normalize();
|
|
|
|
arect.Inflate( aAccuracy );
|
|
|
|
|
2022-08-31 09:33:46 +00:00
|
|
|
BOX2I bbox = getBoundingBox();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
// Test if area intersects or contains the circle:
|
|
|
|
if( aContained )
|
2021-10-26 12:18:08 +00:00
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
return arect.Contains( bbox );
|
2021-10-26 12:18:08 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// If the rectangle does not intersect the bounding box, this is a much quicker test
|
2022-08-31 09:33:46 +00:00
|
|
|
if( !arect.Intersects( bbox ) )
|
2021-07-14 20:03:32 +00:00
|
|
|
return false;
|
|
|
|
else
|
|
|
|
return arect.IntersectsCircleEdge( getCenter(), GetRadius(), GetWidth() );
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
// Test for full containment of this arc in the rect
|
|
|
|
if( aContained )
|
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
return arect.Contains( bbox );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
// Test if the rect crosses the arc
|
|
|
|
else
|
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
if( !arect.Intersects( bbox ) )
|
2022-04-01 21:40:05 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if( IsFilled() )
|
|
|
|
{
|
|
|
|
return ( arect.Intersects( getCenter(), GetStart() )
|
|
|
|
|| arect.Intersects( getCenter(), GetEnd() )
|
|
|
|
|| arect.IntersectsCircleEdge( getCenter(), GetRadius(), GetWidth() ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return arect.IntersectsCircleEdge( getCenter(), GetRadius(), GetWidth() );
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
if( aContained )
|
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
return arect.Contains( bbox );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts = GetRectCorners();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
// Account for the width of the lines
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
|
|
|
return ( arect.Intersects( pts[0], pts[1] )
|
|
|
|
|| arect.Intersects( pts[1], pts[2] )
|
|
|
|
|| arect.Intersects( pts[2], pts[3] )
|
|
|
|
|| arect.Intersects( pts[3], pts[0] ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
if( aContained )
|
|
|
|
{
|
|
|
|
return arect.Contains( GetStart() ) && aRect.Contains( GetEnd() );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Account for the width of the line
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
|
|
|
return arect.Intersects( GetStart(), GetEnd() );
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
if( aContained )
|
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
return arect.Contains( bbox );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Fast test: if aRect is outside the polygon bounding box,
|
|
|
|
// rectangles cannot intersect
|
2022-08-31 09:33:46 +00:00
|
|
|
if( !arect.Intersects( bbox ) )
|
2021-07-14 20:03:32 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
// Account for the width of the line
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
|
|
|
|
|
|
|
// Polygons in footprints use coordinates relative to the footprint.
|
|
|
|
// Therefore, instead of using m_poly, we make a copy which is translated
|
|
|
|
// to the actual location in the board.
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I offset = getParentPosition();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
for( int ii = 0; ii < m_poly.OutlineCount(); ++ii )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-11-09 00:03:59 +00:00
|
|
|
SHAPE_LINE_CHAIN poly = m_poly.Outline( ii );
|
|
|
|
poly.Rotate( getParentOrientation() );
|
|
|
|
poly.Move( offset );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
int count = poly.GetPointCount();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
for( int jj = 0; jj < count; jj++ )
|
2021-07-18 23:08:54 +00:00
|
|
|
{
|
2022-11-09 00:03:59 +00:00
|
|
|
VECTOR2I vertex = poly.GetPoint( jj );
|
2021-07-18 23:08:54 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
// Test if the point is within aRect
|
|
|
|
if( arect.Contains( vertex ) )
|
2021-07-18 23:08:54 +00:00
|
|
|
return true;
|
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
if( jj + 1 < count )
|
|
|
|
{
|
|
|
|
VECTOR2I vertexNext = poly.GetPoint( jj + 1 );
|
|
|
|
|
|
|
|
// Test if this edge intersects aRect
|
|
|
|
if( arect.Intersects( vertex, vertexNext ) )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else if( poly.IsClosed() )
|
|
|
|
{
|
|
|
|
VECTOR2I vertexNext = poly.GetPoint( 0 );
|
|
|
|
|
|
|
|
// Test if this edge intersects aRect
|
|
|
|
if( arect.Intersects( vertex, vertexNext ) )
|
|
|
|
return true;
|
|
|
|
}
|
2021-07-18 23:08:54 +00:00
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
if( aContained )
|
|
|
|
{
|
2022-08-31 09:33:46 +00:00
|
|
|
return arect.Contains( bbox );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Fast test: if aRect is outside the polygon bounding box,
|
|
|
|
// rectangles cannot intersect
|
2022-08-31 09:33:46 +00:00
|
|
|
if( !arect.Intersects( bbox ) )
|
2021-07-14 20:03:32 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
// Account for the width of the line
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
|
|
|
unsigned count = m_bezierPoints.size();
|
|
|
|
|
|
|
|
for( unsigned ii = 1; ii < count; ii++ )
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I vertex = m_bezierPoints[ii - 1];
|
|
|
|
VECTOR2I vertexNext = m_bezierPoints[ii];
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
// Test if the point is within aRect
|
2022-01-01 06:04:08 +00:00
|
|
|
if( arect.Contains( vertex ) )
|
2021-07-14 20:03:32 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
// Test if this edge intersects aRect
|
|
|
|
if( arect.Intersects( vertex, vertexNext ) )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> EDA_SHAPE::GetRectCorners() const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts;
|
|
|
|
VECTOR2I topLeft = GetStart();
|
|
|
|
VECTOR2I botRight = GetEnd();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
// Un-rotate rect topLeft and botRight
|
2022-01-16 21:15:20 +00:00
|
|
|
if( !getParentOrientation().IsCardinal() )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
topLeft -= getParentPosition();
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( topLeft, -getParentOrientation() );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
botRight -= getParentPosition();
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( botRight, -getParentOrientation() );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up the un-rotated 4 corners
|
|
|
|
pts.emplace_back( topLeft );
|
|
|
|
pts.emplace_back( botRight.x, topLeft.y );
|
|
|
|
pts.emplace_back( botRight );
|
|
|
|
pts.emplace_back( topLeft.x, botRight.y );
|
|
|
|
|
|
|
|
// Now re-rotate the 4 corners to get a diamond
|
2022-01-16 21:15:20 +00:00
|
|
|
if( !getParentOrientation().IsCardinal() )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
for( VECTOR2I& pt : pts )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( pt, getParentOrientation() );
|
2021-07-14 20:03:32 +00:00
|
|
|
pt += getParentPosition();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pts;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-08-30 23:28:18 +00:00
|
|
|
void EDA_SHAPE::computeArcBBox( BOX2I& aBBox ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-04-01 21:40:05 +00:00
|
|
|
// Start, end, and each inflection point the arc crosses will enclose the entire arc.
|
|
|
|
// Only include the center when filled; it's not necessarily inside the BB of an unfilled
|
|
|
|
// arc with a small included angle.
|
|
|
|
aBBox.SetOrigin( m_start );
|
|
|
|
aBBox.Merge( m_end );
|
|
|
|
|
|
|
|
if( IsFilled() )
|
|
|
|
aBBox.Merge( m_arcCenter );
|
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
int radius = GetRadius();
|
2022-01-16 01:06:25 +00:00
|
|
|
EDA_ANGLE t1, t2;
|
2021-10-30 14:08:44 +00:00
|
|
|
|
|
|
|
CalcArcAngles( t1, t2 );
|
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
t1.Normalize();
|
|
|
|
t2.Normalize();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t2 > t1 )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t1 < ANGLE_0 && t2 > ANGLE_0 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x + radius, m_arcCenter.y ) ); // right
|
|
|
|
|
|
|
|
if( t1 < ANGLE_90 && t2 > ANGLE_90 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x, m_arcCenter.y + radius ) ); // down
|
|
|
|
|
|
|
|
if( t1 < ANGLE_180 && t2 > ANGLE_180 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x - radius, m_arcCenter.y ) ); // left
|
|
|
|
|
|
|
|
if( t1 < ANGLE_270 && t2 > ANGLE_270 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x, m_arcCenter.y - radius ) ); // up
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
2021-10-30 14:08:44 +00:00
|
|
|
else
|
|
|
|
{
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t1 < ANGLE_0 || t2 > ANGLE_0 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x + radius, m_arcCenter.y ) ); // right
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t1 < ANGLE_90 || t2 > ANGLE_90 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x, m_arcCenter.y + radius ) ); // down
|
2022-01-16 01:06:25 +00:00
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t1 < ANGLE_180 || t2 > ANGLE_180 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x - radius, m_arcCenter.y ) ); // left
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-01-16 23:54:59 +00:00
|
|
|
if( t1 < ANGLE_270 || t2 > ANGLE_270 )
|
|
|
|
aBBox.Merge( VECTOR2I( m_arcCenter.x, m_arcCenter.y - radius ) ); // up
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::SetPolyPoints( const std::vector<VECTOR2I>& aPoints )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
m_poly.RemoveAllContours();
|
|
|
|
m_poly.NewOutline();
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( const VECTOR2I& p : aPoints )
|
2021-07-14 20:03:32 +00:00
|
|
|
m_poly.Append( p.x, p.y );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-07-09 03:34:49 +00:00
|
|
|
std::vector<SHAPE*> EDA_SHAPE::makeEffectiveShapes( bool aEdgeOnly, bool aLineChainOnly ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
|
|
|
std::vector<SHAPE*> effectiveShapes;
|
2022-04-08 15:14:42 +00:00
|
|
|
int width = GetEffectiveWidth();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
2022-04-08 15:14:42 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_ARC( m_arcCenter, m_start, GetArcAngle(), width ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
2022-04-08 15:14:42 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( m_start, m_end, width ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts = GetRectCorners();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-09-14 10:34:10 +00:00
|
|
|
if( ( IsFilled() || IsAnnotationProxy() ) && !aEdgeOnly )
|
2021-07-14 20:03:32 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_SIMPLE( pts ) );
|
|
|
|
|
2022-04-08 15:14:42 +00:00
|
|
|
if( width > 0 || !IsFilled() || aEdgeOnly )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-04-08 15:14:42 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[0], pts[1], width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[1], pts[2], width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[2], pts[3], width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[3], pts[0], width ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
if( IsFilled() && !aEdgeOnly )
|
2021-07-14 20:03:32 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_CIRCLE( getCenter(), GetRadius() ) );
|
|
|
|
|
2022-04-08 15:14:42 +00:00
|
|
|
if( width > 0 || !IsFilled() || aEdgeOnly )
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_ARC( getCenter(), GetEnd(), ANGLE_360, width ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
{
|
2022-04-08 15:14:42 +00:00
|
|
|
std::vector<VECTOR2I> bezierPoints = buildBezierToSegmentsPointsList( width );
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I start_pt = bezierPoints[0];
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
for( unsigned int jj = 1; jj < bezierPoints.size(); jj++ )
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I end_pt = bezierPoints[jj];
|
2022-04-08 15:14:42 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( start_pt, end_pt, width ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
start_pt = end_pt;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
{
|
2022-02-02 19:40:54 +00:00
|
|
|
if( GetPolyShape().OutlineCount() == 0 ) // malformed/empty polygon
|
|
|
|
break;
|
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
for( int ii = 0; ii < GetPolyShape().OutlineCount(); ++ii )
|
|
|
|
{
|
|
|
|
SHAPE_LINE_CHAIN l = GetPolyShape().COutline( ii );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
if( aLineChainOnly )
|
|
|
|
l.SetClosed( false );
|
2022-07-09 03:34:49 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
l.Rotate( getParentOrientation() );
|
|
|
|
l.Move( getParentPosition() );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
if( IsFilled() && !aEdgeOnly )
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SIMPLE( l ) );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
2022-11-09 00:03:59 +00:00
|
|
|
if( width > 0 || !IsFilled() || aEdgeOnly )
|
|
|
|
{
|
|
|
|
for( int jj = 0; jj < l.SegmentCount(); jj++ )
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( jj ), width ) );
|
|
|
|
}
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2021-07-17 19:56:18 +00:00
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
2021-07-14 20:03:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return effectiveShapes;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::DupPolyPointsList( std::vector<VECTOR2I>& aBuffer ) const
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-11-09 00:03:59 +00:00
|
|
|
for( int ii = 0; ii < m_poly.OutlineCount(); ++ii )
|
2021-07-14 20:03:32 +00:00
|
|
|
{
|
2022-11-09 00:03:59 +00:00
|
|
|
int pointCount = m_poly.COutline( ii ).PointCount();
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
if( pointCount )
|
|
|
|
{
|
|
|
|
aBuffer.reserve( pointCount );
|
|
|
|
|
|
|
|
for ( auto iter = m_poly.CIterate(); iter; iter++ )
|
|
|
|
aBuffer.emplace_back( iter->x, iter->y );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool EDA_SHAPE::IsPolyShapeValid() const
|
|
|
|
{
|
|
|
|
// return true if the polygonal shape is valid (has more than 2 points)
|
|
|
|
if( GetPolyShape().OutlineCount() == 0 )
|
|
|
|
return false;
|
|
|
|
|
2022-04-08 15:14:42 +00:00
|
|
|
const SHAPE_LINE_CHAIN& outline = static_cast<const SHAPE_POLY_SET&>( GetPolyShape() ).Outline( 0 );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
return outline.PointCount() > 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int EDA_SHAPE::GetPointCount() const
|
|
|
|
{
|
|
|
|
// return the number of corners of the polygonal shape
|
|
|
|
// this shape is expected to be only one polygon without hole
|
|
|
|
if( GetPolyShape().OutlineCount() )
|
|
|
|
return GetPolyShape().VertexCount( 0 );
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::beginEdit( const VECTOR2I& aPosition )
|
2021-10-14 23:39:31 +00:00
|
|
|
{
|
|
|
|
switch( GetShape() )
|
|
|
|
{
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
SetStart( aPosition );
|
|
|
|
SetEnd( aPosition );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
SetArcGeometry( aPosition, aPosition, aPosition );
|
|
|
|
m_editState = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
m_poly.NewOutline();
|
|
|
|
m_poly.Outline( 0 ).SetClosed( false );
|
|
|
|
|
|
|
|
// Start and end of the first segment (co-located for now)
|
|
|
|
m_poly.Outline( 0 ).Append( aPosition );
|
|
|
|
m_poly.Outline( 0 ).Append( aPosition, true );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
bool EDA_SHAPE::continueEdit( const VECTOR2I& aPosition )
|
2021-10-14 23:39:31 +00:00
|
|
|
{
|
|
|
|
switch( GetShape() )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
return false;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
{
|
|
|
|
SHAPE_LINE_CHAIN& poly = m_poly.Outline( 0 );
|
|
|
|
|
|
|
|
// do not add zero-length segments
|
|
|
|
if( poly.CPoint( poly.GetPointCount() - 2 ) != poly.CLastPoint() )
|
|
|
|
poly.Append( aPosition, true );
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
void EDA_SHAPE::calcEdit( const VECTOR2I& aPosition )
|
2021-10-14 23:39:31 +00:00
|
|
|
{
|
|
|
|
#define sq( x ) pow( x, 2 )
|
|
|
|
|
|
|
|
switch( GetShape() )
|
|
|
|
{
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
SetEnd( aPosition );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
{
|
|
|
|
int radius = GetRadius();
|
|
|
|
|
|
|
|
// Edit state 0: drawing: place start
|
|
|
|
// Edit state 1: drawing: place end (center calculated for 90-degree subtended angle)
|
|
|
|
// Edit state 2: point edit: move start (center calculated for invariant subtended angle)
|
|
|
|
// Edit state 3: point edit: move end (center calculated for invariant subtended angle)
|
|
|
|
// Edit state 4: point edit: move center
|
|
|
|
// Edit state 5: point edit: move arc-mid-point
|
|
|
|
|
|
|
|
switch( m_editState )
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
SetArcGeometry( aPosition, aPosition, aPosition );
|
|
|
|
return;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
m_end = aPosition;
|
|
|
|
radius = KiROUND( sqrt( sq( GetLineLength( m_start, m_end ) ) / 2.0 ) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I v = m_start - m_end;
|
2021-10-14 23:39:31 +00:00
|
|
|
double chordBefore = sq( v.x ) + sq( v.y );
|
|
|
|
|
|
|
|
if( m_editState == 2 )
|
|
|
|
m_start = aPosition;
|
|
|
|
else
|
|
|
|
m_end = aPosition;
|
|
|
|
|
|
|
|
v = m_start - m_end;
|
|
|
|
double chordAfter = sq( v.x ) + sq( v.y );
|
|
|
|
double ratio = chordAfter / chordBefore;
|
|
|
|
|
|
|
|
if( ratio != 0 )
|
|
|
|
{
|
|
|
|
radius = std::max( int( sqrt( sq( radius ) * ratio ) ) + 1,
|
|
|
|
int( sqrt( chordAfter ) / 2 ) + 1 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
double radialA = GetLineLength( m_start, aPosition );
|
|
|
|
double radialB = GetLineLength( m_end, aPosition );
|
|
|
|
radius = int( ( radialA + radialB ) / 2.0 ) + 1;
|
2021-10-14 23:39:31 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 5:
|
|
|
|
SetArcGeometry( GetStart(), aPosition, GetEnd() );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Calculate center based on start, end, and radius
|
|
|
|
//
|
|
|
|
// Let 'l' be the length of the chord and 'm' the middle point of the chord
|
|
|
|
double l = GetLineLength( m_start, m_end );
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I m = ( m_start + m_end ) / 2;
|
2021-10-14 23:39:31 +00:00
|
|
|
|
|
|
|
// Calculate 'd', the vector from the chord midpoint to the center
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I d;
|
2021-10-14 23:39:31 +00:00
|
|
|
d.x = KiROUND( sqrt( sq( radius ) - sq( l/2 ) ) * ( m_start.y - m_end.y ) / l );
|
|
|
|
d.y = KiROUND( sqrt( sq( radius ) - sq( l/2 ) ) * ( m_end.x - m_start.x ) / l );
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I c1 = m + d;
|
|
|
|
VECTOR2I c2 = m - d;
|
2021-10-14 23:39:31 +00:00
|
|
|
|
|
|
|
// Solution gives us 2 centers; we need to pick one:
|
|
|
|
switch( m_editState )
|
|
|
|
{
|
|
|
|
case 1:
|
2022-10-05 09:32:56 +00:00
|
|
|
// Keep arc clockwise while drawing i.e. arc angle = 90 deg.
|
|
|
|
// it can be 90 or 270 deg depending on the arc center choice (c1 or c2)
|
|
|
|
m_arcCenter = c1; // first trial
|
2021-10-14 23:39:31 +00:00
|
|
|
|
2022-10-05 09:32:56 +00:00
|
|
|
if( GetArcAngle() > ANGLE_180 )
|
|
|
|
m_arcCenter = c2;
|
2021-10-14 23:39:31 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
case 3:
|
2022-10-06 07:22:59 +00:00
|
|
|
// Pick the one of c1, c2 to keep arc <= 180 deg
|
|
|
|
m_arcCenter = c1; // first trial
|
|
|
|
|
|
|
|
if( GetArcAngle() > ANGLE_180 )
|
|
|
|
m_arcCenter = c2;
|
|
|
|
|
2021-10-14 23:39:31 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
// Pick the one closer to the mouse position
|
|
|
|
m_arcCenter = GetLineLength( c1, aPosition ) < GetLineLength( c2, aPosition ) ? c1 : c2;
|
2021-07-17 19:56:18 +00:00
|
|
|
|
2022-10-06 07:22:59 +00:00
|
|
|
// keep arc angle <= 180 deg
|
2022-01-14 15:34:41 +00:00
|
|
|
if( GetArcAngle() > ANGLE_180 )
|
2021-07-17 19:56:18 +00:00
|
|
|
std::swap( m_start, m_end );
|
|
|
|
|
2021-10-14 23:39:31 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
m_poly.Outline( 0 ).SetPoint( m_poly.Outline( 0 ).GetPointCount() - 1, aPosition );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-10 21:36:05 +00:00
|
|
|
void EDA_SHAPE::endEdit( bool aClosed )
|
2021-10-14 23:39:31 +00:00
|
|
|
{
|
|
|
|
switch( GetShape() )
|
|
|
|
{
|
|
|
|
case SHAPE_T::ARC:
|
|
|
|
case SHAPE_T::SEGMENT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
{
|
|
|
|
SHAPE_LINE_CHAIN& poly = m_poly.Outline( 0 );
|
|
|
|
|
|
|
|
// do not include last point twice
|
|
|
|
if( poly.GetPointCount() > 2 )
|
|
|
|
{
|
|
|
|
if( poly.CPoint( poly.GetPointCount() - 2 ) == poly.CLastPoint() )
|
|
|
|
{
|
2022-01-10 21:36:05 +00:00
|
|
|
poly.SetClosed( aClosed );
|
2021-10-14 23:39:31 +00:00
|
|
|
poly.Remove( poly.GetPointCount() - 1 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-07-14 20:03:32 +00:00
|
|
|
void EDA_SHAPE::SwapShape( EDA_SHAPE* aImage )
|
|
|
|
{
|
|
|
|
EDA_SHAPE* image = dynamic_cast<EDA_SHAPE*>( aImage );
|
|
|
|
assert( image );
|
|
|
|
|
2022-01-14 08:40:15 +00:00
|
|
|
#define SWAPITEM( x ) std::swap( x, image->x )
|
|
|
|
SWAPITEM( m_stroke );
|
|
|
|
SWAPITEM( m_start );
|
|
|
|
SWAPITEM( m_end );
|
|
|
|
SWAPITEM( m_arcCenter );
|
|
|
|
SWAPITEM( m_shape );
|
|
|
|
SWAPITEM( m_bezierC1 );
|
|
|
|
SWAPITEM( m_bezierC2 );
|
|
|
|
SWAPITEM( m_bezierPoints );
|
|
|
|
SWAPITEM( m_poly );
|
|
|
|
SWAPITEM( m_fill );
|
|
|
|
SWAPITEM( m_fillColor );
|
|
|
|
SWAPITEM( m_editState );
|
|
|
|
SWAPITEM( m_endsSwapped );
|
|
|
|
#undef SWAPITEM
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int EDA_SHAPE::Compare( const EDA_SHAPE* aOther ) const
|
|
|
|
{
|
2021-11-29 15:04:36 +00:00
|
|
|
#define EPSILON 2 // Should be enough for rounding errors on calculated items
|
|
|
|
|
2021-11-29 19:33:32 +00:00
|
|
|
#define TEST( a, b ) { if( a != b ) return a - b; }
|
|
|
|
#define TEST_E( a, b ) { if( abs( a - b ) > EPSILON ) return a - b; }
|
|
|
|
#define TEST_PT( a, b ) { TEST_E( a.x, b.x ); TEST_E( a.y, b.y ); }
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
TEST_PT( m_start, aOther->m_start );
|
|
|
|
TEST_PT( m_end, aOther->m_end );
|
|
|
|
|
2021-07-18 23:08:54 +00:00
|
|
|
TEST( (int) m_shape, (int) aOther->m_shape );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
if( m_shape == SHAPE_T::ARC )
|
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
TEST_PT( m_arcCenter, aOther->m_arcCenter );
|
2021-07-14 20:03:32 +00:00
|
|
|
}
|
|
|
|
else if( m_shape == SHAPE_T::BEZIER )
|
|
|
|
{
|
|
|
|
TEST_PT( m_bezierC1, aOther->m_bezierC1 );
|
|
|
|
TEST_PT( m_bezierC2, aOther->m_bezierC2 );
|
|
|
|
}
|
|
|
|
else if( m_shape == SHAPE_T::POLY )
|
|
|
|
{
|
|
|
|
TEST( m_poly.TotalVertices(), aOther->m_poly.TotalVertices() );
|
2021-07-18 23:08:54 +00:00
|
|
|
}
|
2021-07-17 19:56:18 +00:00
|
|
|
|
2021-07-17 19:56:18 +00:00
|
|
|
for( size_t ii = 0; ii < m_bezierPoints.size(); ++ii )
|
|
|
|
TEST_PT( m_bezierPoints[ii], aOther->m_bezierPoints[ii] );
|
|
|
|
|
|
|
|
for( int ii = 0; ii < m_poly.TotalVertices(); ++ii )
|
|
|
|
TEST_PT( m_poly.CVertex( ii ), aOther->m_poly.CVertex( ii ) );
|
|
|
|
|
|
|
|
TEST_E( m_stroke.GetWidth(), aOther->m_stroke.GetWidth() );
|
|
|
|
TEST( (int) m_stroke.GetPlotStyle(), (int) aOther->m_stroke.GetPlotStyle() );
|
2021-07-18 23:08:54 +00:00
|
|
|
TEST( (int) m_fill, (int) aOther->m_fill );
|
2021-07-14 20:03:32 +00:00
|
|
|
|
|
|
|
return 0;
|
2021-10-14 23:39:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-10-21 12:48:45 +00:00
|
|
|
void EDA_SHAPE::TransformShapeToPolygon( SHAPE_POLY_SET& aBuffer, int aClearance, int aError,
|
|
|
|
ERROR_LOC aErrorLoc, bool ignoreLineWidth ) const
|
2021-10-25 19:50:33 +00:00
|
|
|
{
|
2021-07-17 19:56:18 +00:00
|
|
|
int width = ignoreLineWidth ? 0 : GetWidth();
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-10-21 12:48:45 +00:00
|
|
|
width += 2 * aClearance;
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
switch( m_shape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::CIRCLE:
|
2022-10-21 12:48:45 +00:00
|
|
|
{
|
|
|
|
int r = GetRadius();
|
|
|
|
|
2021-10-25 19:50:33 +00:00
|
|
|
if( IsFilled() )
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformCircleToPolygon( aBuffer, getCenter(), r + width / 2, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
else
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformRingToPolygon( aBuffer, getCenter(), r, width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
break;
|
2022-10-21 12:48:45 +00:00
|
|
|
}
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> pts = GetRectCorners();
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-09-14 10:34:10 +00:00
|
|
|
if( IsFilled() || IsAnnotationProxy() )
|
2021-10-25 19:50:33 +00:00
|
|
|
{
|
2022-10-21 12:48:45 +00:00
|
|
|
aBuffer.NewOutline();
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( const VECTOR2I& pt : pts )
|
2022-10-21 12:48:45 +00:00
|
|
|
aBuffer.Append( pt );
|
2021-10-25 19:50:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( width > 0 || !IsFilled() )
|
|
|
|
{
|
|
|
|
// Add in segments
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformOvalToPolygon( aBuffer, pts[0], pts[1], width, aError, aErrorLoc );
|
|
|
|
TransformOvalToPolygon( aBuffer, pts[1], pts[2], width, aError, aErrorLoc );
|
|
|
|
TransformOvalToPolygon( aBuffer, pts[2], pts[3], width, aError, aErrorLoc );
|
|
|
|
TransformOvalToPolygon( aBuffer, pts[3], pts[0], width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::ARC:
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformArcToPolygon( aBuffer, GetStart(), GetArcMid(), GetEnd(), width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::SEGMENT:
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformOvalToPolygon( aBuffer, GetStart(), GetEnd(), width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
{
|
|
|
|
if( !IsPolyShapeValid() )
|
|
|
|
break;
|
|
|
|
|
|
|
|
// The polygon is expected to be a simple polygon; not self intersecting, no hole.
|
2022-01-16 21:15:20 +00:00
|
|
|
EDA_ANGLE orientation = getParentOrientation();
|
|
|
|
VECTOR2I offset = getParentPosition();
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
// Build the polygon with the actual position and orientation:
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> poly;
|
2021-10-25 19:50:33 +00:00
|
|
|
DupPolyPointsList( poly );
|
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( VECTOR2I& point : poly )
|
2021-10-25 19:50:33 +00:00
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
RotatePoint( point, orientation );
|
2021-10-25 19:50:33 +00:00
|
|
|
point += offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( IsFilled() )
|
|
|
|
{
|
2022-10-21 12:48:45 +00:00
|
|
|
aBuffer.NewOutline();
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( const VECTOR2I& point : poly )
|
2022-10-21 12:48:45 +00:00
|
|
|
aBuffer.Append( point.x, point.y );
|
2021-10-25 19:50:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( width > 0 || !IsFilled() )
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
VECTOR2I pt1( poly[poly.size() - 1] );
|
2021-10-25 19:50:33 +00:00
|
|
|
|
2022-01-01 06:04:08 +00:00
|
|
|
for( const VECTOR2I& pt2 : poly )
|
2021-10-25 19:50:33 +00:00
|
|
|
{
|
|
|
|
if( pt2 != pt1 )
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformOvalToPolygon( aBuffer, pt1, pt2, width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
pt1 = pt2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SHAPE_T::BEZIER:
|
|
|
|
{
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> ctrlPts = { GetStart(), GetBezierC1(), GetBezierC2(), GetEnd() };
|
2021-10-25 19:50:33 +00:00
|
|
|
BEZIER_POLY converter( ctrlPts );
|
2022-01-01 06:04:08 +00:00
|
|
|
std::vector<VECTOR2I> poly;
|
2021-07-17 19:56:18 +00:00
|
|
|
converter.GetPoly( poly, GetWidth() );
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
for( unsigned ii = 1; ii < poly.size(); ii++ )
|
2022-10-21 12:48:45 +00:00
|
|
|
TransformOvalToPolygon( aBuffer, poly[ii - 1], poly[ii], width, aError, aErrorLoc );
|
2021-10-25 19:50:33 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
UNIMPLEMENTED_FOR( SHAPE_T_asString() );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-02-02 18:40:14 +00:00
|
|
|
ENUM_TO_WXANY( SHAPE_T )
|
|
|
|
ENUM_TO_WXANY( PLOT_DASH_TYPE )
|
|
|
|
|
|
|
|
|
2021-10-14 23:39:31 +00:00
|
|
|
static struct EDA_SHAPE_DESC
|
|
|
|
{
|
|
|
|
EDA_SHAPE_DESC()
|
|
|
|
{
|
|
|
|
ENUM_MAP<SHAPE_T>::Instance()
|
|
|
|
.Map( SHAPE_T::SEGMENT, _HKI( "Segment" ) )
|
|
|
|
.Map( SHAPE_T::RECT, _HKI( "Rectangle" ) )
|
|
|
|
.Map( SHAPE_T::ARC, _HKI( "Arc" ) )
|
|
|
|
.Map( SHAPE_T::CIRCLE, _HKI( "Circle" ) )
|
|
|
|
.Map( SHAPE_T::POLY, _HKI( "Polygon" ) )
|
|
|
|
.Map( SHAPE_T::BEZIER, _HKI( "Bezier" ) );
|
|
|
|
ENUM_MAP<PLOT_DASH_TYPE>::Instance()
|
|
|
|
.Map( PLOT_DASH_TYPE::DEFAULT, _HKI( "Default" ) )
|
|
|
|
.Map( PLOT_DASH_TYPE::SOLID, _HKI( "Solid" ) )
|
|
|
|
.Map( PLOT_DASH_TYPE::DASH, _HKI( "Dashed" ) )
|
|
|
|
.Map( PLOT_DASH_TYPE::DOT, _HKI( "Dotted" ) )
|
2021-08-25 23:14:36 +00:00
|
|
|
.Map( PLOT_DASH_TYPE::DASHDOT, _HKI( "Dash-Dot" ) )
|
|
|
|
.Map( PLOT_DASH_TYPE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
|
2021-10-14 23:39:31 +00:00
|
|
|
|
|
|
|
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
|
|
|
|
REGISTER_TYPE( EDA_SHAPE );
|
2020-02-02 18:40:14 +00:00
|
|
|
auto shape = new PROPERTY_ENUM<EDA_SHAPE, SHAPE_T>( _HKI( "Shape" ),
|
|
|
|
NO_SETTER( EDA_SHAPE, SHAPE_T ), &EDA_SHAPE::GetShape );
|
|
|
|
propMgr.AddProperty( shape );
|
2021-10-14 23:39:31 +00:00
|
|
|
propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Start X" ),
|
2022-10-31 01:09:59 +00:00
|
|
|
&EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD,
|
|
|
|
ORIGIN_TRANSFORMS::ABS_X_COORD ) );
|
2021-10-14 23:39:31 +00:00
|
|
|
propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Start Y" ),
|
2022-10-31 01:09:59 +00:00
|
|
|
&EDA_SHAPE::SetStartY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::PT_COORD,
|
|
|
|
ORIGIN_TRANSFORMS::ABS_Y_COORD ) );
|
2021-10-14 23:39:31 +00:00
|
|
|
propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "End X" ),
|
2022-10-31 01:09:59 +00:00
|
|
|
&EDA_SHAPE::SetEndX, &EDA_SHAPE::GetEndX, PROPERTY_DISPLAY::PT_COORD,
|
|
|
|
ORIGIN_TRANSFORMS::ABS_X_COORD ) );
|
2021-10-14 23:39:31 +00:00
|
|
|
propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "End Y" ),
|
2022-10-31 01:09:59 +00:00
|
|
|
&EDA_SHAPE::SetEndY, &EDA_SHAPE::GetEndY, PROPERTY_DISPLAY::PT_COORD,
|
|
|
|
ORIGIN_TRANSFORMS::ABS_Y_COORD ) );
|
2021-10-14 23:39:31 +00:00
|
|
|
// TODO: m_arcCenter, m_bezierC1, m_bezierC2, m_poly
|
|
|
|
propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Line Width" ),
|
2020-04-06 16:23:21 +00:00
|
|
|
&EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) );
|
2020-02-02 18:40:14 +00:00
|
|
|
|
|
|
|
auto angle = new PROPERTY<EDA_SHAPE, EDA_ANGLE>( _HKI( "Angle" ),
|
|
|
|
NO_SETTER( EDA_SHAPE, EDA_ANGLE ), &EDA_SHAPE::GetArcAngle,
|
2020-04-06 16:23:21 +00:00
|
|
|
PROPERTY_DISPLAY::PT_DECIDEGREE );
|
2020-02-02 18:40:14 +00:00
|
|
|
angle->SetAvailableFunc(
|
|
|
|
[=]( INSPECTABLE* aItem ) -> bool
|
|
|
|
{
|
2020-03-29 19:14:10 +00:00
|
|
|
return aItem->Get<SHAPE_T>( shape ) == SHAPE_T::ARC;
|
2020-02-02 18:40:14 +00:00
|
|
|
} );
|
|
|
|
propMgr.AddProperty( angle );
|
2022-12-22 22:44:31 +00:00
|
|
|
|
|
|
|
auto filled = new PROPERTY<EDA_SHAPE, bool>( _HKI( "Filled" ),
|
|
|
|
&EDA_SHAPE::SetFilled, &EDA_SHAPE::IsFilled );
|
|
|
|
filled->SetAvailableFunc(
|
|
|
|
[=]( INSPECTABLE* aItem ) -> bool
|
|
|
|
{
|
|
|
|
SHAPE_T itemShape = aItem->Get<SHAPE_T>( shape );
|
|
|
|
|
|
|
|
switch( itemShape )
|
|
|
|
{
|
|
|
|
case SHAPE_T::POLY:
|
|
|
|
case SHAPE_T::RECT:
|
|
|
|
case SHAPE_T::CIRCLE:
|
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} );
|
|
|
|
|
|
|
|
propMgr.AddProperty( filled );
|
2021-10-14 23:39:31 +00:00
|
|
|
}
|
|
|
|
} _EDA_SHAPE_DESC;
|