Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Enforce values required by implementation (KICAD-R9A).

pull/18/head
Jeff Young 5 months ago
parent
b3b5f6963f
commit
194437b0f6
2 changed files with 58 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      pcbnew/dialogs/dialog_outset_items.cpp
  2. 3
      pcbnew/tools/item_modification_routine.cpp

83
pcbnew/dialogs/dialog_outset_items.cpp
View File

@ -27,6 +27,7 @@
#include <board.h>
#include <board_design_settings.h>
#include <pcb_layer_box_selector.h>
#include <wx/msgdlg.h>
/**
* Some handy preset values for common outset distances.
@ -72,9 +73,12 @@ static std::vector<int> s_outsetRecentValues;
static std::vector<int> s_lineWidthRecentValues;
static std::vector<int> s_gridRoundingRecentValues;
DIALOG_OUTSET_ITEMS::DIALOG_OUTSET_ITEMS( PCB_BASE_FRAME& aParent,
OUTSET_ROUTINE::PARAMETERS& aParams ) :
DIALOG_OUTSET_ITEMS_BASE( &aParent ), m_parent( aParent ), m_params( aParams ),
DIALOG_OUTSET_ITEMS_BASE( &aParent ),
m_parent( aParent ),
m_params( aParams ),
m_outset( &aParent, m_outsetLabel, m_outsetEntry, m_outsetUnit ),
m_lineWidth( &aParent, m_lineWidthLabel, m_lineWidthEntry, m_lineWidthUnit ),
m_roundingGrid( &aParent, m_gridRoundingLabel, m_gridRoundingEntry, m_gridRoundingUnit )
@ -84,24 +88,24 @@ DIALOG_OUTSET_ITEMS::DIALOG_OUTSET_ITEMS( PCB_BASE_FRAME& aParent,
m_LayerSelectionCtrl->SetBoardFrame( &aParent );
m_LayerSelectionCtrl->Resync();
const auto fillOptionList = [&]( UNIT_BINDER& aCombo, const std::vector<int>& aPresets,
const std::vector<int>& aRecentPresets )
{
std::vector<long long int> optionList;
optionList.reserve( aPresets.size() + aRecentPresets.size() );
const auto fillOptionList =
[&]( UNIT_BINDER& aCombo, const std::vector<int>& aPresets, const std::vector<int>& aRecentPresets )
{
std::vector<long long int> optionList;
optionList.reserve( aPresets.size() + aRecentPresets.size() );
for( const int val : aPresets )
optionList.push_back( val );
for( const int val : aPresets )
optionList.push_back( val );
for( const int val : aRecentPresets )
optionList.push_back( val );
for( const int val : aRecentPresets )
optionList.push_back( val );
// Sort the vector and remove duplicates
std::sort( optionList.begin(), optionList.end() );
optionList.erase( std::unique( optionList.begin(), optionList.end() ), optionList.end() );
// Sort the vector and remove duplicates
std::sort( optionList.begin(), optionList.end() );
optionList.erase( std::unique( optionList.begin(), optionList.end() ), optionList.end() );
aCombo.SetOptionsList( optionList );
};
aCombo.SetOptionsList( optionList );
};
fillOptionList( m_outset, s_outsetPresetValue, s_outsetRecentValues );
fillOptionList( m_lineWidth, s_presetLineWidths, s_lineWidthRecentValues );
@ -111,10 +115,12 @@ DIALOG_OUTSET_ITEMS::DIALOG_OUTSET_ITEMS( PCB_BASE_FRAME& aParent,
finishDialogSettings();
}
DIALOG_OUTSET_ITEMS::~DIALOG_OUTSET_ITEMS()
{
}
void DIALOG_OUTSET_ITEMS::OnLayerDefaultClick( wxCommandEvent& event )
{
const BOARD_DESIGN_SETTINGS& settings = m_parent.GetBoard()->GetDesignSettings();
@ -125,16 +131,19 @@ void DIALOG_OUTSET_ITEMS::OnLayerDefaultClick( wxCommandEvent& event )
m_lineWidth.SetValue( defaultWidth );
}
void DIALOG_OUTSET_ITEMS::OnCopyLayersChecked( wxCommandEvent& event )
{
m_LayerSelectionCtrl->Enable( !m_copyLayers->GetValue() );
}
void DIALOG_OUTSET_ITEMS::OnRoundToGridChecked( wxCommandEvent& event )
{
m_gridRoundingEntry->Enable( m_roundToGrid->IsChecked() );
}
bool DIALOG_OUTSET_ITEMS::TransferDataToWindow()
{
m_LayerSelectionCtrl->SetLayerSelection( m_params.layer );
@ -157,12 +166,31 @@ bool DIALOG_OUTSET_ITEMS::TransferDataToWindow()
return true;
}
bool DIALOG_OUTSET_ITEMS::TransferDataFromWindow()
{
if( m_outset.GetIntValue() <= 0 )
{
wxString msg = _( "Outset must be a positive value." );
wxMessageDialog errdlg( this, msg, _( "Error" ) );
errdlg.ShowModal();
return false;
}
if( m_lineWidth.GetIntValue() <= 0 )
{
wxString msg = _( "Line width must be a positive value." );
wxMessageDialog errdlg( this, msg, _( "Error" ) );
errdlg.ShowModal();
return false;
}
m_params.layer = ToLAYER_ID( m_LayerSelectionCtrl->GetLayerSelection() );
m_params.outsetDistance = m_outset.GetValue();
m_params.outsetDistance = m_outset.GetIntValue();
m_params.roundCorners = m_roundCorners->GetValue();
m_params.lineWidth = m_lineWidth.GetValue();
m_params.lineWidth = m_lineWidth.GetIntValue();
m_params.useSourceLayers = m_copyLayers->GetValue();
m_params.useSourceWidths = m_copyWidths->GetValue();
@ -172,23 +200,26 @@ bool DIALOG_OUTSET_ITEMS::TransferDataFromWindow()
else
m_params.gridRounding = std::nullopt;
s_gridRoundValuePersist = m_roundingGrid.GetValue();
s_gridRoundValuePersist = m_roundingGrid.GetIntValue();
m_params.deleteSourceItems = m_deleteSourceItems->GetValue();
// Keep the recent values list up to date
const auto saveRecentValue = []( std::vector<int>& aRecentValues, int aValue )
{
const auto it = std::find( aRecentValues.begin(), aRecentValues.end(), aValue );
// Already have it
if( it != aRecentValues.end() )
return;
const auto saveRecentValue =
[]( std::vector<int>& aRecentValues, int aValue )
{
const auto it = std::find( aRecentValues.begin(), aRecentValues.end(), aValue );
aRecentValues.push_back( aValue );
};
// Already have it
if( it != aRecentValues.end() )
return;
aRecentValues.push_back( aValue );
};
saveRecentValue( s_outsetRecentValues, m_params.outsetDistance );
saveRecentValue( s_lineWidthRecentValues, m_params.lineWidth );
if( m_params.gridRounding )
saveRecentValue( s_gridRoundingRecentValues, m_params.gridRounding.value() );

3
pcbnew/tools/item_modification_routine.cpp
View File

@ -674,14 +674,13 @@ void OUTSET_ROUTINE::ProcessItem( BOARD_ITEM& aItem )
// Not all items have a width, even if the parameters want to copy it
// So fall back to the given width if we can't get one.
int width = m_params.lineWidth;
if( m_params.useSourceWidths )
{
std::optional<int> item_width = GetBoardItemWidth( aItem );
if( item_width.has_value() )
{
width = *item_width;
}
}
CHANGE_HANDLER& handler = GetHandler();

Write Preview
Loading…
Cancel
Save