Slight reduction in asserts.

common/base_screen.cpp

@@ -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;
 }
 
 

common/dialogs/dialog_print_generic.cpp

@@ -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;
 }
 
 

common/tool/tool_manager.cpp

@@ -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;
 }

common/widgets/properties_panel.cpp

@@ -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;

eeschema/dialogs/dialog_change_symbols.cpp

@@ -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;
     }

eeschema/dialogs/dialog_eeschema_page_settings.cpp

@@ -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 );

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -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();
-
-        wxCHECK( rootSymbol, false );
+        if( LIB_SYMBOL_SPTR rootSymbol = m_libEntry->GetParent().lock() )
+        {
+            wxString parentName = UnescapeString( rootSymbol->GetName() );
+            int selection = m_inheritanceSelectCombo->FindString( parentName );
 
-        wxString parentName = UnescapeString( rootSymbol->GetName() );
-        int selection = m_inheritanceSelectCombo->FindString( parentName );
+            if( selection == wxNOT_FOUND )
+                return false;
 
-        wxCHECK( selection != wxNOT_FOUND, false );
-        m_inheritanceSelectCombo->SetSelection( selection );
+            m_inheritanceSelectCombo->SetSelection( selection );
+        }
 
         m_lastOpenedPage = 0;
     }

eeschema/dialogs/dialog_sim_model.cpp

@@ -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() );
-
-    wxCHECK( modelibis, /* void */ );
-
-    bool diff = m_differentialCheckbox->GetValue() && modelibis->CanDifferential();
-    modelibis->SwitchSingleEndedDiff( diff );
+    if( SIM_MODEL_IBIS* modelibis = dynamic_cast<SIM_MODEL_IBIS*>( &curModel() ) )
+    {
+        bool diff = m_differentialCheckbox->GetValue() && modelibis->CanDifferential();
+        modelibis->SwitchSingleEndedDiff( diff );
 
-    updateWidgets();
+        updateWidgets();
+    }
 }
 
 

eeschema/netlist_exporters/netlist_exporter_base.cpp

@@ -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 ) );
 

eeschema/sim/sim_model.cpp

@@ -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 );
-
-        wxCHECK( baseModel, false );
+        if( const SIM_MODEL* baseModel = dynamic_cast<const SIM_MODEL*>( m_baseModel ) )
+        {
+            const std::string& baseValue = baseModel->m_params[ii].value;
 
-        std::string      baseValue = baseModel->m_params[ii].value;
+            if( param.value == 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;
 
-        // 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;

eeschema/sim/sim_property.cpp

@@ -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 );
+        if( wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( wnd_primary ) )
+        {
+            wxString oldStr = m_eval.OriginalText();
 
-        wxString oldStr = m_eval.OriginalText();
+            if( oldStr.length() && oldStr != textEntry->GetValue() )
+            {
+                SetValueInEvent( oldStr );
+                textEntry->SetValue( oldStr );
+            }
 
-        if( oldStr.length() && oldStr != textEntry->GetValue() )
-        {
-            SetValueInEvent( oldStr );
-            textEntry->SetValue( oldStr );
+            m_needsEval = true;
+            return true;
         }
-
-        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() ) )
-            {
-                // Don't mess up user formatting if eval'ing didn't actually change the value.
-            }
-            else
+            if( !strValue.IsEmpty() && m_eval.Process( strValue ) )
             {
-                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 )
             {

eeschema/sim/simulator_frame_ui.cpp

@@ -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 ) );
-
-        wxCHECK( simTab, /* void */ );
-
-        simTab->OnLanguageChanged();
+        if( SIM_TAB* simTab = dynamic_cast<SIM_TAB*>( m_plotNotebook->GetPage( ii ) ) )
+        {
+            simTab->OnLanguageChanged();
 
-        wxString pageTitle( simulator()->TypeToName( simTab->GetSimType(), true ) );
-        pageTitle.Prepend( wxString::Format( _( "Analysis %u - " ), ii+1 /* 1-based */ ) );
+            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( 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
+    if( SIM_PLOT_TAB* plotTab = dynamic_cast<SIM_PLOT_TAB*>( GetCurrentSimTab() ) )
     {
-        updateTrace( aName, aType, plotTab );
-    }
+        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 );
+        }
 
-    plotTab->GetPlotWin()->UpdateAll();
+        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 )