realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for chamfering larger sizes

Browse Source 
If we are only chamfering opposite corners, we can support up to 100%
chamfer

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13567
This commit is contained in:
Seth Hillbrand 2025-07-25 10:32:46 -07:00
parent dd41e2b00b
commit f875fd1d60
3 changed files with 88 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -468,6 +468,72 @@ void DIALOG_PAD_PROPERTIES::onCornerRadiusChange( wxCommandEvent& event )
}
double DIALOG_PAD_PROPERTIES::getMaxChamferRatio() const
{
// The maximum chamfer ratio is 50% of the smallest pad side if adjacent sides
// are selected, or 100% of the smallest pad side if only one side is selected.
double baseline = 1.0;
auto considerCheckboxes = [&]( const std::vector<wxCheckBox*>& checkBoxes )
{
for( size_t ii : { 0, 1, 2, 3 } )
{
if( !checkBoxes[ii]->IsChecked() )
continue;
if( checkBoxes[( ii + 1 ) % 4]->IsChecked() || checkBoxes[( ii - 1 ) % 4]->IsChecked() )
{
// If two adjacent corners are selected, the maximum chamfer ratio is 50%
baseline = std::max( baseline, 0.5 );
break;
}
}
};
baseline = 1.0 - m_previewPad->GetRoundRectRadiusRatio( m_editLayer );
considerCheckboxes( { m_cbTopLeft1, m_cbTopRight1, m_cbBottomRight1, m_cbBottomLeft1 } );
considerCheckboxes( { m_cbTopLeft, m_cbTopRight, m_cbBottomRight, m_cbBottomLeft } );
// If only one corner is selected, the maximum chamfer ratio is 100%
return baseline;
}
double DIALOG_PAD_PROPERTIES::getMaxCornerRadius() const
{
return 1.0 - m_previewPad->GetChamferRectRatio( m_editLayer );
}
void DIALOG_PAD_PROPERTIES::updateAllowedPadChamferCorners()
{
auto updateCheckBoxes = []( const std::vector<wxCheckBox*>& aCheckBoxes )
{
for( size_t ii : { 0, 1, 2, 3 } )
{
bool disable = aCheckBoxes[( ii + 1 ) % 4]->IsChecked()
|| aCheckBoxes[( ii + 3 ) % 4]->IsChecked();
aCheckBoxes[ii]->Enable( !disable );
if( disable )
aCheckBoxes[ii]->SetValue( false );
}
};
if( m_mixedChamferRatio.GetDoubleValue() > 50.0 )
{
updateCheckBoxes( { m_cbTopLeft1, m_cbTopRight1, m_cbBottomRight1, m_cbBottomLeft1 } );
}
if( m_chamferRatio.GetDoubleValue() > 50.0 )
{
updateCheckBoxes( { m_cbTopLeft, m_cbTopRight, m_cbBottomRight, m_cbBottomLeft } );
}
}
void DIALOG_PAD_PROPERTIES::onCornerSizePercentChange( wxCommandEvent& event )
{
if( m_previewPad->GetShape( m_editLayer ) != PAD_SHAPE::ROUNDRECT
@ -487,15 +553,17 @@ void DIALOG_PAD_PROPERTIES::onCornerSizePercentChange( wxCommandEvent& event )
if( value.ToDouble( &ratioPercent ) )
{
// Clamp ratioPercent to acceptable value (0.0 to 50.0)
double maxRatio = getMaxCornerRadius();
if( ratioPercent < 0.0 )
{
m_cornerRatio.SetDoubleValue( 0.0 );
m_mixedCornerRatio.SetDoubleValue( 0.0 );
}
else if( ratioPercent > 50.0 )
else if( ratioPercent > maxRatio * 100.0 )
{
m_cornerRatio.SetDoubleValue( 50.0 );
m_mixedCornerRatio.SetDoubleValue( 50.0 );
m_cornerRatio.SetDoubleValue( maxRatio * 100.0 );
m_mixedCornerRatio.SetDoubleValue( maxRatio * 100.0 );
}
if( ctrl == m_cornerRatioCtrl )
@ -512,16 +580,17 @@ void DIALOG_PAD_PROPERTIES::onCornerSizePercentChange( wxCommandEvent& event )
if( value.ToDouble( &ratioPercent ) )
{
// Clamp ratioPercent to acceptable value (0.0 to 50.0)
double maxRatio = getMaxChamferRatio();
// Clamp ratioPercent to acceptable value (0.0 to maxRatio)
if( ratioPercent < 0.0 )
{
m_chamferRatio.SetDoubleValue( 0.0 );
m_mixedChamferRatio.SetDoubleValue( 0.0 );
}
else if( ratioPercent > 50.0 )
else if( ratioPercent > maxRatio * 100.0 )
{
m_chamferRatio.SetDoubleValue( 50.0 );
m_mixedChamferRatio.SetDoubleValue( 50.0 );
m_chamferRatio.SetDoubleValue( maxRatio * 100.0 );
m_mixedChamferRatio.SetDoubleValue( maxRatio * 100.0 );
}
if( ctrl == m_chamferRatioCtrl )
@ -529,6 +598,8 @@ void DIALOG_PAD_PROPERTIES::onCornerSizePercentChange( wxCommandEvent& event )
else
m_chamferRatioCtrl->ChangeValue( value );
updateAllowedPadChamferCorners();
changed = true;
}
}
@ -2107,6 +2178,7 @@ void DIALOG_PAD_PROPERTIES::OnValuesChanged( wxCommandEvent& event )
return;
// If the pad size has changed, update the displayed values for rounded rect pads.
updateAllowedPadChamferCorners();
updateRoundRectCornerValues();
redraw();

8
pcbnew/dialogs/dialog_pad_properties.h
View File

@ -125,6 +125,14 @@ private:
void onModify( wxCommandEvent& aEvent ) override;
void onModify( wxSpinDoubleEvent& aEvent ) override;
// Return the largest chamfer ratio allowed by the current pad shape
double getMaxChamferRatio() const;
// Return the largest corner radius allowed by the current pad shape
double getMaxCornerRadius() const;
void updateAllowedPadChamferCorners();
private:
PCB_BASE_FRAME* m_parent;
PAD* m_currentPad; // pad currently being edited

2
pcbnew/pad.cpp
View File

@ -506,7 +506,7 @@ int PAD::GetFrontRoundRectRadiusSize() const
void PAD::SetChamferRectRatio( PCB_LAYER_ID aLayer, double aChamferScale )
{
m_padStack.SetChamferRatio( std::clamp( aChamferScale, 0.0, 0.5 ), aLayer );
m_padStack.SetChamferRatio( aChamferScale, aLayer );
SetDirty();
}