AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 16:10:10 +00:00
Files Issues Releases Activity

Slight reduction in asserts.

Browse Source
This commit is contained in:
Jeff Young 2024-07-18 18:01:05 +01:00
parent 58a2159fa9
commit 9fcbd4e6d0
12 changed files with 104 additions and 109 deletions

5
common/base_screen.cpp
View File

@ -62,9 +62,8 @@ void BASE_SCREEN::InitDataPoints( const VECTOR2I& aPageSizeIU )
void BASE_SCREEN::SetPageCount( int aPageCount )
{
wxCHECK( aPageCount > 0, /* void */ );
m_pageCount = aPageCount;
if( aPageCount > 0 )
m_pageCount = aPageCount;
}

17
common/dialogs/dialog_print_generic.cpp
View File

@ -152,7 +152,7 @@ double DIALOG_PRINT_GENERIC::getScaleValue()
if( !m_scaleCustomText->GetValue().ToDouble( &scale ) )
{
DisplayInfoMessage( nullptr, _( "Warning: Bad scale number" ) );
DisplayInfoMessage( nullptr, _( "Warning: scale is not a number." ) );
scale = 1.0;
}
@ -160,23 +160,24 @@ double DIALOG_PRINT_GENERIC::getScaleValue()
{
scale = MAX_SCALE;
setScaleValue( scale );
DisplayInfoMessage( nullptr,
wxString::Format( _( "Warning: Scale option set to a very large value.\n"
" Clamped to %f" ), scale ) );
DisplayInfoMessage( nullptr, wxString::Format( _( "Warning: scale set to a very large "
"value.\nIt will be clamped to %f." ),
scale ) );
}
else if( scale < MIN_SCALE )
{
scale = MIN_SCALE;
setScaleValue( scale );
DisplayInfoMessage( nullptr,
wxString::Format( _( "Warning: Scale option set to a very small value.\n"
" Clamped to %f" ), scale ) );
DisplayInfoMessage( nullptr, wxString::Format( _( "Warning: scale set to a very small "
"value.\nIt will be clamped to %f." ),
scale ) );
}
return scale;
}
wxCHECK( false, 1.0 );
wxFAIL_MSG( wxT( "No scale option selected." ) );
return 1.0;
}

3
common/tool/tool_manager.cpp
View File

@ -1244,7 +1244,8 @@ bool TOOL_MANAGER::IsToolActive( TOOL_ID aId ) const
{
auto it = m_toolIdIndex.find( aId );
wxCHECK( it != m_toolIdIndex.end(), false );
if( it == m_toolIdIndex.end() )
return false;
return !it->second->idle;
}

2
common/widgets/properties_panel.cpp
View File

@ -199,7 +199,7 @@ void PROPERTIES_PANEL::rebuildProperties( const SELECTION& aSelection )
for( EDA_ITEM* item : aSelection )
types.insert( TYPE_HASH( *item ) );
wxCHECK( !types.empty(), /* void */ );
wxCHECK( !types.empty(), /* void */ ); // already guarded above, but Coverity doesn't know that
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
std::set<PROPERTY_BASE*> commonProps;

9
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -435,14 +435,13 @@ void DIALOG_CHANGE_SYMBOLS::onOkButtonClicked( wxCommandEvent& aEvent )
bool DIALOG_CHANGE_SYMBOLS::isMatch( SCH_SYMBOL* aSymbol, SCH_SHEET_PATH* aInstance )
{
LIB_ID id;
wxCHECK( aSymbol, false );
SCH_EDIT_FRAME* frame = dynamic_cast<SCH_EDIT_FRAME*>( GetParent() );
wxCHECK( frame, false );
if( !aSymbol )
return false;
if( m_matchAll->GetValue() )
{
return true;
@ -465,6 +464,8 @@ bool DIALOG_CHANGE_SYMBOLS::isMatch( SCH_SYMBOL* aSymbol, SCH_SHEET_PATH* aInsta
}
else if( m_matchById )
{
LIB_ID id;
id.Parse( getLibIdValue( m_specifiedId ) );
return aSymbol->GetLibId() == id;
}

4
eeschema/dialogs/dialog_eeschema_page_settings.cpp
View File

@ -35,7 +35,7 @@ DIALOG_EESCHEMA_PAGE_SETTINGS::DIALOG_EESCHEMA_PAGE_SETTINGS( EDA_DRAW_FRAME* aP
DIALOG_EESCHEMA_PAGE_SETTINGS::~DIALOG_EESCHEMA_PAGE_SETTINGS()
{
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
EESCHEMA_SETTINGS* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
wxCHECK( cfg, /* void */ );
cfg->m_PageSettings.export_paper = m_PaperExport->GetValue();
@ -85,7 +85,7 @@ void DIALOG_EESCHEMA_PAGE_SETTINGS::onTransferDataToWindow()
msg.Printf( format, m_screen->GetVirtualPageNumber() );
m_TextSheetNumber->SetLabel( msg );
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
EESCHEMA_SETTINGS* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
wxCHECK( cfg, /* void */ );
m_PaperExport->SetValue( cfg->m_PageSettings.export_paper );

15
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -246,15 +246,16 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataToWindow()
symbolNames.Remove( m_libEntry->GetName() );
m_inheritanceSelectCombo->Append( symbolNames );
LIB_SYMBOL_SPTR rootSymbol = m_libEntry->GetParent().lock();
if( LIB_SYMBOL_SPTR rootSymbol = m_libEntry->GetParent().lock() )
{
wxString parentName = UnescapeString( rootSymbol->GetName() );
int selection = m_inheritanceSelectCombo->FindString( parentName );
wxCHECK( rootSymbol, false );
if( selection == wxNOT_FOUND )
return false;
wxString parentName = UnescapeString( rootSymbol->GetName() );
int selection = m_inheritanceSelectCombo->FindString( parentName );
wxCHECK( selection != wxNOT_FOUND, false );
m_inheritanceSelectCombo->SetSelection( selection );
m_inheritanceSelectCombo->SetSelection( selection );
}
m_lastOpenedPage = 0;
}

13
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -1314,14 +1314,13 @@ void DIALOG_SIM_MODEL<T>::onPinModelComboboxTextEnter( wxCommandEvent& aEvent )
template <typename T>
void DIALOG_SIM_MODEL<T>::onDifferentialCheckbox( wxCommandEvent& aEvent )
{
SIM_MODEL_IBIS* modelibis = dynamic_cast<SIM_MODEL_IBIS*>( &curModel() );
if( SIM_MODEL_IBIS* modelibis = dynamic_cast<SIM_MODEL_IBIS*>( &curModel() ) )
{
bool diff = m_differentialCheckbox->GetValue() && modelibis->CanDifferential();
modelibis->SwitchSingleEndedDiff( diff );
wxCHECK( modelibis, /* void */ );
bool diff = m_differentialCheckbox->GetValue() && modelibis->CanDifferential();
modelibis->SwitchSingleEndedDiff( diff );
updateWidgets();
updateWidgets();
}
}

3
eeschema/netlist_exporters/netlist_exporter_base.cpp
View File

@ -131,7 +131,8 @@ std::vector<PIN_INFO> NETLIST_EXPORTER_BASE::CreatePinList( SCH_SYMBOL* aSymbol,
{
std::vector<PIN_INFO> pins;
wxCHECK( aSymbol, pins );
if( !aSymbol )
return pins;
wxString ref( aSymbol->GetRef( &aSheetPath ) );

25
eeschema/sim/sim_model.cpp
View File

@ -1038,22 +1038,21 @@ bool SIM_MODEL::requiresSpiceModelLine( const SPICE_ITEM& aItem ) const
if ( param.value == "" )
continue;
const SIM_MODEL* baseModel = dynamic_cast<const SIM_MODEL*>( m_baseModel );
if( const SIM_MODEL* baseModel = dynamic_cast<const SIM_MODEL*>( m_baseModel ) )
{
const std::string& baseValue = baseModel->m_params[ii].value;
wxCHECK( baseModel, false );
if( param.value == baseValue )
continue;
std::string baseValue = baseModel->m_params[ii].value;
// One more check for equivalence, mostly for early 7.0 files which wrote all
// parameters to the Sim.Params field in normalized format
if( param.value == SIM_VALUE::Normalize( SIM_VALUE::ToDouble( baseValue ) ) )
continue;
if( param.value == baseValue )
continue;
// One more check for equivalence, mostly for early 7.0 files which wrote all parameters
// to the Sim.Params field in normalized format
if( param.value == SIM_VALUE::Normalize( SIM_VALUE::ToDouble( baseValue ) ) )
continue;
// Overrides must be written
return true;
// Overrides must be written
return true;
}
}
return false;

61
eeschema/sim/sim_property.cpp
View File

@ -97,52 +97,49 @@ bool SIM_STRING_PROPERTY::OnEvent( wxPropertyGrid* propgrid, wxWindow* wnd_prima
{
if( event.GetEventType() == wxEVT_SET_FOCUS && allowEval() )
{
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wnd_primary );
wxCHECK( textEntry, false );
wxString oldStr = m_eval.OriginalText();
if( oldStr.length() && oldStr != textEntry->GetValue() )
if( wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wnd_primary ) )
{
SetValueInEvent( oldStr );
textEntry->SetValue( oldStr );
}
wxString oldStr = m_eval.OriginalText();
m_needsEval = true;
return true;
if( oldStr.length() && oldStr != textEntry->GetValue() )
{
SetValueInEvent( oldStr );
textEntry->SetValue( oldStr );
}
m_needsEval = true;
return true;
}
}
else if( event.GetEventType() == wxEVT_KILL_FOCUS && allowEval() )
{
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wnd_primary );
wxCHECK( textEntry, false );
wxString strValue = textEntry->GetValue();
if( !strValue.IsEmpty() && m_eval.Process( strValue ) )
if( wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wnd_primary ) )
{
double value = SIM_VALUE::ToDouble( m_eval.Result().ToStdString() );
wxString strValue = textEntry->GetValue();
if( std::isnan( value ) || SIM_VALUE::Equal( value, strValue.ToStdString() ) )
if( !strValue.IsEmpty() && m_eval.Process( strValue ) )
{
// Don't mess up user formatting if eval'ing didn't actually change the value.
}
else
{
SetValueInEvent( m_eval.Result() );
double value = SIM_VALUE::ToDouble( m_eval.Result().ToStdString() );
if( std::isnan( value ) || SIM_VALUE::Equal( value, strValue.ToStdString() ) )
{
// Don't mess up user formatting if eval'ing didn't actually change the value.
}
else
{
SetValueInEvent( m_eval.Result() );
}
}
m_needsEval = false;
return true;
}
m_needsEval = false;
return true;
}
else if( event.GetEventType() == wxEVT_KEY_DOWN )
{
wxKeyEvent& keyEvent = dynamic_cast<wxKeyEvent&>( event );
wxPropertyGrid* propGrid = dynamic_cast<wxPropertyGrid*>( wnd_primary->GetParent() );
wxKeyEvent& keyEvent = dynamic_cast<wxKeyEvent&>( event );
if( propGrid )
if( wxPropertyGrid* propGrid = dynamic_cast<wxPropertyGrid*>( wnd_primary->GetParent() ) )
{
if( keyEvent.GetKeyCode() == WXK_TAB )
{

56
eeschema/sim/simulator_frame_ui.cpp
View File

@ -591,16 +591,15 @@ void SIMULATOR_FRAME_UI::ShowChangedLanguage()
{
for( int ii = 0; ii < (int) m_plotNotebook->GetPageCount(); ++ii )
{
SIM_TAB* simTab = dynamic_cast<SIM_TAB*>( m_plotNotebook->GetPage( ii ) );
if( SIM_TAB* simTab = dynamic_cast<SIM_TAB*>( m_plotNotebook->GetPage( ii ) ) )
{
simTab->OnLanguageChanged();
wxCHECK( simTab, /* void */ );
wxString pageTitle( simulator()->TypeToName( simTab->GetSimType(), true ) );
pageTitle.Prepend( wxString::Format( _( "Analysis %u - " ), ii+1 /* 1-based */ ) );
simTab->OnLanguageChanged();
wxString pageTitle( simulator()->TypeToName( simTab->GetSimType(), true ) );
pageTitle.Prepend( wxString::Format( _( "Analysis %u - " ), ii+1 /* 1-based */ ) );
m_plotNotebook->SetPageText( ii, pageTitle );
m_plotNotebook->SetPageText( ii, pageTitle );
}
}
m_filter->SetHint( _( "Filter" ) );
@ -1576,25 +1575,25 @@ void SIMULATOR_FRAME_UI::AddTrace( const wxString& aName, SIM_TRACE_TYPE aType )
return;
}
SIM_PLOT_TAB* plotTab = dynamic_cast<SIM_PLOT_TAB*>( GetCurrentSimTab() );
wxCHECK( plotTab, /* void */ );
if( SIM_PLOT_TAB* plotTab = dynamic_cast<SIM_PLOT_TAB*>( GetCurrentSimTab() ) )
{
if( simType == ST_AC )
{
updateTrace( aName, aType | SPT_AC_GAIN, plotTab );
updateTrace( aName, aType | SPT_AC_PHASE, plotTab );
}
else if( simType == ST_SP )
{
updateTrace( aName, aType | SPT_AC_GAIN, plotTab );
updateTrace( aName, aType | SPT_AC_PHASE, plotTab );
}
else
{
updateTrace( aName, aType, plotTab );
}
if( simType == ST_AC )
{
updateTrace( aName, aType | SPT_AC_GAIN, plotTab );
updateTrace( aName, aType | SPT_AC_PHASE, plotTab );
plotTab->GetPlotWin()->UpdateAll();
}
else if( simType == ST_SP )
{
updateTrace( aName, aType | SPT_AC_GAIN, plotTab );
updateTrace( aName, aType | SPT_AC_PHASE, plotTab );
}
else
{
updateTrace( aName, aType, plotTab );
}
plotTab->GetPlotWin()->UpdateAll();
updateSignalsGrid();
OnModify();
@ -2099,11 +2098,8 @@ bool SIMULATOR_FRAME_UI::loadJsonWorkbook( const wxString& aPath )
{
m_simulatorFrame->LoadSimulator( simTab->GetSimCommand(), simTab->GetSimOptions() );
simTab = dynamic_cast<SIM_TAB*>( m_plotNotebook->GetPage( 0 ) );
wxCHECK( simTab, false );
simTab->SetLastSchTextSimCommand( js[ "last_sch_text_sim_command" ] );
if( SIM_TAB* firstTab = dynamic_cast<SIM_TAB*>( m_plotNotebook->GetPage( 0 ) ) )
firstTab->SetLastSchTextSimCommand( js[ "last_sch_text_sim_command" ] );
}
}
catch( nlohmann::json::parse_error& error )