Remove dead code. (Coverity)

Also fixes a (small) memory leak.
This commit is contained in:
Jeff Young 2024-01-04 15:57:30 +00:00
parent ffa3b27a4e
commit e438fc2569
1 changed files with 10 additions and 21 deletions

View File

@ -752,32 +752,20 @@ void SIMULATOR_FRAME_UI::rebuildSignalsGrid( wxString aFilter )
{ {
int traceType = SPT_UNKNOWN; int traceType = SPT_UNKNOWN;
wxString vectorName = vectorNameFromSignalName( plotPanel, signal, &traceType ); wxString vectorName = vectorNameFromSignalName( plotPanel, signal, &traceType );
TRACE* trace = plotPanel ? plotPanel->GetTrace( vectorName, traceType ) : nullptr; TRACE* trace = plotPanel->GetTrace( vectorName, traceType );
m_signalsGrid->AppendRows( 1 ); m_signalsGrid->AppendRows( 1 );
m_signalsGrid->SetCellValue( row, COL_SIGNAL_NAME, signal ); m_signalsGrid->SetCellValue( row, COL_SIGNAL_NAME, signal );
if( !plotPanel ) wxGridCellAttr* attr = new wxGridCellAttr;
{ attr->SetRenderer( new wxGridCellBoolRenderer() );
wxGridCellAttr* attr = new wxGridCellAttr; attr->SetReadOnly(); // not really; we delegate interactivity to GRID_TRICKS
attr->SetReadOnly(); attr->SetAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_signalsGrid->SetAttr( row, COL_SIGNAL_SHOW, attr ); m_signalsGrid->SetAttr( row, COL_SIGNAL_SHOW, attr );
}
else
{
wxGridCellAttr* attr = new wxGridCellAttr;
attr->SetRenderer( new wxGridCellBoolRenderer() );
attr->SetReadOnly(); // not really; we delegate interactivity to GRID_TRICKS
attr->SetAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_signalsGrid->SetAttr( row, COL_SIGNAL_SHOW, attr );
}
if( trace ) if( !trace )
m_signalsGrid->SetCellValue( row, COL_SIGNAL_SHOW, wxS( "1" ) );
if( !plotPanel || !trace )
{ {
wxGridCellAttr* attr = new wxGridCellAttr; attr = new wxGridCellAttr;
attr->SetReadOnly(); attr->SetReadOnly();
m_signalsGrid->SetAttr( row, COL_SIGNAL_COLOR, attr ); m_signalsGrid->SetAttr( row, COL_SIGNAL_COLOR, attr );
m_signalsGrid->SetCellValue( row, COL_SIGNAL_COLOR, wxEmptyString ); m_signalsGrid->SetCellValue( row, COL_SIGNAL_COLOR, wxEmptyString );
@ -792,7 +780,8 @@ void SIMULATOR_FRAME_UI::rebuildSignalsGrid( wxString aFilter )
} }
else else
{ {
wxGridCellAttr* attr = new wxGridCellAttr; m_signalsGrid->SetCellValue( row, COL_SIGNAL_SHOW, wxS( "1" ) );
attr = new wxGridCellAttr; attr = new wxGridCellAttr;
attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( this ) ); attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( this ) );
attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( this, m_signalsGrid ) ); attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( this, m_signalsGrid ) );