AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 09:01:42 +00:00
Files Issues Releases Activity

Handle simulator plot cell attributes correctly

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/17841
This commit is contained in:
JamesJCode 2024-12-24 11:23:05 +00:00
parent ea1e14b292
commit 2cfa33a50a
1 changed files with 30 additions and 18 deletions

48
eeschema/sim/simulator_frame_ui.cpp
View File

@ -1796,26 +1796,35 @@ void SIMULATOR_FRAME_UI::updateSignalsGrid()
{
m_signalsGrid->SetCellValue( row, COL_SIGNAL_SHOW, wxS( "1" ) );
wxGridCellAttr* attr = new wxGridCellAttr;
attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( this ) );
attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( this, m_signalsGrid ) );
wxGridCellAttrPtr attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_SIGNAL_COLOR );
if( !attr->HasRenderer() )
attr->SetRenderer( new GRID_CELL_COLOR_RENDERER( this ) );
if( !attr->HasEditor() )
attr->SetEditor( new GRID_CELL_COLOR_SELECTOR( this, m_signalsGrid ) );
attr->SetAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
m_signalsGrid->SetAttr( row, COL_SIGNAL_COLOR, attr );
attr->SetReadOnly( false );
KIGFX::COLOR4D color( trace->GetPen().GetColour() );
m_signalsGrid->SetCellValue( row, COL_SIGNAL_COLOR, color.ToCSSString() );
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_CURSOR_1, attr );
attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_CURSOR_1 );
if( !attr->HasRenderer() )
attr->SetRenderer( new wxGridCellBoolRenderer() );
attr->SetReadOnly(); // not really; we delegate interactivity to GRID_TRICKS
attr->SetAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_CURSOR_2 );
if( !attr->HasRenderer() )
attr->SetRenderer( new wxGridCellBoolRenderer() );
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_CURSOR_2, attr );
if( trace->HasCursor( 1 ) )
m_signalsGrid->SetCellValue( row, COL_CURSOR_1, wxS( "1" ) );
@ -1831,19 +1840,22 @@ void SIMULATOR_FRAME_UI::updateSignalsGrid()
{
m_signalsGrid->SetCellValue( row, COL_SIGNAL_SHOW, wxEmptyString );
wxGridCellAttr* attr = new wxGridCellAttr;
wxGridCellAttrPtr attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_SIGNAL_COLOR );
attr->SetEditor( nullptr );
attr->SetRenderer( nullptr );
attr->SetReadOnly();
m_signalsGrid->SetAttr( row, COL_SIGNAL_COLOR, attr );
m_signalsGrid->SetCellValue( row, COL_SIGNAL_COLOR, wxEmptyString );
attr = new wxGridCellAttr;
attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_CURSOR_1 );
attr->SetEditor( nullptr );
attr->SetRenderer( nullptr );
attr->SetReadOnly();
m_signalsGrid->SetAttr( row, COL_CURSOR_1, attr );
m_signalsGrid->SetCellValue( row, COL_CURSOR_1, wxEmptyString );
attr = new wxGridCellAttr;
attr = m_signalsGrid->GetOrCreateCellAttrPtr( row, COL_CURSOR_2 );
attr->SetEditor( nullptr );
attr->SetRenderer( nullptr );
attr->SetReadOnly();
m_signalsGrid->SetAttr( row, COL_CURSOR_2, attr );
m_signalsGrid->SetCellValue( row, COL_CURSOR_2, wxEmptyString );
}
}