2012-01-14 19:50:32 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
2018-07-22 12:50:35 +00:00
|
|
|
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
2012-06-08 09:56:42 +00:00
|
|
|
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
|
2012-01-14 19:50:32 +00:00
|
|
|
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
|
2019-03-23 18:26:44 +00:00
|
|
|
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
|
2012-01-14 19:50: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
|
|
|
|
*/
|
|
|
|
|
2012-01-23 04:33:36 +00:00
|
|
|
#include <fctsys.h>
|
|
|
|
#include <gr_basic.h>
|
|
|
|
#include <bezier_curves.h>
|
2018-01-29 10:37:29 +00:00
|
|
|
#include <pcb_screen.h>
|
2017-02-20 12:20:39 +00:00
|
|
|
#include <bitmaps.h>
|
2018-01-29 20:58:58 +00:00
|
|
|
#include <pcb_edit_frame.h>
|
2012-01-23 04:33:36 +00:00
|
|
|
#include <class_board.h>
|
|
|
|
#include <class_module.h>
|
|
|
|
#include <class_drawsegment.h>
|
2012-04-27 14:15:11 +00:00
|
|
|
#include <base_units.h>
|
2020-07-02 16:06:09 +00:00
|
|
|
#include <geometry/shape_simple.h>
|
|
|
|
#include <geometry/shape_segment.h>
|
|
|
|
#include <geometry/shape_circle.h>
|
2020-07-15 16:23:36 +00:00
|
|
|
#include <geometry/shape_compound.h>
|
2020-01-13 01:44:19 +00:00
|
|
|
#include <settings/color_settings.h>
|
|
|
|
#include <settings/settings_manager.h>
|
2011-09-23 13:57:12 +00:00
|
|
|
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2008-12-04 04:28:11 +00:00
|
|
|
DRAWSEGMENT::DRAWSEGMENT( BOARD_ITEM* aParent, KICAD_T idtype ) :
|
|
|
|
BOARD_ITEM( aParent, idtype )
|
2008-01-16 18:48:04 +00:00
|
|
|
{
|
2013-07-29 07:33:56 +00:00
|
|
|
m_Type = 0;
|
|
|
|
m_Angle = 0;
|
2013-03-31 13:27:46 +00:00
|
|
|
m_Flags = 0;
|
2011-08-08 23:50:55 +00:00
|
|
|
m_Shape = S_SEGMENT;
|
2018-10-07 22:11:11 +00:00
|
|
|
m_Width = Millimeter2iu( DEFAULT_LINE_WIDTH );
|
2008-01-16 18:48:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-12-14 04:29:25 +00:00
|
|
|
DRAWSEGMENT::~DRAWSEGMENT()
|
2008-01-16 18:48:04 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
void DRAWSEGMENT::SetPosition( const wxPoint& aPos )
|
|
|
|
{
|
|
|
|
m_Start = aPos;
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2020-02-02 17:52:19 +00:00
|
|
|
wxPoint DRAWSEGMENT::GetPosition() const
|
2017-12-18 17:24:25 +00:00
|
|
|
{
|
|
|
|
if( m_Shape == S_POLYGON )
|
|
|
|
return (wxPoint) m_Poly.CVertex( 0 );
|
|
|
|
else
|
|
|
|
return m_Start;
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
|
|
|
double DRAWSEGMENT::GetLength() const
|
|
|
|
{
|
|
|
|
double length = 0.0;
|
|
|
|
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_CURVE:
|
|
|
|
for( size_t ii = 1; ii < m_BezierPoints.size(); ++ii )
|
|
|
|
length += GetLineLength( m_BezierPoints[ii - 1], m_BezierPoints[ii] );
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
case S_SEGMENT:
|
2019-04-14 17:58:35 +00:00
|
|
|
length = GetLineLength( GetStart(), GetEnd() );
|
|
|
|
break;
|
2020-06-15 19:50:20 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
wxASSERT_MSG( false, "DRAWSEGMENT::GetLength not implemented for shape"
|
|
|
|
+ ShowShape( GetShape() ) );
|
|
|
|
break;
|
2019-04-14 17:58:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
void DRAWSEGMENT::Move( const wxPoint& aMoveVector )
|
|
|
|
{
|
2020-01-14 01:04:35 +00:00
|
|
|
// Move vector should not affect start/end for polygon since it will
|
|
|
|
// be applied directly to polygon outline.
|
|
|
|
if( m_Shape != S_POLYGON )
|
|
|
|
{
|
|
|
|
m_Start += aMoveVector;
|
|
|
|
m_End += aMoveVector;
|
|
|
|
}
|
2017-12-18 17:24:25 +00:00
|
|
|
|
|
|
|
switch ( m_Shape )
|
|
|
|
{
|
|
|
|
case S_POLYGON:
|
2019-03-23 18:26:44 +00:00
|
|
|
m_Poly.Move( VECTOR2I( aMoveVector ) );
|
2017-12-18 17:24:25 +00:00
|
|
|
break;
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
case S_CURVE:
|
|
|
|
m_BezierC1 += aMoveVector;
|
|
|
|
m_BezierC2 += aMoveVector;
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
for( wxPoint& pt : m_BezierPoints)
|
|
|
|
pt += aMoveVector;
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2020-06-24 11:12:39 +00:00
|
|
|
void DRAWSEGMENT::Scale( double aScale )
|
|
|
|
{
|
|
|
|
auto scalePt = [&]( wxPoint& pt )
|
|
|
|
{
|
|
|
|
pt.x = KiROUND( pt.x * aScale );
|
|
|
|
pt.y = KiROUND( pt.y * aScale );
|
|
|
|
};
|
|
|
|
|
|
|
|
int radius = GetRadius();
|
|
|
|
|
|
|
|
scalePt( m_Start );
|
|
|
|
scalePt( m_End );
|
|
|
|
|
|
|
|
// specific parameters:
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_CURVE:
|
|
|
|
scalePt( m_BezierC1 );
|
|
|
|
scalePt( m_BezierC2 );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_CIRCLE: // ring or circle
|
|
|
|
m_End.x = m_Start.x + KiROUND( radius * aScale );
|
|
|
|
m_End.y = m_Start.y;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_POLYGON: // polygon
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> pts;
|
|
|
|
|
|
|
|
for( const VECTOR2I& pt : m_Poly.Outline( 0 ).CPoints() )
|
|
|
|
{
|
|
|
|
pts.emplace_back( pt );
|
|
|
|
scalePt( pts.back() );
|
|
|
|
}
|
|
|
|
|
|
|
|
SetPolyPoints( pts );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-12-14 04:29:25 +00:00
|
|
|
void DRAWSEGMENT::Rotate( const wxPoint& aRotCentre, double aAngle )
|
2009-08-01 19:26:05 +00:00
|
|
|
{
|
2015-02-12 03:22:24 +00:00
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
|
|
|
case S_SEGMENT:
|
|
|
|
case S_CIRCLE:
|
|
|
|
// these can all be done by just rotating the start and end points
|
|
|
|
RotatePoint( &m_Start, aRotCentre, aAngle);
|
|
|
|
RotatePoint( &m_End, aRotCentre, aAngle);
|
|
|
|
break;
|
|
|
|
|
2020-06-24 11:12:39 +00:00
|
|
|
case S_RECT:
|
|
|
|
if( KiROUND( aAngle ) % 900 == 0 )
|
|
|
|
{
|
|
|
|
RotatePoint( &m_Start, aRotCentre, aAngle );
|
|
|
|
RotatePoint( &m_End, aRotCentre, aAngle );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convert non-cartesian-rotated rect to a diamond
|
|
|
|
m_Shape = S_POLYGON;
|
|
|
|
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;
|
|
|
|
|
2015-02-12 03:22:24 +00:00
|
|
|
case S_POLYGON:
|
2019-03-23 18:26:44 +00:00
|
|
|
m_Poly.Rotate( -DECIDEG2RAD( aAngle ), VECTOR2I( aRotCentre ) );
|
2015-02-12 03:22:24 +00:00
|
|
|
break;
|
2009-08-01 19:26:05 +00:00
|
|
|
|
2015-02-12 03:22:24 +00:00
|
|
|
case S_CURVE:
|
|
|
|
RotatePoint( &m_Start, aRotCentre, aAngle);
|
|
|
|
RotatePoint( &m_End, aRotCentre, aAngle);
|
2018-07-07 11:04:01 +00:00
|
|
|
RotatePoint( &m_BezierC1, aRotCentre, aAngle);
|
|
|
|
RotatePoint( &m_BezierC2, aRotCentre, aAngle);
|
2015-02-12 03:22:24 +00:00
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
for( wxPoint& pt : m_BezierPoints )
|
|
|
|
RotatePoint( &pt, aRotCentre, aAngle);
|
|
|
|
|
2015-02-12 03:22:24 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::Rotate not implemented for " + STROKE_T_asString( m_Shape ) );
|
2015-02-12 03:22:24 +00:00
|
|
|
break;
|
|
|
|
}
|
2017-11-02 20:41:29 +00:00
|
|
|
}
|
2011-08-08 23:50:55 +00:00
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2019-07-12 21:02:10 +00:00
|
|
|
void DRAWSEGMENT::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
|
2009-08-01 19:26:05 +00:00
|
|
|
{
|
2019-07-12 21:02:10 +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 );
|
|
|
|
}
|
2012-01-14 19:50:32 +00:00
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
switch ( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
2015-06-26 13:41:56 +00:00
|
|
|
m_Angle = -m_Angle;
|
2017-12-18 17:24:25 +00:00
|
|
|
break;
|
2018-07-07 11:04:01 +00:00
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
case S_POLYGON:
|
2019-03-23 18:26:44 +00:00
|
|
|
m_Poly.Mirror( aFlipLeftRight, !aFlipLeftRight, VECTOR2I( aCentre ) );
|
2017-12-18 17:24:25 +00:00
|
|
|
break;
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
case S_CURVE:
|
|
|
|
{
|
2019-07-12 21:02:10 +00:00
|
|
|
if( aFlipLeftRight )
|
|
|
|
{
|
|
|
|
m_BezierC1.x = aCentre.x - ( m_BezierC1.x - aCentre.x );
|
|
|
|
m_BezierC2.x = aCentre.x - ( m_BezierC2.x - aCentre.x );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_BezierC1.y = aCentre.y - ( m_BezierC1.y - aCentre.y );
|
|
|
|
m_BezierC2.y = aCentre.y - ( m_BezierC2.y - aCentre.y );
|
|
|
|
}
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
// Rebuild the poly points shape
|
|
|
|
std::vector<wxPoint> ctrlPoints = { m_Start, m_BezierC1, m_BezierC2, m_End };
|
|
|
|
BEZIER_POLY converter( ctrlPoints );
|
|
|
|
converter.GetPoly( m_BezierPoints, m_Width );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2020-06-30 12:41:59 +00:00
|
|
|
case S_SEGMENT:
|
|
|
|
case S_RECT:
|
|
|
|
case S_CIRCLE:
|
|
|
|
break;
|
|
|
|
|
2017-12-18 17:24:25 +00:00
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::Flip not implemented for " + STROKE_T_asString( m_Shape ) );
|
2017-12-18 17:24:25 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-01-14 19:50:32 +00:00
|
|
|
|
2015-12-27 15:51:13 +00:00
|
|
|
// DRAWSEGMENT items are not allowed on copper layers, so
|
2018-07-07 11:04:01 +00:00
|
|
|
// copper layers count is not taken in account in Flip transform
|
2013-04-05 19:04:58 +00:00
|
|
|
SetLayer( FlipLayer( GetLayer() ) );
|
2009-08-01 19:26:05 +00:00
|
|
|
}
|
|
|
|
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
void DRAWSEGMENT::RebuildBezierToSegmentsPointsList( int aMinSegLen )
|
|
|
|
{
|
|
|
|
// Has meaning only for S_CURVE DRAW_SEGMENT shape
|
|
|
|
if( m_Shape != S_CURVE )
|
|
|
|
{
|
|
|
|
m_BezierPoints.clear();
|
|
|
|
return;
|
|
|
|
}
|
2020-07-22 23:05:22 +00:00
|
|
|
// Rebuild the m_BezierPoints vertex list that approximate the Bezier curve
|
|
|
|
m_BezierPoints = buildBezierToSegmentsPointsList( aMinSegLen );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const std::vector<wxPoint> DRAWSEGMENT::buildBezierToSegmentsPointsList( int aMinSegLen ) const
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> bezierPoints;
|
|
|
|
|
2018-07-07 11:04:01 +00:00
|
|
|
// Rebuild the m_BezierPoints vertex list that approximate the Bezier curve
|
|
|
|
std::vector<wxPoint> ctrlPoints = { m_Start, m_BezierC1, m_BezierC2, m_End };
|
|
|
|
BEZIER_POLY converter( ctrlPoints );
|
2020-07-22 23:05:22 +00:00
|
|
|
converter.GetPoly( bezierPoints, aMinSegLen );
|
|
|
|
|
|
|
|
return bezierPoints;
|
2018-07-07 11:04:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-02-02 17:52:19 +00:00
|
|
|
wxPoint DRAWSEGMENT::GetCenter() const
|
2015-02-12 03:22:24 +00:00
|
|
|
{
|
|
|
|
wxPoint c;
|
|
|
|
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
|
|
|
case S_CIRCLE:
|
|
|
|
c = m_Start;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_SEGMENT:
|
|
|
|
// Midpoint of the line
|
|
|
|
c = ( GetStart() + GetEnd() ) / 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_POLYGON:
|
|
|
|
case S_RECT:
|
|
|
|
case S_CURVE:
|
|
|
|
c = GetBoundingBox().Centre();
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::GetCentre not implemented for " + STROKE_T_asString( m_Shape ) );
|
2015-02-12 03:22:24 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2020-02-02 17:52:19 +00:00
|
|
|
wxPoint DRAWSEGMENT::GetArcEnd() const
|
2011-12-14 04:29:25 +00:00
|
|
|
{
|
2018-12-08 15:26:47 +00:00
|
|
|
wxPoint endPoint( m_End ); // start of arc
|
2011-12-14 04:29:25 +00:00
|
|
|
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
|
|
|
// rotate the starting point of the arc, given by m_End, through the
|
|
|
|
// angle m_Angle to get the ending point of the arc.
|
|
|
|
// m_Start is the arc centre
|
|
|
|
endPoint = m_End; // m_End = start point of arc
|
|
|
|
RotatePoint( &endPoint, m_Start, -m_Angle );
|
2012-05-22 17:51:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2017-12-18 17:24:25 +00:00
|
|
|
break;
|
2011-12-14 04:29:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return endPoint; // after rotation, the end of the arc.
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2020-02-02 17:52:19 +00:00
|
|
|
wxPoint DRAWSEGMENT::GetArcMid() const
|
2018-12-08 15:26:47 +00:00
|
|
|
{
|
|
|
|
wxPoint endPoint( m_End );
|
|
|
|
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
|
|
|
// rotate the starting point of the arc, given by m_End, through half
|
|
|
|
// the angle m_Angle to get the middle of the arc.
|
|
|
|
// m_Start is the arc centre
|
|
|
|
endPoint = m_End; // m_End = start point of arc
|
|
|
|
RotatePoint( &endPoint, m_Start, -m_Angle / 2.0 );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return endPoint; // after rotation, the end of the arc.
|
|
|
|
}
|
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2014-02-07 18:55:40 +00:00
|
|
|
double DRAWSEGMENT::GetArcAngleStart() const
|
2008-05-05 19:46:54 +00:00
|
|
|
{
|
2012-07-05 09:29:42 +00:00
|
|
|
// due to the Y axis orient atan2 needs - y value
|
2013-05-01 17:32:36 +00:00
|
|
|
double angleStart = ArcTangente( GetArcStart().y - GetCenter().y,
|
|
|
|
GetArcStart().x - GetCenter().x );
|
2012-07-05 09:29:42 +00:00
|
|
|
|
|
|
|
// Normalize it to 0 ... 360 deg, to avoid discontinuity for angles near 180 deg
|
|
|
|
// because 180 deg and -180 are very near angles when ampping betewwen -180 ... 180 deg.
|
|
|
|
// and this is not easy to handle in calculations
|
2013-05-01 17:32:36 +00:00
|
|
|
NORMALIZE_ANGLE_POS( angleStart );
|
2012-07-05 09:29:42 +00:00
|
|
|
|
|
|
|
return angleStart;
|
2008-05-05 19:46:54 +00:00
|
|
|
}
|
|
|
|
|
2014-02-07 18:55:40 +00:00
|
|
|
|
2011-12-02 21:56:47 +00:00
|
|
|
void DRAWSEGMENT::SetAngle( double aAngle )
|
|
|
|
{
|
2017-10-23 13:35:03 +00:00
|
|
|
// m_Angle must be >= -360 and <= +360 degrees
|
|
|
|
m_Angle = NormalizeAngle360Max( aAngle );
|
2011-12-02 21:56:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
MODULE* DRAWSEGMENT::GetParentModule() const
|
|
|
|
{
|
2017-09-08 18:18:52 +00:00
|
|
|
if( !m_Parent || m_Parent->Type() != PCB_MODULE_T )
|
2011-08-08 23:50:55 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return (MODULE*) m_Parent;
|
|
|
|
}
|
|
|
|
|
2008-05-05 19:46:54 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
void DRAWSEGMENT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList )
|
2008-01-16 18:48:04 +00:00
|
|
|
{
|
2020-04-24 13:36:10 +00:00
|
|
|
EDA_UNITS units = aFrame->GetUserUnits();
|
|
|
|
wxString msg;
|
2008-03-04 04:22:27 +00:00
|
|
|
|
2014-11-15 13:09:59 +00:00
|
|
|
msg = _( "Drawing" );
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Type" ), msg, DARKCYAN );
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2008-05-05 19:46:54 +00:00
|
|
|
wxString shape = _( "Shape" );
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2013-01-12 17:32:24 +00:00
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_CIRCLE:
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( shape, _( "Circle" ), RED );
|
2018-04-17 18:21:34 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
msg = MessageTextFromValue( units, GetLineLength( m_Start, m_End ) );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Radius" ), msg, RED );
|
2013-01-12 17:32:24 +00:00
|
|
|
break;
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2013-01-12 17:32:24 +00:00
|
|
|
case S_ARC:
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( shape, _( "Arc" ), RED );
|
2013-05-01 17:32:36 +00:00
|
|
|
msg.Printf( wxT( "%.1f" ), m_Angle / 10.0 );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Angle" ), msg, RED );
|
2018-04-17 18:21:34 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
msg = MessageTextFromValue( units, GetLineLength( m_Start, m_End ) );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Radius" ), msg, RED );
|
2013-01-12 17:32:24 +00:00
|
|
|
break;
|
2008-05-05 19:46:54 +00:00
|
|
|
|
2013-01-12 17:32:24 +00:00
|
|
|
case S_CURVE:
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( shape, _( "Curve" ), RED );
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
msg = MessageTextFromValue( units, GetLength() );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Length" ), msg, DARKGREEN );
|
2013-01-12 17:32:24 +00:00
|
|
|
break;
|
2008-05-05 19:46:54 +00:00
|
|
|
|
2019-12-17 07:40:44 +00:00
|
|
|
case S_POLYGON:
|
|
|
|
aList.emplace_back( shape, _( "Polygon" ), RED );
|
|
|
|
|
|
|
|
msg.Printf( "%d", GetPolyShape().Outline(0).PointCount() );
|
|
|
|
aList.emplace_back( _( "Points" ), msg, DARKGREEN );
|
|
|
|
break;
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
case S_RECT:
|
|
|
|
aList.emplace_back( shape, _( "Rectangle" ), RED );
|
|
|
|
|
|
|
|
msg = MessageTextFromValue( units, std::abs( m_End.x - m_Start.x ) );
|
|
|
|
aList.emplace_back( _( "Width" ), msg, DARKGREEN );
|
|
|
|
|
|
|
|
msg = MessageTextFromValue( units, std::abs( m_End.y - m_Start.y ) );
|
|
|
|
aList.emplace_back( _( "Height" ), msg, DARKGREEN );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_SEGMENT:
|
2014-11-15 13:09:59 +00:00
|
|
|
{
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( shape, _( "Segment" ), RED );
|
2014-11-15 13:09:59 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
msg = MessageTextFromValue( units, GetLineLength( m_Start, m_End ) );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Length" ), msg, DARKGREEN );
|
2014-11-15 13:09:59 +00:00
|
|
|
|
|
|
|
// angle counter-clockwise from 3'o-clock
|
2016-01-17 15:59:24 +00:00
|
|
|
const double deg = RAD2DEG( atan2( (double)( m_Start.y - m_End.y ),
|
|
|
|
(double)( m_End.x - m_Start.x ) ) );
|
2014-11-15 13:09:59 +00:00
|
|
|
msg.Printf( wxT( "%.1f" ), deg );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Angle" ), msg, DARKGREEN );
|
2014-11-15 13:09:59 +00:00
|
|
|
}
|
2020-06-15 19:50:20 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
aList.emplace_back( shape, _( "Unrecognized" ), RED );
|
|
|
|
break;
|
2009-06-25 20:45:27 +00:00
|
|
|
}
|
2011-09-07 19:41:04 +00:00
|
|
|
|
2019-12-18 12:15:59 +00:00
|
|
|
if( m_Shape == S_POLYGON )
|
|
|
|
{
|
|
|
|
VECTOR2I point0 = GetPolyShape().Outline(0).CPoint(0);
|
|
|
|
wxString origin = wxString::Format( "@(%s, %s)",
|
2020-04-24 13:36:10 +00:00
|
|
|
MessageTextFromValue( units, point0.x ),
|
|
|
|
MessageTextFromValue( units, point0.y ) );
|
2019-12-18 12:15:59 +00:00
|
|
|
|
|
|
|
aList.emplace_back( _( "Origin" ), origin, DARKGREEN );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
wxString start = wxString::Format( "@(%s, %s)",
|
2020-04-24 13:36:10 +00:00
|
|
|
MessageTextFromValue( units, GetStart().x ),
|
|
|
|
MessageTextFromValue( units, GetStart().y ) );
|
2019-12-18 12:15:59 +00:00
|
|
|
wxString end = wxString::Format( "@(%s, %s)",
|
2020-04-24 13:36:10 +00:00
|
|
|
MessageTextFromValue( units, GetEnd().x ),
|
|
|
|
MessageTextFromValue( units, GetEnd().y ) );
|
2019-12-18 12:15:59 +00:00
|
|
|
|
|
|
|
aList.emplace_back( start, end, DARKGREEN );
|
|
|
|
}
|
|
|
|
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Layer" ), GetLayerName(), DARKBROWN );
|
2018-04-10 10:52:12 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
msg = MessageTextFromValue( units, m_Width, true );
|
2019-12-05 15:41:21 +00:00
|
|
|
aList.emplace_back( _( "Width" ), msg, DARKCYAN );
|
2008-01-16 18:48:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-24 17:48:14 +00:00
|
|
|
const EDA_RECT DRAWSEGMENT::GetBoundingBox() const
|
2008-01-16 18:48:04 +00:00
|
|
|
{
|
2011-08-08 23:50:55 +00:00
|
|
|
EDA_RECT bbox;
|
|
|
|
|
|
|
|
bbox.SetOrigin( m_Start );
|
2008-01-16 18:48:04 +00:00
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
switch( m_Shape )
|
2011-02-27 19:54:01 +00:00
|
|
|
{
|
2020-06-15 19:50:20 +00:00
|
|
|
case S_RECT:
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> pts;
|
|
|
|
GetRectCorners( &pts );
|
|
|
|
|
|
|
|
bbox = EDA_RECT(); // re-init for merging
|
|
|
|
|
|
|
|
for( wxPoint& pt : pts )
|
|
|
|
bbox.Merge( pt );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_SEGMENT:
|
|
|
|
bbox.SetEnd( m_End );
|
|
|
|
break;
|
2009-06-25 20:45:27 +00:00
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_CIRCLE:
|
|
|
|
bbox.Inflate( GetRadius() );
|
|
|
|
break;
|
2009-06-25 20:45:27 +00:00
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_ARC:
|
2015-09-03 21:05:01 +00:00
|
|
|
computeArcBBox( bbox );
|
|
|
|
break;
|
2009-06-25 20:45:27 +00:00
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_POLYGON:
|
2017-10-25 07:39:26 +00:00
|
|
|
if( m_Poly.IsEmpty() )
|
|
|
|
break;
|
2014-11-15 19:06:05 +00:00
|
|
|
{
|
|
|
|
MODULE* module = GetParentModule();
|
2020-06-15 19:50:20 +00:00
|
|
|
bbox = EDA_RECT(); // re-init for merging
|
2014-11-15 19:06:05 +00:00
|
|
|
|
2017-10-19 21:16:06 +00:00
|
|
|
for( auto iter = m_Poly.CIterate(); iter; iter++ )
|
2011-08-08 23:50:55 +00:00
|
|
|
{
|
2017-10-19 21:16:06 +00:00
|
|
|
wxPoint pt ( iter->x, iter->y );
|
|
|
|
|
2014-11-15 19:06:05 +00:00
|
|
|
if( module ) // Transform, if we belong to a module
|
2011-08-08 23:50:55 +00:00
|
|
|
{
|
2014-11-15 19:06:05 +00:00
|
|
|
RotatePoint( &pt, module->GetOrientation() );
|
|
|
|
pt += module->GetPosition();
|
2012-04-16 12:56:01 +00:00
|
|
|
}
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
bbox.Merge( pt );
|
2017-10-19 21:16:06 +00:00
|
|
|
}
|
2020-06-15 19:50:20 +00:00
|
|
|
}
|
2012-05-22 17:51:18 +00:00
|
|
|
break;
|
2018-07-07 11:04:01 +00:00
|
|
|
|
|
|
|
case S_CURVE:
|
2019-05-29 03:39:08 +00:00
|
|
|
bbox.Merge( m_BezierC1 );
|
|
|
|
bbox.Merge( m_BezierC2 );
|
|
|
|
bbox.Merge( m_End );
|
2018-07-07 11:04:01 +00:00
|
|
|
break;
|
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::GetBoundingBox not implemented for "
|
|
|
|
+ STROKE_T_asString( m_Shape ) );
|
2017-05-09 07:28:01 +00:00
|
|
|
break;
|
2011-08-08 23:50:55 +00:00
|
|
|
}
|
|
|
|
|
2012-04-16 12:56:01 +00:00
|
|
|
bbox.Inflate( ((m_Width+1) / 2) + 1 );
|
|
|
|
bbox.Normalize();
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
return bbox;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-05 10:33:34 +00:00
|
|
|
bool DRAWSEGMENT::HitTest( const wxPoint& aPosition, int aAccuracy ) const
|
2011-08-08 23:50:55 +00:00
|
|
|
{
|
2019-05-05 10:33:34 +00:00
|
|
|
int maxdist = aAccuracy + ( m_Width / 2 );
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_CIRCLE:
|
2020-06-27 11:57:40 +00:00
|
|
|
{
|
|
|
|
int radius = GetRadius();
|
|
|
|
int dist = KiROUND( EuclideanNorm( aPosition - GetCenter() ) );
|
|
|
|
|
2020-07-02 16:06:09 +00:00
|
|
|
if( m_Width == 0 ) // Filled circle hit-test
|
2020-06-27 11:57:40 +00:00
|
|
|
{
|
|
|
|
if( dist <= radius + maxdist )
|
|
|
|
return true;
|
|
|
|
}
|
2020-07-02 16:06:09 +00:00
|
|
|
else // Ring hit-test
|
2020-06-27 11:57:40 +00:00
|
|
|
{
|
|
|
|
if( abs( radius - dist ) <= maxdist )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
case S_ARC:
|
2014-11-15 19:06:05 +00:00
|
|
|
{
|
|
|
|
wxPoint relPos = aPosition - GetCenter();
|
|
|
|
int radius = GetRadius();
|
|
|
|
int dist = KiROUND( EuclideanNorm( relPos ) );
|
|
|
|
|
2019-05-05 10:33:34 +00:00
|
|
|
if( abs( radius - dist ) <= maxdist )
|
2011-08-08 23:50:55 +00:00
|
|
|
{
|
2014-11-15 19:06:05 +00:00
|
|
|
// For arcs, the test point angle must be >= arc angle start
|
|
|
|
// and <= arc angle end
|
|
|
|
// However angle values > 360 deg are not easy to handle
|
|
|
|
// so we calculate the relative angle between arc start point and teast point
|
|
|
|
// this relative arc should be < arc angle if arc angle > 0 (CW arc)
|
|
|
|
// and > arc angle if arc angle < 0 (CCW arc)
|
|
|
|
double arc_angle_start = GetArcAngleStart(); // Always 0.0 ... 360 deg, in 0.1 deg
|
2011-08-08 23:50:55 +00:00
|
|
|
|
2014-11-15 19:06:05 +00:00
|
|
|
double arc_hittest = ArcTangente( relPos.y, relPos.x );
|
|
|
|
|
|
|
|
// Calculate relative angle between the starting point of the arc, and the test point
|
|
|
|
arc_hittest -= arc_angle_start;
|
|
|
|
|
|
|
|
// Normalise arc_hittest between 0 ... 360 deg
|
|
|
|
NORMALIZE_ANGLE_POS( arc_hittest );
|
|
|
|
|
|
|
|
// Check angle: inside the arc angle when it is > 0
|
|
|
|
// and outside the not drawn arc when it is < 0
|
|
|
|
if( GetAngle() >= 0.0 )
|
2012-05-22 17:51:18 +00:00
|
|
|
{
|
2014-11-15 19:06:05 +00:00
|
|
|
if( arc_hittest <= GetAngle() )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if( arc_hittest >= (3600.0 + GetAngle()) )
|
2012-05-22 17:51:18 +00:00
|
|
|
return true;
|
|
|
|
}
|
2011-08-08 23:50:55 +00:00
|
|
|
}
|
2014-11-15 19:06:05 +00:00
|
|
|
}
|
2012-05-22 17:51:18 +00:00
|
|
|
break;
|
2011-08-08 23:50:55 +00:00
|
|
|
|
|
|
|
case S_CURVE:
|
2018-07-07 11:04:01 +00:00
|
|
|
((DRAWSEGMENT*)this)->RebuildBezierToSegmentsPointsList( m_Width );
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
for( unsigned int i= 1; i < m_BezierPoints.size(); i++)
|
|
|
|
{
|
2019-11-05 15:17:56 +00:00
|
|
|
if( TestSegmentHit( aPosition, m_BezierPoints[i-1], m_BezierPoints[i], maxdist ) )
|
2008-01-16 18:48:04 +00:00
|
|
|
return true;
|
2011-08-08 23:50:55 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_SEGMENT:
|
2019-05-05 10:33:34 +00:00
|
|
|
if( TestSegmentHit( aPosition, m_Start, m_End, maxdist ) )
|
2011-08-08 23:50:55 +00:00
|
|
|
return true;
|
|
|
|
break;
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
case S_RECT:
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> pts;
|
|
|
|
GetRectCorners( &pts );
|
|
|
|
|
2020-07-02 16:06:09 +00:00
|
|
|
if( m_Width == 0 ) // Filled rect hit-test
|
2020-06-15 19:50:20 +00:00
|
|
|
{
|
2020-06-27 11:57:40 +00:00
|
|
|
SHAPE_POLY_SET poly;
|
|
|
|
poly.NewOutline();
|
|
|
|
|
|
|
|
for( const wxPoint& pt : pts )
|
|
|
|
poly.Append( pt );
|
|
|
|
|
|
|
|
if( poly.Collide( VECTOR2I( aPosition ), maxdist ) )
|
|
|
|
return true;
|
|
|
|
}
|
2020-07-02 16:06:09 +00:00
|
|
|
else // Open rect hit-test
|
2020-06-27 11:57:40 +00:00
|
|
|
{
|
|
|
|
if( 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 ) )
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
2020-06-15 19:50:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2018-12-05 01:18:28 +00:00
|
|
|
case S_POLYGON:
|
2017-10-19 21:16:06 +00:00
|
|
|
{
|
2018-12-05 08:57:59 +00:00
|
|
|
if( !IsPolygonFilled() )
|
2018-12-05 01:18:28 +00:00
|
|
|
{
|
2020-06-27 11:57:40 +00:00
|
|
|
SHAPE_POLY_SET::VERTEX_INDEX dummy;
|
|
|
|
return m_Poly.CollideEdge( VECTOR2I( aPosition ), dummy, maxdist );
|
2018-12-05 01:18:28 +00:00
|
|
|
}
|
|
|
|
else
|
2019-05-05 10:33:34 +00:00
|
|
|
return m_Poly.Collide( VECTOR2I( aPosition ), maxdist );
|
2017-10-19 21:16:06 +00:00
|
|
|
}
|
2015-02-17 16:32:47 +00:00
|
|
|
break;
|
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::HitTest (point) not implemented for "
|
|
|
|
+ STROKE_T_asString( m_Shape ) );
|
2011-08-08 23:50:55 +00:00
|
|
|
break;
|
2008-01-16 18:48:04 +00:00
|
|
|
}
|
2014-11-15 19:06:05 +00:00
|
|
|
|
2008-01-16 18:48:04 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-21 18:09:41 +00:00
|
|
|
bool DRAWSEGMENT::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const
|
2008-01-16 18:48:04 +00:00
|
|
|
{
|
2013-09-21 18:09:41 +00:00
|
|
|
EDA_RECT arect = aRect;
|
2017-04-22 06:49:15 +00:00
|
|
|
arect.Normalize();
|
2013-09-21 18:09:41 +00:00
|
|
|
arect.Inflate( aAccuracy );
|
|
|
|
|
2017-04-20 14:53:57 +00:00
|
|
|
EDA_RECT arcRect;
|
2017-05-09 07:28:01 +00:00
|
|
|
EDA_RECT bb = GetBoundingBox();
|
2017-04-20 14:53:57 +00:00
|
|
|
|
2011-08-08 23:50:55 +00:00
|
|
|
switch( m_Shape )
|
2011-02-27 19:54:01 +00:00
|
|
|
{
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_CIRCLE:
|
2013-09-21 18:09:41 +00:00
|
|
|
// Test if area intersects or contains the circle:
|
|
|
|
if( aContained )
|
2017-05-09 07:28:01 +00:00
|
|
|
return arect.Contains( bb );
|
2013-09-21 18:09:41 +00:00
|
|
|
else
|
2017-04-20 14:53:57 +00:00
|
|
|
{
|
|
|
|
// If the rectangle does not intersect the bounding box, this is a much quicker test
|
2017-05-09 07:28:01 +00:00
|
|
|
if( !aRect.Intersects( bb ) )
|
2017-04-20 14:53:57 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return arect.IntersectsCircleEdge( GetCenter(), GetRadius(), GetWidth() );
|
|
|
|
}
|
|
|
|
}
|
2013-09-21 18:09:41 +00:00
|
|
|
break;
|
2012-03-15 14:31:16 +00:00
|
|
|
|
2013-09-21 18:09:41 +00:00
|
|
|
case S_ARC:
|
2017-04-22 05:03:06 +00:00
|
|
|
// Test for full containment of this arc in the rect
|
2013-09-21 18:09:41 +00:00
|
|
|
if( aContained )
|
2017-04-22 05:03:06 +00:00
|
|
|
{
|
2017-05-09 07:28:01 +00:00
|
|
|
return arect.Contains( bb );
|
2017-04-22 05:03:06 +00:00
|
|
|
}
|
|
|
|
// Test if the rect crosses the arc
|
2013-09-21 18:09:41 +00:00
|
|
|
else
|
2017-04-22 05:03:06 +00:00
|
|
|
{
|
2017-05-09 07:28:01 +00:00
|
|
|
arcRect = bb.Common( arect );
|
2017-04-22 05:03:06 +00:00
|
|
|
|
|
|
|
/* All following tests must pass:
|
|
|
|
* 1. Rectangle must intersect arc BoundingBox
|
|
|
|
* 2. Rectangle must cross the outside of the arc
|
|
|
|
*/
|
|
|
|
return arcRect.Intersects( arect ) &&
|
|
|
|
arcRect.IntersectsCircleEdge( GetCenter(), GetRadius(), GetWidth() );
|
|
|
|
}
|
2011-08-08 23:50:55 +00:00
|
|
|
break;
|
2018-02-18 21:36:18 +00:00
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
case S_RECT:
|
|
|
|
if( aContained )
|
|
|
|
{
|
|
|
|
return arect.Contains( bb );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> pts;
|
|
|
|
GetRectCorners( &pts );
|
|
|
|
|
|
|
|
// 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] ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
case S_SEGMENT:
|
2013-09-21 18:09:41 +00:00
|
|
|
if( aContained )
|
2017-04-23 00:06:56 +00:00
|
|
|
{
|
2013-09-21 18:09:41 +00:00
|
|
|
return arect.Contains( GetStart() ) && aRect.Contains( GetEnd() );
|
2017-04-23 00:06:56 +00:00
|
|
|
}
|
2013-09-21 18:09:41 +00:00
|
|
|
else
|
2017-04-23 00:06:56 +00:00
|
|
|
{
|
|
|
|
// Account for the width of the line
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
2013-09-21 18:09:41 +00:00
|
|
|
return arect.Intersects( GetStart(), GetEnd() );
|
2017-04-23 00:06:56 +00:00
|
|
|
}
|
2012-03-15 14:31:16 +00:00
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
break;
|
|
|
|
|
2018-02-18 21:36:18 +00:00
|
|
|
case S_POLYGON:
|
|
|
|
if( aContained )
|
|
|
|
{
|
|
|
|
return arect.Contains( bb );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Fast test: if aRect is outside the polygon bounding box,
|
|
|
|
// rectangles cannot intersect
|
|
|
|
if( !arect.Intersects( bb ) )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Account for the width of the line
|
|
|
|
arect.Inflate( GetWidth() / 2 );
|
|
|
|
int count = m_Poly.TotalVertices();
|
|
|
|
|
|
|
|
for( int ii = 0; ii < count; ii++ )
|
|
|
|
{
|
|
|
|
auto vertex = m_Poly.CVertex( ii );
|
|
|
|
auto vertexNext = m_Poly.CVertex( ( ii + 1 ) % count );
|
|
|
|
|
|
|
|
// Test if the point is within aRect
|
|
|
|
if( arect.Contains( ( wxPoint ) vertex ) )
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// Test if this edge intersects aRect
|
|
|
|
if( arect.Intersects( ( wxPoint ) vertex, ( wxPoint ) vertexNext ) )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2015-02-17 16:32:47 +00:00
|
|
|
break;
|
|
|
|
|
2020-07-02 16:06:09 +00:00
|
|
|
case S_CURVE:
|
2018-07-07 11:04:01 +00:00
|
|
|
if( aContained )
|
|
|
|
{
|
|
|
|
return arect.Contains( bb );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Fast test: if aRect is outside the polygon bounding box,
|
|
|
|
// rectangles cannot intersect
|
|
|
|
if( !arect.Intersects( bb ) )
|
|
|
|
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++ )
|
|
|
|
{
|
|
|
|
wxPoint vertex = m_BezierPoints[ii-1];
|
|
|
|
wxPoint vertexNext = m_BezierPoints[ii];
|
|
|
|
|
|
|
|
// Test if the point is within aRect
|
|
|
|
if( arect.Contains( ( wxPoint ) vertex ) )
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// Test if this edge intersects aRect
|
|
|
|
if( arect.Intersects( vertex, vertexNext ) )
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2018-02-18 21:36:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
2012-05-22 17:51:18 +00:00
|
|
|
default:
|
2020-06-30 12:41:59 +00:00
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::HitTest (rect) not implemented for "
|
|
|
|
+ STROKE_T_asString( m_Shape ) );
|
2015-02-17 16:32:47 +00:00
|
|
|
break;
|
2011-02-27 19:54:01 +00:00
|
|
|
}
|
2015-02-17 16:32:47 +00:00
|
|
|
|
2008-01-16 18:48:04 +00:00
|
|
|
return false;
|
|
|
|
}
|
2008-01-22 20:36:46 +00:00
|
|
|
|
|
|
|
|
2019-12-20 14:11:39 +00:00
|
|
|
wxString DRAWSEGMENT::GetSelectMenuText( EDA_UNITS aUnits ) const
|
2011-07-14 15:42:44 +00:00
|
|
|
{
|
2020-06-15 19:50:20 +00:00
|
|
|
return wxString::Format( _( "Pcb Graphic %s on %s" ),
|
2018-04-10 10:52:12 +00:00
|
|
|
ShowShape( m_Shape ),
|
|
|
|
GetLayerName() );
|
2011-07-14 15:42:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-02-20 12:20:39 +00:00
|
|
|
BITMAP_DEF DRAWSEGMENT::GetMenuImage() const
|
|
|
|
{
|
|
|
|
return add_dashed_line_xpm;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-03-17 14:39:27 +00:00
|
|
|
EDA_ITEM* DRAWSEGMENT::Clone() const
|
2012-01-14 19:50:32 +00:00
|
|
|
{
|
|
|
|
return new DRAWSEGMENT( *this );
|
|
|
|
}
|
2015-09-03 21:05:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
const BOX2I DRAWSEGMENT::ViewBBox() const
|
|
|
|
{
|
|
|
|
// For arcs - do not include the center point in the bounding box,
|
|
|
|
// it is redundant for displaying an arc
|
|
|
|
if( m_Shape == S_ARC )
|
|
|
|
{
|
|
|
|
EDA_RECT bbox;
|
|
|
|
bbox.SetOrigin( m_End );
|
|
|
|
computeArcBBox( bbox );
|
|
|
|
return BOX2I( bbox.GetOrigin(), bbox.GetSize() );
|
|
|
|
}
|
|
|
|
|
|
|
|
return EDA_ITEM::ViewBBox();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
void DRAWSEGMENT::GetRectCorners( std::vector<wxPoint>* pts ) const
|
|
|
|
{
|
|
|
|
MODULE* module = GetParentModule();
|
|
|
|
wxPoint topLeft = GetStart();
|
|
|
|
wxPoint botRight = GetEnd();
|
|
|
|
|
|
|
|
// Un-rotate rect topLeft and botRight
|
|
|
|
if( module && KiROUND( module->GetOrientation() ) % 900 != 0 )
|
|
|
|
{
|
|
|
|
topLeft -= module->GetPosition();
|
|
|
|
RotatePoint( &topLeft, -module->GetOrientation() );
|
|
|
|
|
|
|
|
botRight -= module->GetPosition();
|
|
|
|
RotatePoint( &botRight, -module->GetOrientation() );
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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
|
|
|
|
if( module && KiROUND( module->GetOrientation() ) % 900 != 0 )
|
|
|
|
{
|
|
|
|
for( wxPoint& pt : *pts )
|
|
|
|
{
|
|
|
|
RotatePoint( &pt,module->GetOrientation() );
|
|
|
|
pt += module->GetPosition();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-09-03 21:05:01 +00:00
|
|
|
void DRAWSEGMENT::computeArcBBox( EDA_RECT& aBBox ) const
|
|
|
|
{
|
2017-02-04 01:42:37 +00:00
|
|
|
// Do not include the center, which is not necessarily
|
|
|
|
// inside the BB of a arc with a small angle
|
|
|
|
aBBox.SetOrigin( m_End );
|
|
|
|
|
2015-09-03 21:05:01 +00:00
|
|
|
wxPoint end = m_End;
|
|
|
|
RotatePoint( &end, m_Start, -m_Angle );
|
|
|
|
aBBox.Merge( end );
|
|
|
|
|
|
|
|
// Determine the starting quarter
|
|
|
|
// 0 right-bottom
|
|
|
|
// 1 left-bottom
|
|
|
|
// 2 left-top
|
|
|
|
// 3 right-top
|
|
|
|
unsigned int quarter = 0; // assume right-bottom
|
|
|
|
|
|
|
|
if( m_End.x < m_Start.x )
|
|
|
|
{
|
|
|
|
if( m_End.y <= m_Start.y )
|
|
|
|
quarter = 2;
|
|
|
|
else // ( m_End.y > m_Start.y )
|
|
|
|
quarter = 1;
|
|
|
|
}
|
|
|
|
else if( m_End.x >= m_Start.x )
|
|
|
|
{
|
|
|
|
if( m_End.y < m_Start.y )
|
|
|
|
quarter = 3;
|
|
|
|
else if( m_End.x == m_Start.x )
|
|
|
|
quarter = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int radius = GetRadius();
|
|
|
|
int angle = (int) GetArcAngleStart() % 900 + m_Angle;
|
|
|
|
bool directionCW = ( m_Angle > 0 ); // Is the direction of arc clockwise?
|
|
|
|
|
|
|
|
// Make the angle positive, so we go clockwise and merge points belonging to the arc
|
|
|
|
if( !directionCW )
|
|
|
|
{
|
|
|
|
angle = 900 - angle;
|
|
|
|
quarter = ( quarter + 3 ) % 4; // -1 modulo arithmetic
|
|
|
|
}
|
|
|
|
|
|
|
|
while( angle > 900 )
|
|
|
|
{
|
|
|
|
switch( quarter )
|
|
|
|
{
|
2020-06-15 19:50:20 +00:00
|
|
|
case 0: aBBox.Merge( wxPoint( m_Start.x, m_Start.y + radius ) ); break; // down
|
|
|
|
case 1: aBBox.Merge( wxPoint( m_Start.x - radius, m_Start.y ) ); break; // left
|
|
|
|
case 2: aBBox.Merge( wxPoint( m_Start.x, m_Start.y - radius ) ); break; // up
|
|
|
|
case 3: aBBox.Merge( wxPoint( m_Start.x + radius, m_Start.y ) ); break; // right
|
2015-09-03 21:05:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( directionCW )
|
|
|
|
++quarter;
|
|
|
|
else
|
|
|
|
quarter += 3; // -1 modulo arithmetic
|
|
|
|
|
|
|
|
quarter %= 4;
|
|
|
|
angle -= 900;
|
|
|
|
}
|
|
|
|
}
|
2017-10-19 21:16:06 +00:00
|
|
|
|
2019-04-14 17:58:35 +00:00
|
|
|
|
2017-10-19 21:16:06 +00:00
|
|
|
void DRAWSEGMENT::SetPolyPoints( const std::vector<wxPoint>& aPoints )
|
|
|
|
{
|
|
|
|
m_Poly.RemoveAllContours();
|
|
|
|
m_Poly.NewOutline();
|
2017-10-21 10:46:59 +00:00
|
|
|
|
2020-06-15 19:50:20 +00:00
|
|
|
for ( const wxPoint& p : aPoints )
|
2017-10-19 21:16:06 +00:00
|
|
|
m_Poly.Append( p.x, p.y );
|
|
|
|
}
|
|
|
|
|
2018-01-24 13:22:43 +00:00
|
|
|
|
2020-07-22 23:05:22 +00:00
|
|
|
std::vector<SHAPE*> DRAWSEGMENT::MakeEffectiveShapes() const
|
2020-07-02 16:06:09 +00:00
|
|
|
{
|
|
|
|
std::vector<SHAPE*> effectiveShapes;
|
|
|
|
|
|
|
|
switch( m_Shape )
|
|
|
|
{
|
|
|
|
case S_ARC:
|
|
|
|
{
|
|
|
|
SHAPE_ARC arc( GetCenter(), GetArcStart(), (double) GetAngle() / 10.0 );
|
|
|
|
SHAPE_LINE_CHAIN l = arc.ConvertToPolyline();
|
|
|
|
|
|
|
|
for( int i = 0; i < l.SegmentCount(); i++ )
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( i ).A,
|
|
|
|
l.Segment( i ).B, m_Width ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case S_SEGMENT:
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( GetStart(), GetEnd(), m_Width ) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_RECT:
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> pts;
|
|
|
|
GetRectCorners( &pts );
|
|
|
|
|
|
|
|
if( m_Width == 0 )
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SIMPLE( pts ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[0], pts[1], m_Width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[1], pts[2], m_Width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[2], pts[3], m_Width ) );
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( pts[3], pts[0], m_Width ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case S_CIRCLE:
|
|
|
|
{
|
|
|
|
if( m_Width == 0 )
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_CIRCLE( GetCenter(), GetRadius() ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// SHAPE_CIRCLE has no ConvertToPolyline() method, so use a 360.0 SHAPE_ARC
|
|
|
|
SHAPE_ARC circle( GetCenter(), GetEnd(), 360.0 );
|
|
|
|
SHAPE_LINE_CHAIN l = circle.ConvertToPolyline();
|
|
|
|
|
|
|
|
for( int i = 0; i < l.SegmentCount(); i++ )
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( i ).A,
|
|
|
|
l.Segment( i ).B, m_Width ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case S_CURVE:
|
|
|
|
{
|
2020-07-22 23:05:22 +00:00
|
|
|
auto bezierPoints = buildBezierToSegmentsPointsList( GetWidth() );
|
|
|
|
wxPoint start_pt = bezierPoints[0];
|
2020-07-02 16:06:09 +00:00
|
|
|
|
2020-07-22 23:05:22 +00:00
|
|
|
for( unsigned int jj = 1; jj < bezierPoints.size(); jj++ )
|
2020-07-02 16:06:09 +00:00
|
|
|
{
|
2020-07-22 23:05:22 +00:00
|
|
|
wxPoint end_pt = bezierPoints[jj];
|
2020-07-02 16:06:09 +00:00
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( start_pt, end_pt, m_Width ) );
|
|
|
|
start_pt = end_pt;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case S_POLYGON:
|
|
|
|
{
|
2020-07-22 23:05:22 +00:00
|
|
|
SHAPE_LINE_CHAIN l = GetPolyShape().COutline( 0 );
|
2020-07-02 16:06:09 +00:00
|
|
|
|
|
|
|
if( IsPolygonFilled() )
|
|
|
|
{
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SIMPLE( l ) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for( int i = 0; i < l.SegmentCount(); i++ )
|
|
|
|
effectiveShapes.emplace_back( new SHAPE_SEGMENT( l.Segment( i ) ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
wxFAIL_MSG( "DRAWSEGMENT::MakeEffectiveShapes unsupported DRAWSEGMENT shape: "
|
|
|
|
+ STROKE_T_asString( m_Shape ) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return effectiveShapes;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-07-22 23:05:22 +00:00
|
|
|
std::shared_ptr<SHAPE> DRAWSEGMENT::GetEffectiveShape( PCB_LAYER_ID aLayer ) const
|
2020-07-15 16:23:36 +00:00
|
|
|
{
|
|
|
|
return std::shared_ptr<SHAPE>( new SHAPE_COMPOUND( MakeEffectiveShapes() ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-01-24 13:22:43 +00:00
|
|
|
const std::vector<wxPoint> DRAWSEGMENT::BuildPolyPointsList() const
|
2017-10-19 21:16:06 +00:00
|
|
|
{
|
|
|
|
std::vector<wxPoint> rv;
|
|
|
|
|
2018-01-12 20:25:45 +00:00
|
|
|
if( m_Poly.OutlineCount() )
|
2017-10-19 21:16:06 +00:00
|
|
|
{
|
2018-01-12 20:25:45 +00:00
|
|
|
if( m_Poly.COutline( 0 ).PointCount() )
|
2017-10-21 10:46:59 +00:00
|
|
|
{
|
2018-01-12 20:25:45 +00:00
|
|
|
for ( auto iter = m_Poly.CIterate(); iter; iter++ )
|
2019-12-05 15:41:21 +00:00
|
|
|
rv.emplace_back( iter->x, iter->y );
|
2017-10-21 10:46:59 +00:00
|
|
|
}
|
2017-10-19 21:16:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
2017-10-31 13:59:03 +00:00
|
|
|
|
2018-01-24 13:22:43 +00:00
|
|
|
|
|
|
|
bool DRAWSEGMENT::IsPolyShapeValid() const
|
|
|
|
{
|
|
|
|
// return true if the polygonal shape is valid (has more than 2 points)
|
|
|
|
if( GetPolyShape().OutlineCount() == 0 )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
const SHAPE_LINE_CHAIN& outline = ((SHAPE_POLY_SET&)GetPolyShape()).Outline( 0 );
|
|
|
|
|
|
|
|
return outline.PointCount() > 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int DRAWSEGMENT::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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-10-31 13:59:03 +00:00
|
|
|
void DRAWSEGMENT::SwapData( BOARD_ITEM* aImage )
|
|
|
|
{
|
2019-10-31 15:25:39 +00:00
|
|
|
DRAWSEGMENT* image = dynamic_cast<DRAWSEGMENT*>( aImage );
|
|
|
|
assert( image );
|
|
|
|
|
|
|
|
std::swap( m_Width, image->m_Width );
|
|
|
|
std::swap( m_Start, image->m_Start );
|
|
|
|
std::swap( m_End, image->m_End );
|
|
|
|
std::swap( m_Shape, image->m_Shape );
|
|
|
|
std::swap( m_Type, image->m_Type );
|
|
|
|
std::swap( m_Angle, image->m_Angle );
|
|
|
|
std::swap( m_BezierC1, image->m_BezierC1 );
|
|
|
|
std::swap( m_BezierC2, image->m_BezierC2 );
|
|
|
|
std::swap( m_BezierPoints, image->m_BezierPoints );
|
|
|
|
std::swap( m_Poly, image->m_Poly );
|
2017-10-31 13:59:03 +00:00
|
|
|
}
|
2020-02-02 18:40:14 +00:00
|
|
|
|
|
|
|
|
2020-07-24 22:08:36 +00:00
|
|
|
bool DRAWSEGMENT::cmp_drawings::operator()( const BOARD_ITEM* aFirst, const BOARD_ITEM* aSecond ) const
|
|
|
|
{
|
|
|
|
if( aFirst->Type() != aSecond->Type() )
|
|
|
|
return aFirst->Type() < aSecond->Type();
|
|
|
|
|
|
|
|
if( aFirst->GetLayer() != aSecond->GetLayer() )
|
|
|
|
return aFirst->GetLayer() < aSecond->GetLayer();
|
|
|
|
|
|
|
|
if( aFirst->Type() == PCB_LINE_T )
|
|
|
|
{
|
|
|
|
const DRAWSEGMENT* dwgA = static_cast<const DRAWSEGMENT*>( aFirst );
|
|
|
|
const DRAWSEGMENT* dwgB = static_cast<const DRAWSEGMENT*>( aSecond );
|
|
|
|
|
|
|
|
if( dwgA->GetShape() != dwgB->GetShape() )
|
|
|
|
return dwgA->GetShape() < dwgB->GetShape();
|
|
|
|
}
|
|
|
|
|
|
|
|
return aFirst->m_Uuid < aSecond->m_Uuid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-02-02 18:40:14 +00:00
|
|
|
static struct DRAWSEGMENT_DESC
|
|
|
|
{
|
|
|
|
DRAWSEGMENT_DESC()
|
|
|
|
{
|
|
|
|
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
|
|
|
|
REGISTER_TYPE( DRAWSEGMENT );
|
|
|
|
propMgr.InheritsAfter( TYPE_HASH( DRAWSEGMENT ), TYPE_HASH( BOARD_ITEM ) );
|
|
|
|
|
|
|
|
propMgr.AddProperty( new PROPERTY<DRAWSEGMENT, int>( _( "Thickness" ),
|
|
|
|
&DRAWSEGMENT::SetWidth, &DRAWSEGMENT::GetWidth, PROPERTY_DISPLAY::DISTANCE ) );
|
|
|
|
// TODO show certain properties depending on the shape
|
|
|
|
propMgr.AddProperty( new PROPERTY<DRAWSEGMENT, double>( _( "Angle" ),
|
|
|
|
&DRAWSEGMENT::SetAngle, &DRAWSEGMENT::GetAngle, PROPERTY_DISPLAY::DECIDEGREE ) );
|
|
|
|
// TODO or may have different names (arcs)
|
|
|
|
// TODO type?
|
|
|
|
propMgr.AddProperty( new PROPERTY<DRAWSEGMENT, int>( _( "End X" ),
|
|
|
|
&DRAWSEGMENT::SetEndX, &DRAWSEGMENT::GetEndX, PROPERTY_DISPLAY::DISTANCE ) );
|
|
|
|
propMgr.AddProperty( new PROPERTY<DRAWSEGMENT, int>( _( "End Y" ),
|
|
|
|
&DRAWSEGMENT::SetEndY, &DRAWSEGMENT::GetEndY, PROPERTY_DISPLAY::DISTANCE ) );
|
|
|
|
}
|
|
|
|
} _DRAWSEGMENT_DESC;
|