haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save plot prefs (legend, grid, and dotted-secondary). 

Fixes https://gitlab.com/kicad/code/kicad/issues/13940
This commit is contained in:
Jeff Young 2023-02-26 11:57:02 +00:00
parent 733978dfd0
commit 551773bf17
3 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
eeschema/sim/sim_plot_frame.cpp
View File

@ -1025,7 +1025,7 @@ void SIM_PLOT_FRAME::StartSimulation()
if( !plotWindow ) if( !plotWindow )
{ {
plotWindow = NewPlotPanel( schTextSimCommand, m_circuitModel->GetSimOptions() ); plotWindow = NewPlotPanel( schTextSimCommand, m_circuitModel->GetSimOptions() );
m_workbookModified = true; OnModify();
} }
else else
{ {
@ -1039,7 +1039,7 @@ void SIM_PLOT_FRAME::StartSimulation()
{ {
m_circuitModel->SetSimCommandOverride( wxEmptyString ); m_circuitModel->SetSimCommandOverride( wxEmptyString );
plotWindow->SetSimCommand( schTextSimCommand ); plotWindow->SetSimCommand( schTextSimCommand );
m_workbookModified = true; OnModify();
} }
} }
} }
@ -1094,6 +1094,7 @@ SIM_PANEL_BASE* SIM_PLOT_FRAME::NewPlotPanel( const wxString& aSimCommand, int a
m_plotNotebook->AddPage( dynamic_cast<wxWindow*>( plotPanel ), pageTitle, true ); m_plotNotebook->AddPage( dynamic_cast<wxWindow*>( plotPanel ), pageTitle, true );
OnModify();
return plotPanel; return plotPanel;
} }
@ -1171,7 +1172,7 @@ void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
// Update enabled/visible states of other controls // Update enabled/visible states of other controls
updateSignalsGrid(); updateSignalsGrid();
m_workbookModified = true; OnModify();
} }
else if( col == COL_SIGNAL_COLOR ) else if( col == COL_SIGNAL_COLOR )
{ {
@ -1183,7 +1184,7 @@ void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
trace->SetTraceColour( color.ToColour() ); trace->SetTraceColour( color.ToColour() );
plot->UpdateTraceStyle( trace ); plot->UpdateTraceStyle( trace );
plot->UpdatePlotColors(); plot->UpdatePlotColors();
m_workbookModified = true; OnModify();
} }
} }
else if( col == COL_CURSOR_1 || col == COL_CURSOR_2 ) else if( col == COL_CURSOR_1 || col == COL_CURSOR_2 )
@ -1193,7 +1194,7 @@ void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
bool enable = ii == row && text == wxS( "1" ); bool enable = ii == row && text == wxS( "1" );
plot->EnableCursor( getTraceName( ii ), col == COL_CURSOR_1 ? 1 : 2, enable ); plot->EnableCursor( getTraceName( ii ), col == COL_CURSOR_1 ? 1 : 2, enable );
m_workbookModified = true; OnModify();
} }
// Update cursor checkboxes (which are really radio buttons) // Update cursor checkboxes (which are really radio buttons)
@ -1241,7 +1242,7 @@ void SIM_PLOT_FRAME::onCursorsGridCellChanged( wxGridEvent& aEvent )
cursor2->SetCoordX( cursor1->GetCoords().x + value ); cursor2->SetCoordX( cursor1->GetCoords().x + value );
updateCursors(); updateCursors();
m_workbookModified = true; OnModify();
} }
else else
{ {
@ -1261,7 +1262,7 @@ SPICE_VALUE_FORMAT SIM_PLOT_FRAME::GetMeasureFormat( int aRow ) const
void SIM_PLOT_FRAME::SetMeasureFormat( int aRow, const SPICE_VALUE_FORMAT& aFormat ) void SIM_PLOT_FRAME::SetMeasureFormat( int aRow, const SPICE_VALUE_FORMAT& aFormat )
{ {
m_measurementsGrid->SetCellValue( aRow, COL_MEASUREMENT_FORMAT, aFormat.ToString() ); m_measurementsGrid->SetCellValue( aRow, COL_MEASUREMENT_FORMAT, aFormat.ToString() );
m_workbookModified = true; OnModify();
} }
@ -1270,7 +1271,7 @@ void SIM_PLOT_FRAME::DeleteMeasurement( int aRow )
if( aRow < ( m_measurementsGrid->GetNumberRows() - 1 ) ) if( aRow < ( m_measurementsGrid->GetNumberRows() - 1 ) )
{ {
m_measurementsGrid->DeleteRows( aRow, 1 ); m_measurementsGrid->DeleteRows( aRow, 1 );
m_workbookModified = true; OnModify();
} }
} }
@ -1289,7 +1290,7 @@ void SIM_PLOT_FRAME::onMeasurementsGridCellChanged( wxGridEvent& aEvent )
if( col == COL_MEASUREMENT ) if( col == COL_MEASUREMENT )
{ {
UpdateMeasurement( row ); UpdateMeasurement( row );
m_workbookModified = true; OnModify();
} }
else else
{ {
@ -1468,7 +1469,7 @@ void SIM_PLOT_FRAME::AddTuner( const SCH_SHEET_PATH& aSheetPath, SCH_SYMBOL* aSy
m_sizerTuners->Add( tuner ); m_sizerTuners->Add( tuner );
m_tuners.push_back( tuner ); m_tuners.push_back( tuner );
m_panelTuners->Layout(); m_panelTuners->Layout();
m_workbookModified = true; OnModify();
} }
catch( const KI_PARAM_ERROR& e ) catch( const KI_PARAM_ERROR& e )
{ {
@ -1517,7 +1518,7 @@ void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner, bool aErase )
aTuner->Destroy(); aTuner->Destroy();
m_panelTuners->Layout(); m_panelTuners->Layout();
m_workbookModified = true; OnModify();
} }
@ -1554,7 +1555,7 @@ void SIM_PLOT_FRAME::AddMeasurement( const wxString& aCmd )
SetMeasureFormat( row, { 3, wxS( "~V" ) } ); SetMeasureFormat( row, { 3, wxS( "~V" ) } );
UpdateMeasurement( row ); UpdateMeasurement( row );
m_workbookModified = true; OnModify();
// Always leave at least one empty row for type-in: // Always leave at least one empty row for type-in:
row = m_measurementsGrid->GetNumberRows() - 1; row = m_measurementsGrid->GetNumberRows() - 1;
@ -1620,7 +1621,7 @@ void SIM_PLOT_FRAME::doAddPlot( const wxString& aName, SIM_TRACE_TYPE aType )
} }
updateSignalsGrid(); updateSignalsGrid();
m_workbookModified = true; OnModify();
} }
@ -1640,7 +1641,7 @@ void SIM_PLOT_FRAME::SetUserDefinedSignals( const std::vector<wxString>& aNewSig
rebuildSignalsList(); rebuildSignalsList();
rebuildSignalsGrid( m_filter->GetValue() ); rebuildSignalsGrid( m_filter->GetValue() );
updateSignalsGrid(); updateSignalsGrid();
m_workbookModified = true; OnModify();
} }
@ -1691,7 +1692,7 @@ void SIM_PLOT_FRAME::removeTrace( const wxString& aSignalName )
wxASSERT( plotPanel->TraceShown( aSignalName ) ); wxASSERT( plotPanel->TraceShown( aSignalName ) );
if( plotPanel->DeleteTrace( aSignalName ) ) if( plotPanel->DeleteTrace( aSignalName ) )
m_workbookModified = true; OnModify();
plotPanel->GetPlotWin()->Fit(); plotPanel->GetPlotWin()->Fit();
@ -2122,6 +2123,18 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
m_cursorFormats[2][1].FromString( parts[2] ); m_cursorFormats[2][1].FromString( parts[2] );
} }
} }
else if( item == wxS( "dottedSecondary" ) )
{
plotPanel->SetDottedSecondary( true );
}
else if( item == wxS( "showLegend" ) )
{
plotPanel->ShowLegend( true );
}
else if( item == wxS( "hideGrid" ) )
{
plotPanel->ShowGrid( false );
}
} }
plotPanel->UpdatePlotColors(); plotPanel->UpdatePlotColors();
@ -2269,6 +2282,15 @@ bool SIM_PLOT_FRAME::SaveWorkbook( const wxString& aPath )
m_cursorFormats[2][1].ToString() ); m_cursorFormats[2][1].ToString() );
} }
if( plotPanel->GetDottedSecondary() )
msg += wxS( "|dottedSecondary" );
if( plotPanel->IsLegendShown() )
msg += wxS( "|showLegend" );
if( !plotPanel->IsGridShown() )
msg += wxS( "|hideGrid" );
file.AddLine( msg ); file.AddLine( msg );
} }
} }
@ -2390,7 +2412,7 @@ void SIM_PLOT_FRAME::onPlotDragged( wxAuiNotebookEvent& event )
void SIM_PLOT_FRAME::onNotebookModified( wxCommandEvent& event ) void SIM_PLOT_FRAME::onNotebookModified( wxCommandEvent& event )
{ {
m_workbookModified = true; OnModify();
updateTitle(); updateTitle();
} }
@ -2457,7 +2479,7 @@ bool SIM_PLOT_FRAME::EditSimCommand()
plotPanelWindow->SetSimOptions( newOptions ); plotPanelWindow->SetSimOptions( newOptions );
} }
m_workbookModified = true; OnModify();
m_simulator->Init(); m_simulator->Init();
return true; return true;
} }
@ -2645,7 +2667,7 @@ void SIM_PLOT_FRAME::updateCursors()
void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& aEvent ) void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& aEvent )
{ {
updateCursors(); updateCursors();
m_workbookModified = true; OnModify();
} }
@ -2930,6 +2952,13 @@ void SIM_PLOT_FRAME::onExit( wxCommandEvent& event )
} }
void SIM_PLOT_FRAME::OnModify()
{
KIWAY_PLAYER::OnModify();
m_workbookModified = true;
}
wxDEFINE_EVENT( EVT_SIM_UPDATE, wxCommandEvent ); wxDEFINE_EVENT( EVT_SIM_UPDATE, wxCommandEvent );
wxDEFINE_EVENT( EVT_SIM_REPORT, wxCommandEvent ); wxDEFINE_EVENT( EVT_SIM_REPORT, wxCommandEvent );

2
eeschema/sim/sim_plot_frame.h
View File

@ -234,6 +234,8 @@ public:
// Simulator doesn't host a tool framework // Simulator doesn't host a tool framework
wxWindow* GetToolCanvas() const override { return nullptr; } wxWindow* GetToolCanvas() const override { return nullptr; }
void OnModify() override;
private: private:
void setupTools(); void setupTools();
void doReCreateMenuBar() override; void doReCreateMenuBar() override;

9
eeschema/tools/simulator_control.cpp
View File

@ -237,7 +237,10 @@ int SIMULATOR_CONTROL::ToggleGrid( const TOOL_EVENT& aEvent )
SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot(); SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot();
if( plot ) if( plot )
{
plot->ShowGrid( !plot->IsGridShown() ); plot->ShowGrid( !plot->IsGridShown() );
m_plotFrame->OnModify();
}
return 0; return 0;
} }
@ -248,7 +251,10 @@ int SIMULATOR_CONTROL::ToggleLegend( const TOOL_EVENT& aEvent )
SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot(); SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot();
if( plot ) if( plot )
{
plot->ShowLegend( !plot->IsLegendShown() ); plot->ShowLegend( !plot->IsLegendShown() );
m_plotFrame->OnModify();
}
return 0; return 0;
} }
@ -259,7 +265,10 @@ int SIMULATOR_CONTROL::ToggleDottedSecondary( const TOOL_EVENT& aEvent )
SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot(); SIM_PLOT_PANEL* plot = m_plotFrame->GetCurrentPlot();
if( plot ) if( plot )
{
plot->SetDottedSecondary( !plot->GetDottedSecondary() ); plot->SetDottedSecondary( !plot->GetDottedSecondary() );
m_plotFrame->OnModify();
}
return 0; return 0;
} }