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

pcb_calculator, panel_cable_size.*: enhancement: allow setting current density. 

Fixes #14802
https://gitlab.com/kicad/code/kicad/-/issues/14802
This commit is contained in:
jean-pierre charras 2023-05-24 13:17:25 +02:00
parent a3ac014e14
commit ed6a56cb57
5 changed files with 261 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pcb_calculator/calculator_panels/panel_cable_size.cpp
View File

@ -49,6 +49,7 @@ PANEL_CABLE_SIZE::PANEL_CABLE_SIZE( wxWindow* parent, wxWindowID id, const wxPoi
m_stUnitDegC->SetLabel( wxT( "°C" ) );
m_stUnitOhm->SetLabel( wxT( "Ω" ) );
m_stUnitmmSq->SetLabel( wxT( "mm²" ) );
m_stUnitAmp_mmSq->SetLabel( wxT( "A/mm²" ) );
// Needed on wxWidgets 3.0 to ensure sizers are correctly set
GetSizer()->SetSizeHints( this );
@ -69,9 +70,7 @@ PANEL_CABLE_SIZE::PANEL_CABLE_SIZE( wxWindow* parent, wxWindowID id, const wxPoi
m_imperial = false;
// Initialize variables to a reasonable value
// Stored in normalized units
// Initialize variables to a reasonable value (stored in normalized units)
m_diameter = 0.001; // i.e. 1 mm2
m_conductorTemperature = 20;
m_current = 1.0;
@ -151,9 +150,10 @@ void PANEL_CABLE_SIZE::SaveSettings( PCB_CALCULATOR_SETTINGS* aCfg )
<< m_conductorMaterialResitivityRef;
aCfg->m_cableSize.conductorTemperature = m_conductorTempCtrl->GetValue();
aCfg->m_cableSize.conductorThermalCoef = m_textCtrlConductorThermCoef->GetValue();
aCfg->m_cableSize.currentDensityChoice = m_slCurrentDensity->GetValue();
}
#include <wx/log.h>
void PANEL_CABLE_SIZE::LoadSettings( PCB_CALCULATOR_SETTINGS* aCfg )
{
m_diameterUnit->SetSelection( aCfg->m_cableSize.diameterUnit );
@ -164,24 +164,48 @@ void PANEL_CABLE_SIZE::LoadSettings( PCB_CALCULATOR_SETTINGS* aCfg )
m_conductorTempCtrl->SetValue( aCfg->m_cableSize.conductorTemperature );
m_textCtrlConductorThermCoef->SetValue( aCfg->m_cableSize.conductorThermalCoef );
int amp_per_mm2_choice = aCfg->m_cableSize.currentDensityChoice;
// Ensure validity of amp_per_mm2_choice
if( amp_per_mm2_choice < m_slCurrentDensity->GetMin()
|| amp_per_mm2_choice > m_slCurrentDensity->GetMax() )
{
amp_per_mm2_choice = AMP_DENSITY_BY_MM2;
}
m_slCurrentDensity->SetValue( amp_per_mm2_choice );
m_amp_by_mm2 = amp_per_mm2_choice;
wxString value = wxString( "" ) << m_conductorMaterialResitivity;
if( m_textCtrlConductorResistivity->IsEmpty() || value == "nan" )
{
//Initialize m_textCtrl to fill UI space
//Working variable initialized earlier
// Initialize m_textCtrl to fill UI space
// Working variable initialized earlier
m_textCtrlConductorResistivity->SetValue( "1.72e-8" );
m_conductorTempCtrl->SetValue( "20" );
}
if( m_textCtrlConductorThermCoef->IsEmpty() )
{
//Initialize m_textCtrl to fill UI space
//Working variable initialized earlier
// Initialize m_textCtrl to fill UI space
// Working variable initialized earlier
m_textCtrlConductorThermCoef->SetValue( "3.93e-3" );
}
updateAll( m_diameter / 2 );
}
void PANEL_CABLE_SIZE::onUpdateCurrentDensity( wxScrollEvent& aEvent )
{
m_amp_by_mm2 = m_slCurrentDensity->GetValue();
// Update displayed values depending on the current density (mainly Ampacity)
updateAll( m_diameter / 2 );
}
void PANEL_CABLE_SIZE::OnCableSizeChange( wxCommandEvent& aEvent )
{
if( !m_updatingUI )
@ -197,6 +221,7 @@ void PANEL_CABLE_SIZE::OnCableSizeChange( wxCommandEvent& aEvent )
}
}
void PANEL_CABLE_SIZE::OnConductorResistivityChange( wxCommandEvent& aEvent )
{
if( !m_updatingUI )
@ -210,6 +235,7 @@ void PANEL_CABLE_SIZE::OnConductorResistivityChange( wxCommandEvent& aEvent )
}
}
void PANEL_CABLE_SIZE::OnConductorResistivity_Button( wxCommandEvent& event )
{
wxArrayString list = StandardCableConductorList();
@ -245,6 +271,7 @@ void PANEL_CABLE_SIZE::OnConductorThermCoefChange_Button( wxCommandEvent& event
if( !value.IsEmpty() )
m_textCtrlConductorThermCoef->ChangeValue( value );
OnConductorThermCoefChange( event );
}

1
pcb_calculator/calculator_panels/panel_cable_size.h
View File

@ -67,6 +67,7 @@ public:
void OnResistanceDcChange( wxCommandEvent& aEvent ) override;
void OnVDropChange( wxCommandEvent& aEvent ) override;
void OnPowerChange( wxCommandEvent& aEvent ) override;
void onUpdateCurrentDensity( wxScrollEvent& aEvent ) override;
private:
void updateAll( double aRadius );

29
pcb_calculator/calculator_panels/panel_cable_size_base.cpp
View File

@ -146,6 +146,17 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c
m_staticText16421->Wrap( -1 );
fgSizerLeft->Add( m_staticText16421, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
m_staticTextDensity = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Current density"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDensity->Wrap( -1 );
fgSizerLeft->Add( m_staticTextDensity, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_slCurrentDensity = new wxSlider( sbSizerLeft->GetStaticBox(), wxID_ANY, 3, 3, 12, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS|wxSL_VALUE_LABEL );
fgSizerLeft->Add( m_slCurrentDensity, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_stUnitAmp_mmSq = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("A/mm^2"), wxDefaultPosition, wxDefaultSize, 0 );
m_stUnitAmp_mmSq->Wrap( -1 );
fgSizerLeft->Add( m_stUnitAmp_mmSq, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
sbSizerLeft->Add( fgSizerLeft, 0, wxEXPAND, 5 );
@ -269,6 +280,15 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c
m_frequencyCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnFrequencyChange ), NULL, this );
m_frequencyUnit->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnUpdateUnit ), NULL, this );
m_AmpacityCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnAmpacityChange ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_conductorTempCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnConductorTempChange ), NULL, this );
m_currentCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnCurrentChange ), NULL, this );
m_lengthCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnLengthChange ), NULL, this );
@ -296,6 +316,15 @@ PANEL_CABLE_SIZE_BASE::~PANEL_CABLE_SIZE_BASE()
m_frequencyCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnFrequencyChange ), NULL, this );
m_frequencyUnit->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnUpdateUnit ), NULL, this );
m_AmpacityCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnAmpacityChange ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_slCurrentDensity->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( PANEL_CABLE_SIZE_BASE::onUpdateCurrentDensity ), NULL, this );
m_conductorTempCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnConductorTempChange ), NULL, this );
m_currentCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnCurrentChange ), NULL, this );
m_lengthCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_CABLE_SIZE_BASE::OnLengthChange ), NULL, this );

191
pcb_calculator/calculator_panels/panel_cable_size_base.fbp
View File

@ -1704,6 +1704,197 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Current density</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextDensity</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxSlider" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maxValue">12</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="minValue">3</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_slCurrentDensity</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS|wxSL_VALUE_LABEL</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">3</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnScroll">onUpdateCurrentDensity</event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">A/mm^2</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_stUnitAmp_mmSq</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
</object>
</object>
</object>

5
pcb_calculator/calculator_panels/panel_cable_size_base.h
View File

@ -31,6 +31,7 @@ class UNIT_SELECTOR_VOLTAGE;
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/sizer.h>
#include <wx/slider.h>
#include <wx/statbox.h>
#include <wx/panel.h>
@ -69,6 +70,9 @@ class PANEL_CABLE_SIZE_BASE : public CALCULATOR_PANEL
wxStaticText* m_staticTextAmpacity;
wxTextCtrl* m_AmpacityCtrl;
wxStaticText* m_staticText16421;
wxStaticText* m_staticTextDensity;
wxSlider* m_slCurrentDensity;
wxStaticText* m_stUnitAmp_mmSq;
wxStaticText* m_staticTextCableTemp;
wxTextCtrl* m_conductorTempCtrl;
wxStaticText* m_stUnitDegC;
@ -100,6 +104,7 @@ class PANEL_CABLE_SIZE_BASE : public CALCULATOR_PANEL
virtual void OnLinResistanceChange( wxCommandEvent& event ) { event.Skip(); }
virtual void OnFrequencyChange( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAmpacityChange( wxCommandEvent& event ) { event.Skip(); }
virtual void onUpdateCurrentDensity( wxScrollEvent& event ) { event.Skip(); }
virtual void OnConductorTempChange( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCurrentChange( wxCommandEvent& event ) { event.Skip(); }
virtual void OnLengthChange( wxCommandEvent& event ) { event.Skip(); }