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

Don't allow 0 line-width for unfilled shapes. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12010
This commit is contained in:
Jeff Young 2022-07-16 16:25:23 +01:00
parent 27869b1a37
commit d0547cbde7
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eda_shape.cpp
View File

@ -366,7 +366,7 @@ void EDA_SHAPE::flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
void EDA_SHAPE::RebuildBezierToSegmentsPointsList( int aMinSegLen )
{
// Has meaning only for S_CURVE DRAW_SEGMENT shape
// Has meaning only for SHAPE_T::BEZIER
if( m_shape != SHAPE_T::BEZIER )
{
m_bezierPoints.clear();

55
pcbnew/dialogs/dialog_graphic_item_properties.cpp
View File

@ -248,6 +248,11 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
m_filledCtrl->Show( false );
break;
case SHAPE_T::BEZIER:
SetTitle( _( "Curve Properties" ) );
m_filledCtrl->Show( true );
break;
default:
break;
}
@ -410,7 +415,7 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow()
bool DIALOG_GRAPHIC_ITEM_PROPERTIES::Validate()
{
wxArrayString error_msgs;
wxArrayString errors;
if( !DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::Validate() )
return false;
@ -421,12 +426,12 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::Validate()
case SHAPE_T::ARC:
// Check angle of arc.
if( m_angle.GetAngleValue() == ANGLE_0 )
error_msgs.Add( _( "The arc angle cannot be zero." ) );
errors.Add( _( "Arc angle cannot be zero." ) );
if( m_startX.GetValue() == m_endX.GetValue() && m_startY.GetValue() == m_endY.GetValue() )
{
error_msgs.Add( wxString::Format( _( "Invalid Arc with radius %f and angle %f" ),
0.0, m_angle.GetDoubleValue() ) );
errors.Add( wxString::Format( _( "Invalid Arc with radius %f and angle %f." ),
0.0, m_angle.GetDoubleValue() ) );
}
else
{
@ -441,26 +446,52 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::Validate()
if( max_offset >= ( std::numeric_limits<VECTOR2I::coord_type>::max() / 2 )
|| center == start || center == end )
{
error_msgs.Add( wxString::Format( _( "Invalid Arc with radius %f and angle %f" ),
radius, m_angle.GetDoubleValue() ) );
errors.Add( wxString::Format( _( "Invalid Arc with radius %f and angle %f." ),
radius, m_angle.GetDoubleValue() ) );
}
}
if( m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero." ) );
break;
case SHAPE_T::CIRCLE:
// Check radius.
if( m_endX.GetValue() == 0 )
error_msgs.Add( _( "The radius cannot be zero." ) );
if( m_endX.GetValue() <= 0 )
errors.Add( _( "Radius must be greater than zero." ) );
if( !m_filledCtrl->GetValue() && m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero for an unfilled circle." ) );
break;
case SHAPE_T::RECT:
// Check for null rect.
if( m_startX.GetValue() == m_endX.GetValue() && m_startY.GetValue() == m_endY.GetValue() )
error_msgs.Add( _( "The rectangle cannot be empty." ) );
errors.Add( _( "Rectangle cannot be empty." ) );
if( !m_filledCtrl->GetValue() && m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero for an unfilled rectangle." ) );
break;
case SHAPE_T::POLY:
if( !m_filledCtrl->GetValue() && m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero for an unfilled polygon." ) );
break;
case SHAPE_T::SEGMENT:
if( m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero." ) );
break;
case SHAPE_T::BEZIER:
if( !m_filledCtrl->GetValue() && m_thickness.GetValue() <= 0 )
errors.Add( _( "Line width must be greater than zero for an unfilled curve." ) );
break;
default:
@ -468,12 +499,12 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::Validate()
break;
}
if( error_msgs.GetCount() )
if( errors.GetCount() )
{
HTML_MESSAGE_BOX dlg( this, _( "Error List" ) );
dlg.ListSet( error_msgs );
dlg.ListSet( errors );
dlg.ShowModal();
}
return error_msgs.GetCount() == 0;
return errors.GetCount() == 0;
}