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

Properties: add friendly names to shapes

This commit is contained in:
Jon Evans 2022-11-25 11:54:25 -05:00
parent 220ef6fb44
commit 396db7794d
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/eda_shape.cpp
View File

@ -564,23 +564,36 @@ void EDA_SHAPE::SetArcAngleAndEnd( const EDA_ANGLE& aAngle, bool aCheckNegativeA
} }
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" );
}
}
void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList )
{ {
ORIGIN_TRANSFORMS originTransforms = aFrame->GetOriginTransforms(); ORIGIN_TRANSFORMS originTransforms = aFrame->GetOriginTransforms();
wxString msg; wxString msg;
wxString shape = _( "Shape" ); wxString shape = _( "Shape" );
aList.emplace_back( shape, GetFriendlyName() );
switch( m_shape ) switch( m_shape )
{ {
case SHAPE_T::CIRCLE: case SHAPE_T::CIRCLE:
aList.emplace_back( shape, _( "Circle" ) );
aList.emplace_back( _( "Radius" ), aFrame->MessageTextFromValue( GetRadius() ) ); aList.emplace_back( _( "Radius" ), aFrame->MessageTextFromValue( GetRadius() ) );
break; break;
case SHAPE_T::ARC: case SHAPE_T::ARC:
aList.emplace_back( shape, _( "Arc" ) );
msg = EDA_UNIT_UTILS::UI::MessageTextFromValue( GetArcAngle() ); msg = EDA_UNIT_UTILS::UI::MessageTextFromValue( GetArcAngle() );
aList.emplace_back( _( "Angle" ), msg ); aList.emplace_back( _( "Angle" ), msg );
@ -588,23 +601,15 @@ void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PA
break; break;
case SHAPE_T::BEZIER: case SHAPE_T::BEZIER:
aList.emplace_back( shape, _( "Curve" ) );
aList.emplace_back( _( "Length" ), aFrame->MessageTextFromValue( GetLength() ) ); aList.emplace_back( _( "Length" ), aFrame->MessageTextFromValue( GetLength() ) );
break; break;
case SHAPE_T::POLY: case SHAPE_T::POLY:
aList.emplace_back( shape, _( "Polygon" ) );
msg.Printf( "%d", GetPolyShape().Outline(0).PointCount() ); msg.Printf( "%d", GetPolyShape().Outline(0).PointCount() );
aList.emplace_back( _( "Points" ), msg ); aList.emplace_back( _( "Points" ), msg );
break; break;
case SHAPE_T::RECT: case SHAPE_T::RECT:
if( IsAnnotationProxy() )
aList.emplace_back( shape, _( "Pad Number Box" ) );
else
aList.emplace_back( shape, _( "Rectangle" ) );
aList.emplace_back( _( "Width" ), aList.emplace_back( _( "Width" ),
aFrame->MessageTextFromValue( std::abs( GetEnd().x - GetStart().x ) ) ); aFrame->MessageTextFromValue( std::abs( GetEnd().x - GetStart().x ) ) );
@ -614,8 +619,6 @@ void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PA
case SHAPE_T::SEGMENT: case SHAPE_T::SEGMENT:
{ {
aList.emplace_back( shape, _( "Segment" ) );
aList.emplace_back( _( "Length" ), aList.emplace_back( _( "Length" ),
aFrame->MessageTextFromValue( GetLineLength( GetStart(), GetEnd() ) )); aFrame->MessageTextFromValue( GetLineLength( GetStart(), GetEnd() ) ));
@ -627,7 +630,6 @@ void EDA_SHAPE::ShapeGetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PA
} }
default: default:
aList.emplace_back( shape, _( "Unrecognized" ) );
break; break;
} }

2
include/eda_shape.h
View File

@ -110,6 +110,8 @@ public:
void SetShape( SHAPE_T aShape ) { m_shape = aShape; } void SetShape( SHAPE_T aShape ) { m_shape = aShape; }
SHAPE_T GetShape() const { return m_shape; } SHAPE_T GetShape() const { return m_shape; }
wxString GetFriendlyName() const override;
/** /**
* Return the starting point of the graphic. * Return the starting point of the graphic.
*/ */