Fix a few Coverity warnings.
It also fix: Fixes #4082 https://gitlab.com/kicad/code/kicad/issues/4082
This commit is contained in:
parent
259d7a47d4
commit
9d2712a824
|
@ -63,6 +63,7 @@ PLOTTER::PLOTTER( )
|
||||||
m_mirrorIsHorizontal = true;
|
m_mirrorIsHorizontal = true;
|
||||||
m_yaxisReversed = false;
|
m_yaxisReversed = false;
|
||||||
outputFile = 0;
|
outputFile = 0;
|
||||||
|
m_colors = nullptr;
|
||||||
colorMode = false; // Starts as a BW plot
|
colorMode = false; // Starts as a BW plot
|
||||||
negativeMode = false;
|
negativeMode = false;
|
||||||
// Temporary init to avoid not initialized vars, will be set later
|
// Temporary init to avoid not initialized vars, will be set later
|
||||||
|
|
|
@ -143,7 +143,6 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
|
||||||
Layout();
|
Layout();
|
||||||
|
|
||||||
EESCHEMA_SETTINGS* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
EESCHEMA_SETTINGS* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
wxASSERT( cfg );
|
|
||||||
|
|
||||||
if( cfg )
|
if( cfg )
|
||||||
{
|
{
|
||||||
|
@ -212,6 +211,8 @@ DIALOG_CHOOSE_COMPONENT::~DIALOG_CHOOSE_COMPONENT()
|
||||||
|
|
||||||
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
|
|
||||||
|
wxCHECK( cfg, /*void*/ );
|
||||||
|
|
||||||
cfg->m_SymChooserPanel.width = GetSize().x;
|
cfg->m_SymChooserPanel.width = GetSize().x;
|
||||||
cfg->m_SymChooserPanel.height = GetSize().y;
|
cfg->m_SymChooserPanel.height = GetSize().y;
|
||||||
|
|
||||||
|
@ -263,12 +264,12 @@ wxPanel* DIALOG_CHOOSE_COMPONENT::ConstructRightPanel( wxWindow* aParent )
|
||||||
|
|
||||||
m_keepSymbol = new wxCheckBox( panel, 1000, _("Multi-Symbol Placement"), wxDefaultPosition,
|
m_keepSymbol = new wxCheckBox( panel, 1000, _("Multi-Symbol Placement"), wxDefaultPosition,
|
||||||
wxDefaultSize, wxALIGN_RIGHT );
|
wxDefaultSize, wxALIGN_RIGHT );
|
||||||
m_keepSymbol->SetValue( cfg->m_SymChooserPanel.keep_symbol );
|
m_keepSymbol->SetValue( cfg ? cfg->m_SymChooserPanel.keep_symbol : true );
|
||||||
m_keepSymbol->SetToolTip( _( "Place multiple copies of the symbol." ) );
|
m_keepSymbol->SetToolTip( _( "Place multiple copies of the symbol." ) );
|
||||||
|
|
||||||
m_useUnits = new wxCheckBox( panel, 1000, _("Place all units"), wxDefaultPosition,
|
m_useUnits = new wxCheckBox( panel, 1000, _("Place all units"), wxDefaultPosition,
|
||||||
wxDefaultSize, wxALIGN_RIGHT );
|
wxDefaultSize, wxALIGN_RIGHT );
|
||||||
m_useUnits->SetValue( cfg->m_SymChooserPanel.place_all_units );
|
m_useUnits->SetValue( cfg ? cfg->m_SymChooserPanel.place_all_units : true );
|
||||||
m_useUnits->SetToolTip( _( "Sequentially place all units of the symbol." ) );
|
m_useUnits->SetToolTip( _( "Sequentially place all units of the symbol." ) );
|
||||||
|
|
||||||
auto fgSizer = new wxFlexGridSizer( 0, 2, 0, 1 );
|
auto fgSizer = new wxFlexGridSizer( 0, 2, 0, 1 );
|
||||||
|
|
|
@ -78,7 +78,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( SCH_EDIT
|
||||||
|
|
||||||
// Show/hide columns according to user's preference
|
// Show/hide columns according to user's preference
|
||||||
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
m_shownColumns = cfg->m_Appearance.edit_component_visible_columns;
|
|
||||||
|
if( cfg )
|
||||||
|
m_shownColumns = cfg->m_Appearance.edit_component_visible_columns;
|
||||||
|
|
||||||
m_grid->ShowHideColumns( m_shownColumns );
|
m_grid->ShowHideColumns( m_shownColumns );
|
||||||
|
|
||||||
wxToolTip::Enable( true );
|
wxToolTip::Enable( true );
|
||||||
|
@ -110,7 +113,9 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( SCH_EDIT
|
||||||
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC()
|
DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC()
|
||||||
{
|
{
|
||||||
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
cfg->m_Appearance.edit_component_visible_columns = m_grid->GetShownColumns();
|
|
||||||
|
if( cfg )
|
||||||
|
cfg->m_Appearance.edit_component_visible_columns = m_grid->GetShownColumns();
|
||||||
|
|
||||||
// Prevents crash bug in wxGrid's d'tor
|
// Prevents crash bug in wxGrid's d'tor
|
||||||
m_grid->DestroyTable( m_fields );
|
m_grid->DestroyTable( m_fields );
|
||||||
|
|
|
@ -932,7 +932,8 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::LoadFieldNames()
|
||||||
|
|
||||||
// Force References to always be shown
|
// Force References to always be shown
|
||||||
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
wxASSERT( cfg );
|
wxCHECK( cfg, /*void*/ );
|
||||||
|
|
||||||
cfg->m_FieldEditorPanel.fields_show["Reference"] = true;
|
cfg->m_FieldEditorPanel.fields_show["Reference"] = true;
|
||||||
|
|
||||||
// *DO NOT* use translated mandatory field names:
|
// *DO NOT* use translated mandatory field names:
|
||||||
|
|
|
@ -293,7 +293,10 @@ void DIALOG_RESCUE_EACH::OnNeverShowClick( wxCommandEvent& aEvent )
|
||||||
if( resp == wxID_YES )
|
if( resp == wxID_YES )
|
||||||
{
|
{
|
||||||
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
|
||||||
cfg->m_RescueNeverShow = true;
|
|
||||||
|
if( cfg )
|
||||||
|
cfg->m_RescueNeverShow = true;
|
||||||
|
|
||||||
m_Rescuer->m_chosen_candidates.clear();
|
m_Rescuer->m_chosen_candidates.clear();
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,15 +224,18 @@ void LIB_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
|
||||||
auto cfg = dynamic_cast<LIBEDIT_SETTINGS*>( aCfg );
|
auto cfg = dynamic_cast<LIBEDIT_SETTINGS*>( aCfg );
|
||||||
wxASSERT( cfg );
|
wxASSERT( cfg );
|
||||||
|
|
||||||
SetDefaultLineThickness( Mils2iu( cfg->m_Defaults.line_width ) );
|
if( cfg )
|
||||||
SetDefaultPinLength( Mils2iu( cfg->m_Defaults.pin_length ) );
|
{
|
||||||
m_textPinNameDefaultSize = Mils2iu( cfg->m_Defaults.pin_name_size );
|
SetDefaultLineThickness( Mils2iu( cfg->m_Defaults.line_width ) );
|
||||||
m_textPinNumDefaultSize = Mils2iu( cfg->m_Defaults.pin_num_size );
|
SetDefaultPinLength( Mils2iu( cfg->m_Defaults.pin_length ) );
|
||||||
SetRepeatDeltaLabel( cfg->m_Repeat.label_delta );
|
m_textPinNameDefaultSize = Mils2iu( cfg->m_Defaults.pin_name_size );
|
||||||
SetRepeatPinStep( Mils2iu( cfg->m_Repeat.pin_step ) );
|
m_textPinNumDefaultSize = Mils2iu( cfg->m_Defaults.pin_num_size );
|
||||||
SetRepeatStep( wxPoint( cfg->m_Repeat.x_step, cfg->m_Repeat.y_step ) );
|
SetRepeatDeltaLabel( cfg->m_Repeat.label_delta );
|
||||||
m_showPinElectricalTypeName = cfg->m_ShowPinElectricalType;
|
SetRepeatPinStep( Mils2iu( cfg->m_Repeat.pin_step ) );
|
||||||
m_defaultLibWidth = cfg->m_LibWidth;
|
SetRepeatStep( wxPoint( cfg->m_Repeat.x_step, cfg->m_Repeat.y_step ) );
|
||||||
|
m_showPinElectricalTypeName = cfg->m_ShowPinElectricalType;
|
||||||
|
m_defaultLibWidth = cfg->m_LibWidth;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO(JE) does libedit need its own TemplateFieldNames?
|
// TODO(JE) does libedit need its own TemplateFieldNames?
|
||||||
auto ee_settings = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
|
auto ee_settings = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
|
||||||
|
|
|
@ -525,7 +525,8 @@ void SCH_FIELD::SetPosition( const wxPoint& aPosition )
|
||||||
SCH_COMPONENT* parentComponent = static_cast<SCH_COMPONENT*>( m_Parent );
|
SCH_COMPONENT* parentComponent = static_cast<SCH_COMPONENT*>( m_Parent );
|
||||||
wxPoint relativePos = aPosition - parentComponent->GetPosition();
|
wxPoint relativePos = aPosition - parentComponent->GetPosition();
|
||||||
|
|
||||||
parentComponent->GetTransform().InverseTransform().TransformCoordinate( relativePos );
|
relativePos = parentComponent->GetTransform().
|
||||||
|
InverseTransform().TransformCoordinate( relativePos );
|
||||||
|
|
||||||
SetTextPos( relativePos + parentComponent->GetPosition() );
|
SetTextPos( relativePos + parentComponent->GetPosition() );
|
||||||
}
|
}
|
||||||
|
@ -541,7 +542,7 @@ wxPoint SCH_FIELD::GetPosition() const
|
||||||
SCH_COMPONENT* parentComponent = static_cast<SCH_COMPONENT*>( m_Parent );
|
SCH_COMPONENT* parentComponent = static_cast<SCH_COMPONENT*>( m_Parent );
|
||||||
wxPoint relativePos = GetTextPos() - parentComponent->GetPosition();
|
wxPoint relativePos = GetTextPos() - parentComponent->GetPosition();
|
||||||
|
|
||||||
parentComponent->GetTransform().TransformCoordinate( relativePos );
|
relativePos = parentComponent->GetTransform().TransformCoordinate( relativePos );
|
||||||
|
|
||||||
return relativePos + parentComponent->GetPosition();
|
return relativePos + parentComponent->GetPosition();
|
||||||
}
|
}
|
||||||
|
|
|
@ -504,6 +504,9 @@ void KICAD_MANAGER_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
|
||||||
EDA_BASE_FRAME::LoadSettings( aCfg );
|
EDA_BASE_FRAME::LoadSettings( aCfg );
|
||||||
|
|
||||||
auto settings = dynamic_cast<KICAD_SETTINGS*>( aCfg );
|
auto settings = dynamic_cast<KICAD_SETTINGS*>( aCfg );
|
||||||
|
|
||||||
|
wxCHECK( settings, /*void*/);
|
||||||
|
|
||||||
m_leftWinWidth = settings->m_LeftWinWidth;
|
m_leftWinWidth = settings->m_LeftWinWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -513,6 +516,9 @@ void KICAD_MANAGER_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
|
||||||
EDA_BASE_FRAME::SaveSettings( aCfg );
|
EDA_BASE_FRAME::SaveSettings( aCfg );
|
||||||
|
|
||||||
auto settings = dynamic_cast<KICAD_SETTINGS*>( aCfg );
|
auto settings = dynamic_cast<KICAD_SETTINGS*>( aCfg );
|
||||||
|
|
||||||
|
wxCHECK( settings, /*void*/);
|
||||||
|
|
||||||
settings->m_LeftWinWidth = m_leftWin->GetSize().x;
|
settings->m_LeftWinWidth = m_leftWin->GetSize().x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,6 +182,8 @@ void ZONE_CONTAINER::initDataFromSrcInCopyCtor( const ZONE_CONTAINER& aZone )
|
||||||
// (has meaning only for copper zones)
|
// (has meaning only for copper zones)
|
||||||
m_netinfo = aZone.m_netinfo;
|
m_netinfo = aZone.m_netinfo;
|
||||||
|
|
||||||
|
m_area = aZone.m_area;
|
||||||
|
|
||||||
SetNeedRefill( aZone.NeedRefill() );
|
SetNeedRefill( aZone.NeedRefill() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -532,6 +532,7 @@ PNS_KICAD_IFACE_BASE::PNS_KICAD_IFACE_BASE()
|
||||||
m_board = nullptr;
|
m_board = nullptr;
|
||||||
m_router = nullptr;
|
m_router = nullptr;
|
||||||
m_debugDecorator = nullptr;
|
m_debugDecorator = nullptr;
|
||||||
|
m_router = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1458,7 +1459,7 @@ void PNS_KICAD_IFACE::SetView( KIGFX::VIEW* aView )
|
||||||
m_view = aView;
|
m_view = aView;
|
||||||
m_previewItems = new KIGFX::VIEW_GROUP( m_view );
|
m_previewItems = new KIGFX::VIEW_GROUP( m_view );
|
||||||
m_previewItems->SetLayer( LAYER_SELECT_OVERLAY ) ;
|
m_previewItems->SetLayer( LAYER_SELECT_OVERLAY ) ;
|
||||||
|
|
||||||
if(m_view)
|
if(m_view)
|
||||||
m_view->Add( m_previewItems );
|
m_view->Add( m_previewItems );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue