Continue rationalisation of vector, trace and signal names.
Also add a little bit more code so user-defined signals can be edited without resetting their properties. Fixes https://gitlab.com/kicad/code/kicad/issues/14072
This commit is contained in:
Jeff Young
parent
4766175d60
commit
766b1a1ca8
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
|
||||
DIALOG_USER_DEFINED_SIGNALS::DIALOG_USER_DEFINED_SIGNALS( SIM_PLOT_FRAME* aParent,
|
||||
std::vector<wxString>* aSignals ) :
|
||||
std::map<int, wxString>* aSignals ) :
|
||||
DIALOG_USER_DEFINED_SIGNALS_BASE( aParent ),
|
||||
m_frame( aParent ),
|
||||
m_signals( aSignals ),
|
||||
|
|
@ -39,8 +39,12 @@ DIALOG_USER_DEFINED_SIGNALS::DIALOG_USER_DEFINED_SIGNALS( SIM_PLOT_FRAME* aParen
|
|||
{
|
||||
m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
|
||||
|
||||
for( const wxString& signal : *m_signals )
|
||||
addGridRow( signal );
|
||||
wxGridCellAttr* attr = new wxGridCellAttr;
|
||||
attr->SetReadOnly();
|
||||
m_grid->SetColAttr( 1, attr );
|
||||
|
||||
for( const auto& [ id, signal ] : *m_signals )
|
||||
addGridRow( signal, id );
|
||||
|
||||
m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
|
||||
m_deleteButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
|
||||
|
|
@ -72,12 +76,13 @@ bool DIALOG_USER_DEFINED_SIGNALS::TransferDataToWindow()
|
|||
}
|
||||
|
||||
|
||||
void DIALOG_USER_DEFINED_SIGNALS::addGridRow( const wxString& aText )
|
||||
void DIALOG_USER_DEFINED_SIGNALS::addGridRow( const wxString& aText, int aId )
|
||||
{
|
||||
int row = m_grid->GetNumberRows();
|
||||
|
||||
m_grid->AppendRows();
|
||||
m_grid->SetCellValue( row, 0, aText );
|
||||
m_grid->SetCellValue( row, 1, wxString::Format( wxS( "%d" ), aId ) );
|
||||
|
||||
wxGridCellAttr* attr = new wxGridCellAttr;
|
||||
attr->SetEditor( new GRID_CELL_STC_EDITOR( true,
|
||||
|
|
@ -95,7 +100,18 @@ void DIALOG_USER_DEFINED_SIGNALS::onAddSignal( wxCommandEvent& event )
|
|||
if( !m_grid->CommitPendingChanges() )
|
||||
return;
|
||||
|
||||
addGridRow( wxEmptyString );
|
||||
long newId = 0;
|
||||
|
||||
for( int ii = 0; ii < m_grid->GetNumberRows(); ++ii )
|
||||
{
|
||||
long usedId;
|
||||
m_grid->GetCellValue( ii, 1 ).ToLong( &usedId );
|
||||
|
||||
if( usedId > newId )
|
||||
newId = usedId + 1;
|
||||
}
|
||||
|
||||
addGridRow( wxEmptyString, (int) newId );
|
||||
|
||||
m_grid->MakeCellVisible( m_grid->GetNumberRows() - 1, 0 );
|
||||
m_grid->SetGridCursor( m_grid->GetNumberRows() - 1, 0 );
|
||||
|
|
@ -212,7 +228,16 @@ bool DIALOG_USER_DEFINED_SIGNALS::TransferDataFromWindow()
|
|||
m_signals->clear();
|
||||
|
||||
for( int ii = 0; ii < m_grid->GetNumberRows(); ++ii )
|
||||
m_signals->push_back( m_grid->GetCellValue( ii, 0 ) );
|
||||
{
|
||||
wxString signal = m_grid->GetCellValue( ii, 0 );
|
||||
|
||||
if( !signal.IsEmpty() )
|
||||
{
|
||||
long id;
|
||||
m_grid->GetCellValue( ii, 1 ).ToLong( &id );
|
||||
(*m_signals)[ (int) id ] = signal;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@ class HTML_MESSAGE_BOX;
|
|||
class DIALOG_USER_DEFINED_SIGNALS : public DIALOG_USER_DEFINED_SIGNALS_BASE
|
||||
{
|
||||
public:
|
||||
DIALOG_USER_DEFINED_SIGNALS( SIM_PLOT_FRAME* parent, std::vector<wxString>* aSignals );
|
||||
DIALOG_USER_DEFINED_SIGNALS( SIM_PLOT_FRAME* parent, std::map<int, wxString>* aSignals );
|
||||
~DIALOG_USER_DEFINED_SIGNALS();
|
||||
|
||||
private:
|
||||
void addGridRow( const wxString& aValue );
|
||||
void addGridRow( const wxString& aValue, int aId );
|
||||
|
||||
void onAddSignal( wxCommandEvent& event ) override;
|
||||
void onDeleteSignal( wxCommandEvent& event ) override;
|
||||
|
|
@ -50,10 +50,10 @@ private:
|
|||
bool TransferDataFromWindow() override;
|
||||
|
||||
private:
|
||||
SIM_PLOT_FRAME* m_frame;
|
||||
std::vector<wxString>* m_signals;
|
||||
SIM_PLOT_FRAME* m_frame;
|
||||
std::map<int, wxString>* m_signals;
|
||||
|
||||
HTML_MESSAGE_BOX* m_helpWindow;
|
||||
HTML_MESSAGE_BOX* m_helpWindow;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ DIALOG_USER_DEFINED_SIGNALS_BASE::DIALOG_USER_DEFINED_SIGNALS_BASE( wxWindow* pa
|
|||
m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
|
||||
// Grid
|
||||
m_grid->CreateGrid( 0, 1 );
|
||||
m_grid->CreateGrid( 0, 2 );
|
||||
m_grid->EnableEditing( true );
|
||||
m_grid->EnableGridLines( true );
|
||||
m_grid->EnableDragGridSize( false );
|
||||
|
|
@ -38,6 +38,7 @@ DIALOG_USER_DEFINED_SIGNALS_BASE::DIALOG_USER_DEFINED_SIGNALS_BASE( wxWindow* pa
|
|||
|
||||
// Columns
|
||||
m_grid->SetColSize( 0, 400 );
|
||||
m_grid->SetColSize( 1, 0 );
|
||||
m_grid->EnableDragColMove( false );
|
||||
m_grid->EnableDragColSize( true );
|
||||
m_grid->SetColLabelSize( 0 );
|
||||
|
|
|
|||
|
|
@ -151,8 +151,8 @@
|
|||
<property name="col_label_size">0</property>
|
||||
<property name="col_label_values"></property>
|
||||
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
|
||||
<property name="cols">1</property>
|
||||
<property name="column_sizes">400</property>
|
||||
<property name="cols">2</property>
|
||||
<property name="column_sizes">400,0</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default_pane">0</property>
|
||||
|
|
|
|||
|
|
@ -797,7 +797,9 @@ void SIM_PLOT_FRAME::rebuildSignalsGrid( wxString aFilter )
|
|||
|
||||
if( matcher.Find( signal, matches, offset ) && offset == 0 )
|
||||
{
|
||||
TRACE* trace = plotPanel ? plotPanel->GetTrace( signal ) : nullptr;
|
||||
int traceType = SPT_UNKNOWN;
|
||||
wxString vecName = vectorNameFromSignalName( signal, &traceType );
|
||||
TRACE* trace = plotPanel ? plotPanel->GetTrace( vecName, traceType ) : nullptr;
|
||||
|
||||
m_signalsGrid->AppendRows( 1 );
|
||||
m_signalsGrid->SetCellValue( row, COL_SIGNAL_NAME, signal );
|
||||
|
|
@ -879,28 +881,16 @@ void SIM_PLOT_FRAME::rebuildSignalsList()
|
|||
unconnected.Replace( '(', '_' ); // Convert to SPICE markup
|
||||
|
||||
auto addSignal =
|
||||
[&]( const wxString& aSignal, const wxString& aSpiceVecName = wxEmptyString )
|
||||
[&]( const wxString& aSignalName )
|
||||
{
|
||||
if( simType == ST_AC )
|
||||
{
|
||||
wxString gain = _( " (gain)" );
|
||||
wxString phase = _( " (phase)" );
|
||||
|
||||
m_signals.push_back( aSignal + gain );
|
||||
m_signals.push_back( aSignal + phase );
|
||||
|
||||
if( !aSpiceVecName.IsEmpty() )
|
||||
{
|
||||
m_userDefinedSignalToSpiceVecName[ aSignal + gain ] = aSpiceVecName + gain;
|
||||
m_userDefinedSignalToSpiceVecName[ aSignal + phase ] = aSpiceVecName + phase;
|
||||
}
|
||||
m_signals.push_back( aSignalName + _( " (gain)" ) );
|
||||
m_signals.push_back( aSignalName + _( " (phase)" ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_signals.push_back( aSignal );
|
||||
|
||||
if( !aSpiceVecName.IsEmpty() )
|
||||
m_userDefinedSignalToSpiceVecName[ aSignal ] = aSpiceVecName;
|
||||
m_signals.push_back( aSignalName );
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -961,10 +951,8 @@ void SIM_PLOT_FRAME::rebuildSignalsList()
|
|||
// JEY TODO: find and add SPICE "LET" commands
|
||||
|
||||
// Add user-defined signals
|
||||
for( int ii = 0; ii < (int) m_userDefinedSignals.size(); ++ii )
|
||||
{
|
||||
addSignal( m_userDefinedSignals[ii], wxString::Format( wxS( "user%d" ), ii ) );
|
||||
}
|
||||
for( const auto& [ signalId, signalName ] : m_userDefinedSignals )
|
||||
addSignal( signalName );
|
||||
|
||||
std::sort( m_signals.begin(), m_signals.end(),
|
||||
[]( const wxString& lhs, const wxString& rhs )
|
||||
|
|
@ -1111,31 +1099,59 @@ void SIM_PLOT_FRAME::OnFilterMouseMoved( wxMouseEvent& aEvent )
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* For user-defined signals we display the expression such as "V(out)-V(in)", but the SPICE
|
||||
* signal we actually have to plot will be "user0" or some-such.
|
||||
*/
|
||||
wxString SIM_PLOT_FRAME::getTraceName( const wxString& aSignalName )
|
||||
wxString vectorNameFromSignalId( int aUserDefinedSignalId )
|
||||
{
|
||||
if( alg::contains( m_userDefinedSignals, aSignalName ) )
|
||||
return m_userDefinedSignalToSpiceVecName[ aSignalName ];
|
||||
|
||||
return aSignalName;
|
||||
return wxString::Format( wxS( "user%d" ), aUserDefinedSignalId );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* AC-small-signal analyses have two traces per signal, so we suffix the names.
|
||||
* For user-defined signals we display the user-oriented signal name such as "V(out)-V(in)",
|
||||
* but the simulator vector we actually have to plot will be "user0" or some-such.
|
||||
*/
|
||||
wxString SIM_PLOT_FRAME::getTraceTitle( const wxString& aName, SIM_TRACE_TYPE aTraceType )
|
||||
wxString SIM_PLOT_FRAME::vectorNameFromSignalName( const wxString& aSignalName, int* aTraceType )
|
||||
{
|
||||
if( aTraceType & SPT_AC_MAG )
|
||||
return aName + _( " (gain)" );
|
||||
else if( aTraceType & SPT_AC_PHASE )
|
||||
return aName + _( " (phase)" );
|
||||
else
|
||||
return aName;
|
||||
}
|
||||
std::map<wxString, int> suffixes;
|
||||
suffixes[ _( " (gain)" ) ] = SPT_AC_MAG;
|
||||
suffixes[ _( " (phase)" ) ] = SPT_AC_PHASE;
|
||||
|
||||
if( aTraceType )
|
||||
{
|
||||
wxUniChar firstChar = aSignalName.Upper()[0];
|
||||
|
||||
if( firstChar == 'V' )
|
||||
*aTraceType = SPT_VOLTAGE;
|
||||
else if( firstChar == 'I' )
|
||||
*aTraceType = SPT_CURRENT;
|
||||
else if( firstChar == 'P' )
|
||||
*aTraceType = SPT_POWER;
|
||||
}
|
||||
|
||||
wxString suffix;
|
||||
wxString name = aSignalName;
|
||||
|
||||
for( const auto& [ candidate, type ] : suffixes )
|
||||
{
|
||||
if( name.EndsWith( candidate ) )
|
||||
{
|
||||
name = name.Left( name.Length() - candidate.Length() );
|
||||
|
||||
if( aTraceType )
|
||||
*aTraceType |= type;
|
||||
|
||||
suffix = candidate;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for( const auto& [ id, signal ] : m_userDefinedSignals )
|
||||
{
|
||||
if( name == signal )
|
||||
return vectorNameFromSignalId( id ) + suffix;
|
||||
}
|
||||
|
||||
return name + suffix;
|
||||
};
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
|
||||
|
|
@ -1147,48 +1163,26 @@ void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
|
|||
int col = aEvent.GetCol();
|
||||
wxString text = m_signalsGrid->GetCellValue( row, col );
|
||||
SIM_PLOT_PANEL* plot = GetCurrentPlot();
|
||||
wxString signalName = m_signalsGrid->GetCellValue( row, COL_SIGNAL_NAME );
|
||||
int traceType = SPT_UNKNOWN;
|
||||
wxString vectorName = vectorNameFromSignalName( signalName, &traceType );
|
||||
|
||||
if( col == COL_SIGNAL_SHOW )
|
||||
{
|
||||
wxString gainSuffix = _( " (gain)" );
|
||||
wxString phaseSuffix = _( " (phase)" );
|
||||
wxString signal = m_signalsGrid->GetCellValue( row, COL_SIGNAL_NAME );
|
||||
wxUniChar firstChar = signal.Upper()[0];
|
||||
wxString traceName = getTraceName( signal );
|
||||
int traceType = SPT_UNKNOWN;
|
||||
|
||||
if( firstChar == 'V' )
|
||||
traceType = SPT_VOLTAGE;
|
||||
else if( firstChar == 'I' )
|
||||
traceType = SPT_CURRENT;
|
||||
else if( firstChar == 'P' )
|
||||
traceType = SPT_POWER;
|
||||
|
||||
if( traceName.EndsWith( gainSuffix ) )
|
||||
{
|
||||
traceType |= SPT_AC_MAG;
|
||||
traceName = traceName.Left( traceName.Length() - gainSuffix.Length() );
|
||||
}
|
||||
else if( traceName.EndsWith( phaseSuffix ) )
|
||||
{
|
||||
traceType |= SPT_AC_PHASE;
|
||||
traceName = traceName.Left( traceName.Length() - phaseSuffix.Length() );
|
||||
}
|
||||
|
||||
if( text == wxS( "1" ) )
|
||||
addTrace( traceName, (SIM_TRACE_TYPE) traceType );
|
||||
plot->AddTrace( vectorName, traceType );
|
||||
else
|
||||
removeTrace( traceName, (SIM_TRACE_TYPE) traceType );
|
||||
plot->DeleteTrace( vectorName, traceType );
|
||||
|
||||
// Update enabled/visible states of other controls
|
||||
updateSignalsGrid();
|
||||
updateCursors();
|
||||
OnModify();
|
||||
}
|
||||
else if( col == COL_SIGNAL_COLOR )
|
||||
{
|
||||
KIGFX::COLOR4D color( m_signalsGrid->GetCellValue( row, COL_SIGNAL_COLOR ) );
|
||||
wxString signal = m_signalsGrid->GetCellValue( row, COL_SIGNAL_NAME );
|
||||
TRACE* trace = plot->GetTrace( getTraceName( signal ) );
|
||||
TRACE* trace = plot->GetTrace( vectorName, traceType );
|
||||
|
||||
if( trace )
|
||||
{
|
||||
|
|
@ -1202,11 +1196,13 @@ void SIM_PLOT_FRAME::onSignalsGridCellChanged( wxGridEvent& aEvent )
|
|||
{
|
||||
for( int ii = 0; ii < m_signalsGrid->GetNumberRows(); ++ii )
|
||||
{
|
||||
wxString signal = m_signalsGrid->GetCellValue( ii, COL_SIGNAL_NAME );
|
||||
int id = col == COL_CURSOR_1 ? 1 : 2;
|
||||
bool enable = ii == row && text == wxS( "1" );
|
||||
signalName = m_signalsGrid->GetCellValue( ii, COL_SIGNAL_NAME );
|
||||
vectorName = vectorNameFromSignalName( signalName, &traceType );
|
||||
|
||||
plot->EnableCursor( signal, getTraceName( signal ), id, enable );
|
||||
int id = col == COL_CURSOR_1 ? 1 : 2;
|
||||
bool enable = ii == row && text == wxS( "1" );
|
||||
|
||||
plot->EnableCursor( vectorName, traceType, id, enable, signalName );
|
||||
OnModify();
|
||||
}
|
||||
|
||||
|
|
@ -1619,14 +1615,10 @@ void SIM_PLOT_FRAME::doAddPlot( const wxString& aName, SIM_TRACE_TYPE aType )
|
|||
return;
|
||||
}
|
||||
|
||||
SIM_TRACE_TYPE xAxisType = getXAxisType( simType );
|
||||
|
||||
if( ( xAxisType == SPT_LIN_FREQUENCY || xAxisType == SPT_LOG_FREQUENCY )
|
||||
&& ( aType & ( SPT_AC_MAG | SPT_AC_PHASE ) ) == 0 )
|
||||
if( simType == ST_AC )
|
||||
{
|
||||
// If magnitude or phase wasn't specified, then add both
|
||||
updateTrace( aName, (SIM_TRACE_TYPE) ( aType | SPT_AC_MAG ), plotPanel );
|
||||
updateTrace( aName, (SIM_TRACE_TYPE) ( aType | SPT_AC_PHASE ), plotPanel );
|
||||
updateTrace( aName, aType | SPT_AC_MAG, plotPanel );
|
||||
updateTrace( aName, aType | SPT_AC_PHASE, plotPanel );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1638,19 +1630,49 @@ void SIM_PLOT_FRAME::doAddPlot( const wxString& aName, SIM_TRACE_TYPE aType )
|
|||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::SetUserDefinedSignals( const std::vector<wxString>& aNewSignals )
|
||||
void SIM_PLOT_FRAME::SetUserDefinedSignals( const std::map<int, wxString>& aNewSignals )
|
||||
{
|
||||
SIM_PLOT_PANEL* plotPanel = GetCurrentPlot();
|
||||
|
||||
if( plotPanel )
|
||||
for( size_t ii = 0; ii < m_plotNotebook->GetPageCount(); ++ii )
|
||||
{
|
||||
for( const wxString& signal : m_userDefinedSignals )
|
||||
{
|
||||
if( !alg::contains( aNewSignals, signal ) )
|
||||
plotPanel->DeleteTrace( m_userDefinedSignalToSpiceVecName[ signal ] );
|
||||
}
|
||||
SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( ii ) );
|
||||
|
||||
plotPanel->GetPlotWin()->Fit();
|
||||
if( !plotPanel )
|
||||
continue;
|
||||
|
||||
for( const auto& [ id, existingSignal ] : m_userDefinedSignals )
|
||||
{
|
||||
int traceType = SPT_UNKNOWN;
|
||||
wxString vectorName = vectorNameFromSignalName( existingSignal, &traceType );
|
||||
|
||||
if( aNewSignals.count( id ) == 0 )
|
||||
{
|
||||
if( plotPanel->GetType() == ST_AC )
|
||||
{
|
||||
for( int subType : { SPT_AC_MAG, SPT_AC_PHASE } )
|
||||
plotPanel->DeleteTrace( vectorName, traceType | subType );
|
||||
}
|
||||
else
|
||||
{
|
||||
plotPanel->DeleteTrace( vectorName, traceType );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if( plotPanel->GetType() == ST_AC )
|
||||
{
|
||||
for( int subType : { SPT_AC_MAG, SPT_AC_PHASE } )
|
||||
{
|
||||
if( TRACE* trace = plotPanel->GetTrace( vectorName, traceType | subType ) )
|
||||
trace->SetName( aNewSignals.at( id ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if( TRACE* trace = plotPanel->GetTrace( vectorName, traceType ) )
|
||||
trace->SetName( aNewSignals.at( id ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_userDefinedSignals = aNewSignals;
|
||||
|
|
@ -1660,53 +1682,29 @@ void SIM_PLOT_FRAME::SetUserDefinedSignals( const std::vector<wxString>& aNewSig
|
|||
|
||||
rebuildSignalsList();
|
||||
rebuildSignalsGrid( m_filter->GetValue() );
|
||||
updateSignalsGrid();
|
||||
OnModify();
|
||||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::addTrace( const wxString& aSignalName, SIM_TRACE_TYPE aTraceType )
|
||||
{
|
||||
if( aSignalName.IsEmpty() )
|
||||
return;
|
||||
|
||||
if( SIM_PLOT_PANEL* plotPanel = GetCurrentPlot() )
|
||||
updateTrace( aSignalName, (SIM_TRACE_TYPE) aTraceType, plotPanel );
|
||||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::removeTrace( const wxString& aSignalName, SIM_TRACE_TYPE aTraceType )
|
||||
{
|
||||
if( SIM_PLOT_PANEL* plotPanel = GetCurrentPlot() )
|
||||
{
|
||||
plotPanel->DeleteTrace( getTraceTitle( aSignalName, aTraceType ) );
|
||||
plotPanel->GetPlotWin()->Fit();
|
||||
}
|
||||
|
||||
updateSignalsGrid();
|
||||
updateCursors();
|
||||
OnModify();
|
||||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceType,
|
||||
void SIM_PLOT_FRAME::updateTrace( const wxString& aVectorName, int aTraceType,
|
||||
SIM_PLOT_PANEL* aPlotPanel )
|
||||
{
|
||||
SIM_TYPE simType = NGSPICE_CIRCUIT_MODEL::CommandToSimType( aPlotPanel->GetSimCommand() );
|
||||
|
||||
aTraceType = (SIM_TRACE_TYPE) ( aTraceType & SPT_Y_AXIS_MASK );
|
||||
aTraceType = (SIM_TRACE_TYPE) ( aTraceType | getXAxisType( simType ) );
|
||||
aTraceType &= aTraceType & SPT_Y_AXIS_MASK;
|
||||
aTraceType |= getXAxisType( simType );
|
||||
|
||||
wxString traceTitle = getTraceTitle( aName, aTraceType );
|
||||
wxString vectorName = aName;
|
||||
wxString simVectorName = aVectorName;
|
||||
|
||||
if( aTraceType & SPT_POWER )
|
||||
vectorName = vectorName.AfterFirst( '(' ).BeforeLast( ')' ) + wxS( ":power" );
|
||||
simVectorName = simVectorName.AfterFirst( '(' ).BeforeLast( ')' ) + wxS( ":power" );
|
||||
|
||||
if( !SIM_PANEL_BASE::IsPlottable( simType ) )
|
||||
{
|
||||
// There is no plot to be shown
|
||||
m_simulator->Command( wxString::Format( wxT( "print %s" ), aName ).ToStdString() );
|
||||
m_simulator->Command( wxString::Format( wxT( "print %s" ), aVectorName ).ToStdString() );
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -1728,9 +1726,9 @@ void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceTy
|
|||
{
|
||||
case ST_AC:
|
||||
if( aTraceType & SPT_AC_MAG )
|
||||
data_y = m_simulator->GetMagPlot( (const char*) vectorName.c_str() );
|
||||
data_y = m_simulator->GetMagPlot( (const char*) simVectorName.c_str() );
|
||||
else if( aTraceType & SPT_AC_PHASE )
|
||||
data_y = m_simulator->GetPhasePlot( (const char*) vectorName.c_str() );
|
||||
data_y = m_simulator->GetPhasePlot( (const char*) simVectorName.c_str() );
|
||||
else
|
||||
wxFAIL_MSG( wxT( "Plot type missing AC_PHASE or AC_MAG bit" ) );
|
||||
|
||||
|
|
@ -1739,7 +1737,7 @@ void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceTy
|
|||
case ST_NOISE:
|
||||
case ST_DC:
|
||||
case ST_TRANSIENT:
|
||||
data_y = m_simulator->GetMagPlot( (const char*) vectorName.c_str() );
|
||||
data_y = m_simulator->GetMagPlot( (const char*) simVectorName.c_str() );
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -1759,7 +1757,6 @@ void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceTy
|
|||
{
|
||||
// Source 1 is the inner loop, so lets add traces for each Source 2 (outer loop) step
|
||||
SPICE_VALUE v = source2.m_vstart;
|
||||
wxString name;
|
||||
|
||||
size_t offset = 0;
|
||||
size_t outer = ( size_t )( ( source2.m_vend - v ) / source2.m_vincrement ).ToDouble();
|
||||
|
|
@ -1769,12 +1766,7 @@ void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceTy
|
|||
|
||||
for( size_t idx = 0; idx <= outer; idx++ )
|
||||
{
|
||||
name = wxString::Format( wxT( "%s (%s = %s V)" ),
|
||||
traceTitle,
|
||||
source2.m_source,
|
||||
v.ToString() );
|
||||
|
||||
if( TRACE* trace = aPlotPanel->AddTrace( name, aName, aTraceType ) )
|
||||
if( TRACE* trace = aPlotPanel->AddTrace( aVectorName, aTraceType ) )
|
||||
{
|
||||
if( data_y.size() >= size )
|
||||
{
|
||||
|
|
@ -1791,7 +1783,7 @@ void SIM_PLOT_FRAME::updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceTy
|
|||
offset += inner;
|
||||
}
|
||||
}
|
||||
else if( TRACE* trace = aPlotPanel->AddTrace( traceTitle, aName, aTraceType ) )
|
||||
else if( TRACE* trace = aPlotPanel->AddTrace( aVectorName, aTraceType ) )
|
||||
{
|
||||
if( data_y.size() >= size )
|
||||
aPlotPanel->SetTraceData( trace, size, data_x.data(), data_y.data() );
|
||||
|
|
@ -1805,9 +1797,11 @@ void SIM_PLOT_FRAME::updateSignalsGrid()
|
|||
|
||||
for( int row = 0; row < m_signalsGrid->GetNumberRows(); ++row )
|
||||
{
|
||||
wxString signal = m_signalsGrid->GetCellValue( row, COL_SIGNAL_NAME );
|
||||
wxString signalName = m_signalsGrid->GetCellValue( row, COL_SIGNAL_NAME );
|
||||
int traceType = SPT_UNKNOWN;
|
||||
wxString vectorName = vectorNameFromSignalName( signalName, &traceType );
|
||||
|
||||
if( TRACE* trace = plot ? plot->GetTrace( getTraceName( signal ) ) : nullptr )
|
||||
if( TRACE* trace = plot ? plot->GetTrace( vectorName, traceType ) : nullptr )
|
||||
{
|
||||
m_signalsGrid->SetCellValue( row, COL_SIGNAL_SHOW, wxS( "1" ) );
|
||||
|
||||
|
|
@ -1876,16 +1870,16 @@ void SIM_PLOT_FRAME::applyUserDefinedSignals()
|
|||
return aExpression;
|
||||
};
|
||||
|
||||
for( int ii = 0; ii < (int) m_userDefinedSignals.size(); ++ii )
|
||||
for( const auto& [ id, signal ] : m_userDefinedSignals )
|
||||
{
|
||||
wxString signal = m_userDefinedSignals[ii];
|
||||
std::string cmd = "let user{} = {}";
|
||||
|
||||
m_simulator->Command( "echo " + fmt::format(cmd, ii, signal.ToStdString() ) );
|
||||
m_simulator->Command( fmt::format( cmd, ii, quoteNetNames( signal ).ToStdString() ) );
|
||||
m_simulator->Command( "echo " + fmt::format( cmd, id, signal.ToStdString() ) );
|
||||
m_simulator->Command( fmt::format( cmd, id, quoteNetNames( signal ).ToStdString() ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::applyTuners()
|
||||
{
|
||||
wxString errors;
|
||||
|
|
@ -1923,6 +1917,85 @@ void SIM_PLOT_FRAME::applyTuners()
|
|||
}
|
||||
|
||||
|
||||
void SIM_PLOT_FRAME::parseTraceParams( SIM_PLOT_PANEL* aPlotPanel, TRACE* aTrace,
|
||||
const wxString& aSignalName, const wxString& aParams )
|
||||
{
|
||||
auto addCursor =
|
||||
[&]( int aCursorId, double x )
|
||||
{
|
||||
CURSOR* cursor = new CURSOR( aTrace, aPlotPanel );
|
||||
|
||||
cursor->SetName( aSignalName );
|
||||
cursor->SetPen( wxPen( aTrace->GetTraceColour() ) );
|
||||
cursor->SetCoordX( x );
|
||||
|
||||
aTrace->SetCursor( aCursorId, cursor );
|
||||
aPlotPanel->GetPlotWin()->AddLayer( cursor );
|
||||
};
|
||||
|
||||
wxArrayString items = wxSplit( aParams, '|' );
|
||||
|
||||
for( const wxString& item : items )
|
||||
{
|
||||
if( item.StartsWith( wxS( "rgb" ) ) )
|
||||
{
|
||||
wxColour color;
|
||||
color.Set( item );
|
||||
aTrace->SetTraceColour( color );
|
||||
aPlotPanel->UpdateTraceStyle( aTrace );
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursor1" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
double val;
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
parts[0].AfterFirst( '=' ).ToDouble( &val );
|
||||
m_cursorFormats[0][0].FromString( parts[1] );
|
||||
m_cursorFormats[0][1].FromString( parts[2] );
|
||||
addCursor( 1, val );
|
||||
}
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursor2" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
double val;
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
parts[0].AfterFirst( '=' ).ToDouble( &val );
|
||||
m_cursorFormats[1][0].FromString( parts[1] );
|
||||
m_cursorFormats[1][1].FromString( parts[2] );
|
||||
addCursor( 2, val );
|
||||
}
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursorD" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
m_cursorFormats[2][0].FromString( parts[1] );
|
||||
m_cursorFormats[2][1].FromString( parts[2] );
|
||||
}
|
||||
}
|
||||
else if( item == wxS( "dottedSecondary" ) )
|
||||
{
|
||||
aPlotPanel->SetDottedSecondary( true );
|
||||
}
|
||||
else if( item == wxS( "showLegend" ) )
|
||||
{
|
||||
aPlotPanel->ShowLegend( true );
|
||||
}
|
||||
else if( item == wxS( "hideGrid" ) )
|
||||
{
|
||||
aPlotPanel->ShowGrid( false );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
||||
{
|
||||
m_plotNotebook->DeleteAllPages();
|
||||
|
|
@ -1966,6 +2039,8 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
return false;
|
||||
}
|
||||
|
||||
std::map<SIM_PLOT_PANEL*, std::vector<std::tuple<long, wxString, wxString>>> traceInfo;
|
||||
|
||||
for( long i = 0; i < plotsCount; ++i )
|
||||
{
|
||||
long plotType, tracesCount;
|
||||
|
|
@ -2010,7 +2085,8 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
simCommand += line + wxT( "\n" );
|
||||
}
|
||||
|
||||
NewPlotPanel( simCommand, simOptions );
|
||||
SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( NewPlotPanel( simCommand,
|
||||
simOptions ) );
|
||||
|
||||
if( !file.GetNextLine().ToLong( &tracesCount ) )
|
||||
{
|
||||
|
|
@ -2020,6 +2096,9 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
return false;
|
||||
}
|
||||
|
||||
if( plotPanel )
|
||||
traceInfo[ plotPanel ] = {};
|
||||
|
||||
for( long j = 0; j < tracesCount; ++j )
|
||||
{
|
||||
long traceType;
|
||||
|
|
@ -2043,100 +2122,10 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
return false;
|
||||
}
|
||||
|
||||
wxString baseName = name;
|
||||
wxString gainSuffix = _( " (gain)" );
|
||||
wxString phaseSuffix = _( " (phase)" );
|
||||
|
||||
if( baseName.EndsWith( gainSuffix ) )
|
||||
baseName = baseName.Left( baseName.Length() - gainSuffix.Length() );
|
||||
else if( baseName.EndsWith( phaseSuffix ) )
|
||||
baseName = baseName.Left( baseName.Length() - phaseSuffix.Length() );
|
||||
|
||||
addTrace( baseName, (SIM_TRACE_TYPE) traceType );
|
||||
|
||||
param = file.GetNextLine();
|
||||
|
||||
SIM_PLOT_PANEL* plotPanel = GetCurrentPlot();
|
||||
TRACE* trace = plotPanel ? plotPanel->GetTrace( name ) : nullptr;
|
||||
|
||||
if( version >= 4 && trace )
|
||||
{
|
||||
auto addCursor =
|
||||
[&]( int aCursorId, TRACE* aTrace, double x )
|
||||
{
|
||||
CURSOR* cursor = new CURSOR( aTrace, plotPanel );
|
||||
|
||||
cursor->SetName( name );
|
||||
cursor->SetPen( wxPen( aTrace->GetTraceColour() ) );
|
||||
cursor->SetCoordX( x );
|
||||
|
||||
aTrace->SetCursor( aCursorId, cursor );
|
||||
plotPanel->GetPlotWin()->AddLayer( cursor );
|
||||
};
|
||||
|
||||
wxArrayString items = wxSplit( param, '|' );
|
||||
|
||||
for( const wxString& item : items )
|
||||
{
|
||||
if( item.StartsWith( wxS( "rgb" ) ) )
|
||||
{
|
||||
wxColour color;
|
||||
color.Set( item );
|
||||
trace->SetTraceColour( color );
|
||||
plotPanel->UpdateTraceStyle( trace );
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursor1" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
double val;
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
parts[0].AfterFirst( '=' ).ToDouble( &val );
|
||||
m_cursorFormats[0][0].FromString( parts[1] );
|
||||
m_cursorFormats[0][1].FromString( parts[2] );
|
||||
addCursor( 1, trace, val );
|
||||
}
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursor2" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
double val;
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
parts[0].AfterFirst( '=' ).ToDouble( &val );
|
||||
m_cursorFormats[1][0].FromString( parts[1] );
|
||||
m_cursorFormats[1][1].FromString( parts[2] );
|
||||
addCursor( 2, trace, val );
|
||||
}
|
||||
}
|
||||
else if( item.StartsWith( wxS( "cursorD" ) ) )
|
||||
{
|
||||
wxArrayString parts = wxSplit( item, ':' );
|
||||
|
||||
if( parts.size() == 3 )
|
||||
{
|
||||
m_cursorFormats[2][0].FromString( parts[1] );
|
||||
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();
|
||||
}
|
||||
if( plotPanel )
|
||||
traceInfo[ plotPanel ].emplace_back( std::make_tuple( traceType, name, param ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2145,8 +2134,8 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
|
||||
if( file.GetNextLine().ToLong( &userDefinedSignalCount ) )
|
||||
{
|
||||
for( long i = 0; i < userDefinedSignalCount; ++i )
|
||||
m_userDefinedSignals.push_back( file.GetNextLine() );
|
||||
for( int ii = 0; ii < (int) userDefinedSignalCount; ++ii )
|
||||
m_userDefinedSignals[ ii ] = file.GetNextLine();
|
||||
|
||||
file.GetNextLine().ToLong( &measurementCount );
|
||||
|
||||
|
|
@ -2160,31 +2149,24 @@ bool SIM_PLOT_FRAME::LoadWorkbook( const wxString& aPath )
|
|||
}
|
||||
}
|
||||
|
||||
for( const auto& [ plotPanel, traceInfoVector ] : traceInfo )
|
||||
{
|
||||
for( const auto& [ traceType, signalName, param ] : traceInfoVector )
|
||||
{
|
||||
wxString vectorName = vectorNameFromSignalName( signalName, nullptr );
|
||||
TRACE* trace = plotPanel->AddTrace( vectorName, (int) traceType );
|
||||
|
||||
if( version >= 4 && trace )
|
||||
parseTraceParams( plotPanel, trace, signalName, param );
|
||||
}
|
||||
|
||||
plotPanel->UpdatePlotColors();
|
||||
}
|
||||
|
||||
LoadSimulator();
|
||||
|
||||
rebuildSignalsList();
|
||||
|
||||
if( SIM_PLOT_PANEL* plotPanel = GetCurrentPlot() )
|
||||
{
|
||||
for( const auto& [ traceName, trace ] : plotPanel->GetTraces() )
|
||||
{
|
||||
for( int cursorId : { 1, 2 } )
|
||||
{
|
||||
if( CURSOR* cursor = trace->GetCursor( cursorId ) )
|
||||
{
|
||||
for( const auto& [ signalName, vecName ] : m_userDefinedSignalToSpiceVecName )
|
||||
{
|
||||
if( vecName == traceName )
|
||||
{
|
||||
cursor->SetName( signalName );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rebuildSignalsGrid( m_filter->GetValue() );
|
||||
updateSignalsGrid();
|
||||
updateCursors();
|
||||
|
|
@ -2272,10 +2254,22 @@ bool SIM_PLOT_FRAME::SaveWorkbook( const wxString& aPath )
|
|||
|
||||
file.AddLine( wxString::Format( wxT( "%llu" ), plotPanel->GetTraces().size() ) );
|
||||
|
||||
auto findSignalName =
|
||||
[&]( const wxString& aVectorName ) -> wxString
|
||||
{
|
||||
for( const auto& [ id, signal ] : m_userDefinedSignals )
|
||||
{
|
||||
if( aVectorName == vectorNameFromSignalId( id ) )
|
||||
return signal;
|
||||
}
|
||||
|
||||
return aVectorName;
|
||||
};
|
||||
|
||||
for( const auto& [name, trace] : plotPanel->GetTraces() )
|
||||
{
|
||||
file.AddLine( wxString::Format( wxT( "%d" ), trace->GetType() ) );
|
||||
file.AddLine( getTraceTitle( trace->GetName(), trace->GetType() ) );
|
||||
file.AddLine( findSignalName( trace->GetName() ) );
|
||||
|
||||
wxString msg = COLOR4D( trace->GetTraceColour() ).ToCSSString();
|
||||
|
||||
|
|
@ -2317,7 +2311,7 @@ bool SIM_PLOT_FRAME::SaveWorkbook( const wxString& aPath )
|
|||
|
||||
file.AddLine( wxString::Format( wxT( "%llu" ), m_userDefinedSignals.size() ) );
|
||||
|
||||
for( const wxString& signal : m_userDefinedSignals )
|
||||
for( const auto& [ id, signal ] : m_userDefinedSignals )
|
||||
file.AddLine( signal );
|
||||
|
||||
std::vector<wxString> measurements;
|
||||
|
|
@ -2817,6 +2811,8 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
|
|||
|
||||
m_simFinished = true;
|
||||
|
||||
std::vector<wxString> oldSignals = m_signals;
|
||||
|
||||
applyUserDefinedSignals();
|
||||
rebuildSignalsList();
|
||||
|
||||
|
|
@ -2829,44 +2825,44 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
|
|||
SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( plotPanelWindow );
|
||||
wxCHECK_RET( plotPanel, wxT( "not a SIM_PLOT_PANEL" ) );
|
||||
|
||||
struct TRACE_DESC
|
||||
// Map of TRACE* to { vectorName, traceType }
|
||||
std::map<TRACE*, std::pair<wxString, int>> traceMap;
|
||||
|
||||
for( const auto& [ name, trace ] : plotPanel->GetTraces() )
|
||||
traceMap[ trace ] = { wxEmptyString, SPT_UNKNOWN };
|
||||
|
||||
for( const wxString& signal : m_signals )
|
||||
{
|
||||
wxString m_name; ///< Name of the measured SPICE vector
|
||||
wxString m_title; ///< User-friendly signal name
|
||||
SIM_TRACE_TYPE m_type; ///< Type of the signal
|
||||
bool m_current;
|
||||
};
|
||||
int traceType = SPT_UNKNOWN;
|
||||
wxString vectorName = vectorNameFromSignalName( signal, &traceType );
|
||||
|
||||
std::vector<struct TRACE_DESC> placeholders;
|
||||
|
||||
// Get information about all the traces on the plot; update those that are still in
|
||||
// the signals list and remove any that aren't
|
||||
for( const auto& [name, trace] : plotPanel->GetTraces() )
|
||||
{
|
||||
struct TRACE_DESC placeholder;
|
||||
placeholder.m_name = trace->GetName();
|
||||
placeholder.m_title = getTraceTitle( trace->GetName(), trace->GetType() );
|
||||
placeholder.m_type = trace->GetType();
|
||||
placeholder.m_current = false;
|
||||
|
||||
for( const wxString& signal : m_signals )
|
||||
if( simType == ST_AC )
|
||||
{
|
||||
if( getTraceName( signal ) == placeholder.m_title )
|
||||
for( int subType : { SPT_AC_MAG, SPT_AC_PHASE } )
|
||||
{
|
||||
placeholder.m_current = true;
|
||||
break;
|
||||
if( TRACE* trace = plotPanel->GetTrace( vectorName, traceType | subType ) )
|
||||
traceMap[ trace ] = { vectorName, traceType };
|
||||
}
|
||||
}
|
||||
|
||||
placeholders.push_back( placeholder );
|
||||
else
|
||||
{
|
||||
if( TRACE* trace = plotPanel->GetTrace( vectorName, traceType ) )
|
||||
traceMap[ trace ] = { vectorName, traceType };
|
||||
}
|
||||
}
|
||||
|
||||
for( const struct TRACE_DESC& placeholder : placeholders )
|
||||
// Two passes so that DC-sweep sub-traces get deleted and re-created:
|
||||
|
||||
for( const auto& [ trace, traceInfo ] : traceMap )
|
||||
{
|
||||
if( placeholder.m_current )
|
||||
updateTrace( placeholder.m_name, placeholder.m_type, plotPanel );
|
||||
else
|
||||
removeTrace( placeholder.m_name, placeholder.m_type );
|
||||
if( traceInfo.first.IsEmpty() )
|
||||
plotPanel->DeleteTrace( trace );
|
||||
}
|
||||
|
||||
for( const auto& [ trace, traceInfo ] : traceMap )
|
||||
{
|
||||
if( !traceInfo.first.IsEmpty() )
|
||||
updateTrace( traceInfo.first, traceInfo.second, plotPanel );
|
||||
}
|
||||
|
||||
rebuildSignalsGrid( m_filter->GetValue() );
|
||||
|
|
@ -2874,6 +2870,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
|
|||
|
||||
plotPanel->GetPlotWin()->UpdateAll();
|
||||
plotPanel->ResetScales();
|
||||
plotPanel->GetPlotWin()->Fit();
|
||||
}
|
||||
else if( simType == ST_OP )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -87,8 +87,8 @@ public:
|
|||
|
||||
const std::vector<wxString>& Signals() { return m_signals; }
|
||||
|
||||
const std::vector<wxString>& UserDefinedSignals() { return m_userDefinedSignals; }
|
||||
void SetUserDefinedSignals( const std::vector<wxString>& aSignals );
|
||||
const std::map<int, wxString>& UserDefinedSignals() { return m_userDefinedSignals; }
|
||||
void SetUserDefinedSignals( const std::map<int, wxString>& aSignals );
|
||||
|
||||
/**
|
||||
* Add a voltage plot for a given net name.
|
||||
|
|
@ -262,35 +262,20 @@ private:
|
|||
*/
|
||||
void doAddPlot( const wxString& aName, SIM_TRACE_TYPE aType );
|
||||
|
||||
void addTrace( const wxString& aSignalName, SIM_TRACE_TYPE aType );
|
||||
|
||||
/**
|
||||
* For user-defined traces we have a separate SPICE vector name.
|
||||
* Get the simulator output vector name for a given signal name and type.
|
||||
*/
|
||||
wxString getTraceName( const wxString& aSignalName );
|
||||
|
||||
/**
|
||||
* AC-small-signal analyses have specific trace titles. Other analyses use the raw signal
|
||||
* names.
|
||||
*/
|
||||
wxString getTraceTitle( const wxString& aSignalName, SIM_TRACE_TYPE aTraceType );
|
||||
|
||||
/**
|
||||
* Remove a plot with a specific title.
|
||||
*
|
||||
* @param aName is the SPICE vector name, such as "I(Net-C1-Pad1)".
|
||||
*/
|
||||
void removeTrace( const wxString& aName, SIM_TRACE_TYPE aTraceType );
|
||||
wxString vectorNameFromSignalName( const wxString& aSignalName, int* aTraceType );
|
||||
|
||||
/**
|
||||
* Update a trace in a particular SIM_PLOT_PANEL. If the panel does not contain the given
|
||||
* trace, then add it.
|
||||
*
|
||||
* @param aName is the SPICE vector name, such as "I(Net-C1-Pad1)".
|
||||
* @param aVectorName is the SPICE vector name, such as "I(Net-C1-Pad1)".
|
||||
* @param aTraceType describes the type of plot.
|
||||
* @param aPlotPanel is the panel that should receive the update.
|
||||
*/
|
||||
void updateTrace( const wxString& aName, SIM_TRACE_TYPE aTraceType, SIM_PLOT_PANEL* aPlotPanel );
|
||||
void updateTrace( const wxString& aVectorName, int aTraceType, SIM_PLOT_PANEL* aPlotPanel );
|
||||
|
||||
/**
|
||||
* Rebuild the list of signals available from the netlist.
|
||||
|
|
@ -337,6 +322,9 @@ private:
|
|||
*/
|
||||
SIM_TRACE_TYPE getXAxisType( SIM_TYPE aType ) const;
|
||||
|
||||
void parseTraceParams( SIM_PLOT_PANEL* aPlotPanel, TRACE* aTrace, const wxString& aSignalName,
|
||||
const wxString& aParams );
|
||||
|
||||
// Event handlers
|
||||
void onPlotClose( wxAuiNotebookEvent& event ) override;
|
||||
void onPlotClosed( wxAuiNotebookEvent& event ) override;
|
||||
|
|
@ -379,8 +367,7 @@ private:
|
|||
SIM_THREAD_REPORTER* m_reporter;
|
||||
|
||||
std::vector<wxString> m_signals;
|
||||
std::vector<wxString> m_userDefinedSignals;
|
||||
std::map<wxString, wxString> m_userDefinedSignalToSpiceVecName;
|
||||
std::map<int, wxString> m_userDefinedSignals;
|
||||
std::list<TUNER_SLIDER*> m_tuners;
|
||||
|
||||
///< SPICE expressions need quoted versions of the netnames since KiCad allows '-' and '/'
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "sim_plot_colors.h"
|
||||
#include "sim_plot_panel.h"
|
||||
#include "sim_plot_frame.h"
|
||||
#include "core/kicad_algo.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <limits>
|
||||
|
|
@ -461,7 +462,7 @@ wxString SIM_PLOT_PANEL::GetUnitsY3() const
|
|||
}
|
||||
|
||||
|
||||
void SIM_PLOT_PANEL::updateAxes( SIM_TRACE_TYPE aNewTraceType )
|
||||
void SIM_PLOT_PANEL::updateAxes( int aNewTraceType )
|
||||
{
|
||||
switch( GetType() )
|
||||
{
|
||||
|
|
@ -549,7 +550,7 @@ void SIM_PLOT_PANEL::updateAxes( SIM_TRACE_TYPE aNewTraceType )
|
|||
}
|
||||
}
|
||||
|
||||
void SIM_PLOT_PANEL::prepareDCAxes( SIM_TRACE_TYPE aNewTraceType )
|
||||
void SIM_PLOT_PANEL::prepareDCAxes( int aNewTraceType )
|
||||
{
|
||||
wxString sim_cmd = GetSimCommand().Lower();
|
||||
wxString rem;
|
||||
|
|
@ -689,48 +690,45 @@ void SIM_PLOT_PANEL::UpdateTraceStyle( TRACE* trace )
|
|||
}
|
||||
|
||||
|
||||
TRACE* SIM_PLOT_PANEL::AddTrace( const wxString& aTitle, const wxString& aName,
|
||||
SIM_TRACE_TYPE aType )
|
||||
TRACE* SIM_PLOT_PANEL::AddTrace( const wxString& aVecName, int aType )
|
||||
{
|
||||
TRACE* trace = nullptr;
|
||||
TRACE* trace = GetTrace( aVecName, aType );
|
||||
|
||||
auto it = m_traces.find( aTitle );
|
||||
|
||||
if( it != m_traces.end() )
|
||||
return it->second;
|
||||
|
||||
updateAxes( aType );
|
||||
|
||||
if( GetType() == ST_TRANSIENT || GetType() == ST_DC )
|
||||
if( !trace )
|
||||
{
|
||||
bool hasVoltageTraces = false;
|
||||
updateAxes( aType );
|
||||
|
||||
for( const auto& [ name, candidate ] : m_traces )
|
||||
if( GetType() == ST_TRANSIENT || GetType() == ST_DC )
|
||||
{
|
||||
if( candidate->GetType() & SPT_VOLTAGE )
|
||||
bool hasVoltageTraces = false;
|
||||
|
||||
for( const auto& [ id, candidate ] : m_traces )
|
||||
{
|
||||
hasVoltageTraces = true;
|
||||
break;
|
||||
if( candidate->GetType() & SPT_VOLTAGE )
|
||||
{
|
||||
hasVoltageTraces = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( !hasVoltageTraces )
|
||||
{
|
||||
if( m_axis_y2 )
|
||||
m_axis_y2->SetMasterScale( nullptr );
|
||||
|
||||
if( m_axis_y3 )
|
||||
m_axis_y3->SetMasterScale( nullptr );
|
||||
}
|
||||
}
|
||||
|
||||
if( !hasVoltageTraces )
|
||||
{
|
||||
if( m_axis_y2 )
|
||||
m_axis_y2->SetMasterScale( nullptr );
|
||||
trace = new TRACE( aVecName, (SIM_TRACE_TYPE) aType );
|
||||
trace->SetTraceColour( m_colors.GenerateColor( m_traces ) );
|
||||
UpdateTraceStyle( trace );
|
||||
m_traces[ getTraceId( aVecName, aType ) ] = trace;
|
||||
|
||||
if( m_axis_y3 )
|
||||
m_axis_y3->SetMasterScale( nullptr );
|
||||
}
|
||||
m_plotWin->AddLayer( (mpLayer*) trace );
|
||||
}
|
||||
|
||||
trace = new TRACE( aName, aType );
|
||||
trace->SetTraceColour( m_colors.GenerateColor( m_traces ) );
|
||||
UpdateTraceStyle( trace );
|
||||
m_traces[ aTitle ] = trace;
|
||||
|
||||
m_plotWin->AddLayer( (mpLayer*) trace );
|
||||
|
||||
return trace;
|
||||
}
|
||||
|
||||
|
|
@ -777,24 +775,33 @@ void SIM_PLOT_PANEL::SetTraceData( TRACE* trace, unsigned int aPoints, const dou
|
|||
}
|
||||
|
||||
|
||||
bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
|
||||
void SIM_PLOT_PANEL::DeleteTrace( TRACE* aTrace )
|
||||
{
|
||||
auto it = m_traces.find( aName );
|
||||
|
||||
if( it != m_traces.end() )
|
||||
for( const auto& [ name, trace ] : m_traces )
|
||||
{
|
||||
TRACE* trace = it->second;
|
||||
m_traces.erase( it );
|
||||
|
||||
for( const auto& [ id, cursor ] : trace->GetCursors() )
|
||||
if( trace == aTrace )
|
||||
{
|
||||
if( cursor )
|
||||
m_plotWin->DelLayer( cursor, true );
|
||||
m_traces.erase( name );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
m_plotWin->DelLayer( trace, true, true );
|
||||
ResetScales();
|
||||
for( const auto& [ id, cursor ] : aTrace->GetCursors() )
|
||||
{
|
||||
if( cursor )
|
||||
m_plotWin->DelLayer( cursor, true );
|
||||
}
|
||||
|
||||
m_plotWin->DelLayer( aTrace, true, true );
|
||||
ResetScales();
|
||||
}
|
||||
|
||||
|
||||
bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aVectorName, int aTraceType )
|
||||
{
|
||||
if( TRACE* trace = GetTrace( aVectorName, aTraceType ) )
|
||||
{
|
||||
DeleteTrace( trace );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -802,10 +809,10 @@ bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
|
|||
}
|
||||
|
||||
|
||||
void SIM_PLOT_PANEL::EnableCursor( const wxString& aSignalName, const wxString aTraceName,
|
||||
int aCursorId, bool aEnable )
|
||||
void SIM_PLOT_PANEL::EnableCursor( const wxString& aVectorName, int aType, int aCursorId,
|
||||
bool aEnable, const wxString& aSignalName )
|
||||
{
|
||||
TRACE* t = GetTrace( aTraceName );
|
||||
TRACE* t = GetTrace( aVectorName, aType );
|
||||
|
||||
if( t == nullptr || t->HasCursor( aCursorId ) == aEnable )
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -114,6 +114,17 @@ public:
|
|||
ShowName( false );
|
||||
}
|
||||
|
||||
void SetName( wxString aName ) override
|
||||
{
|
||||
for( auto& [ idx, cursor ] : m_cursors )
|
||||
{
|
||||
if( cursor )
|
||||
cursor->SetName( aName );
|
||||
}
|
||||
|
||||
mpFXYVector::SetName( aName );
|
||||
}
|
||||
|
||||
/**
|
||||
* Assigns new data set for the trace. aX and aY need to have the same length.
|
||||
*
|
||||
|
|
@ -131,50 +142,19 @@ public:
|
|||
mpFXYVector::SetData( aX, aY );
|
||||
}
|
||||
|
||||
const std::vector<double>& GetDataX() const
|
||||
{
|
||||
return m_xs;
|
||||
}
|
||||
const std::vector<double>& GetDataX() const { return m_xs; }
|
||||
const std::vector<double>& GetDataY() const { return m_ys; }
|
||||
|
||||
const std::vector<double>& GetDataY() const
|
||||
{
|
||||
return m_ys;
|
||||
}
|
||||
bool HasCursor( int aCursorId ) { return m_cursors[ aCursorId ] != nullptr; }
|
||||
|
||||
bool HasCursor( int aCursorId )
|
||||
{
|
||||
return m_cursors[ aCursorId ] != nullptr;
|
||||
}
|
||||
void SetCursor( int aCursorId, CURSOR* aCursor ) { m_cursors[ aCursorId ] = aCursor; }
|
||||
CURSOR* GetCursor( int aCursorId ) { return m_cursors[ aCursorId ]; }
|
||||
std::map<int, CURSOR*>& GetCursors() { return m_cursors; }
|
||||
|
||||
void SetCursor( int aCursorId, CURSOR* aCursor )
|
||||
{
|
||||
m_cursors[ aCursorId ] = aCursor;
|
||||
}
|
||||
SIM_TRACE_TYPE GetType() const { return m_type; }
|
||||
|
||||
CURSOR* GetCursor( int aCursorId )
|
||||
{
|
||||
return m_cursors[ aCursorId ];
|
||||
}
|
||||
|
||||
std::map<int, CURSOR*>& GetCursors()
|
||||
{
|
||||
return m_cursors;
|
||||
}
|
||||
|
||||
SIM_TRACE_TYPE GetType() const
|
||||
{
|
||||
return m_type;
|
||||
}
|
||||
|
||||
void SetTraceColour( const wxColour& aColour )
|
||||
{
|
||||
m_traceColour = aColour;
|
||||
}
|
||||
|
||||
wxColour GetTraceColour() const
|
||||
{
|
||||
return m_traceColour;
|
||||
}
|
||||
void SetTraceColour( const wxColour& aColour ) { m_traceColour = aColour; }
|
||||
wxColour GetTraceColour() const { return m_traceColour; }
|
||||
|
||||
protected:
|
||||
std::map<int, CURSOR*> m_cursors; // No ownership; the mpWindow owns the CURSORs
|
||||
|
|
@ -217,19 +197,14 @@ public:
|
|||
wxString GetUnitsY2() const;
|
||||
wxString GetUnitsY3() const;
|
||||
|
||||
bool TraceShown( const wxString& aName ) const
|
||||
{
|
||||
return m_traces.count( aName ) > 0;
|
||||
}
|
||||
|
||||
const std::map<wxString, TRACE*>& GetTraces() const
|
||||
{
|
||||
return m_traces;
|
||||
}
|
||||
|
||||
TRACE* GetTrace( const wxString& aName ) const
|
||||
TRACE* GetTrace( const wxString& aVecName, int aType ) const
|
||||
{
|
||||
auto trace = m_traces.find( aName );
|
||||
auto trace = m_traces.find( getTraceId( aVecName, aType ) );
|
||||
|
||||
return trace == m_traces.end() ? nullptr : trace->second;
|
||||
}
|
||||
|
|
@ -282,7 +257,8 @@ public:
|
|||
}
|
||||
|
||||
///< Toggle cursor for a particular trace.
|
||||
void EnableCursor( const wxString& aSignalName, const wxString aTraceName, int aCursorId, bool aEnable );
|
||||
void EnableCursor( const wxString& aVectorName, int aType, int aCursorId, bool aEnable,
|
||||
const wxString& aSignalName );
|
||||
|
||||
///< Reset scale ranges to fit the current traces.
|
||||
void ResetScales();
|
||||
|
|
@ -301,18 +277,24 @@ public:
|
|||
return m_plotWin;
|
||||
}
|
||||
|
||||
TRACE* AddTrace( const wxString& aTitle, const wxString& aName, SIM_TRACE_TYPE aType );
|
||||
TRACE* AddTrace( const wxString& aVecName, int aType );
|
||||
|
||||
void SetTraceData( TRACE* aTrace, unsigned int aPoints, const double* aX, const double* aY );
|
||||
|
||||
bool DeleteTrace( const wxString& aName );
|
||||
bool DeleteTrace( const wxString& aVectorName, int aTraceType );
|
||||
void DeleteTrace( TRACE* aTrace );
|
||||
|
||||
private:
|
||||
wxString getTraceId( const wxString& aVecName, int aType ) const
|
||||
{
|
||||
return wxString::Format( wxS( "%s%d" ), aVecName, aType & SPT_Y_AXIS_MASK );
|
||||
}
|
||||
|
||||
///< @brief Construct the plot axes for DC simulation plot.
|
||||
void prepareDCAxes( SIM_TRACE_TYPE aNewTraceType );
|
||||
void prepareDCAxes( int aNewTraceType );
|
||||
|
||||
///> Create/Ensure axes are available for plotting
|
||||
void updateAxes( SIM_TRACE_TYPE aNewTraceType = SIM_TRACE_TYPE::SPT_UNKNOWN );
|
||||
void updateAxes( int aNewTraceType = SIM_TRACE_TYPE::SPT_UNKNOWN );
|
||||
|
||||
private:
|
||||
SIM_PLOT_COLORS m_colors;
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ public:
|
|||
|
||||
int SIMULATOR_CONTROL::EditUserDefinedSignals( const TOOL_EVENT& aEvent )
|
||||
{
|
||||
std::vector<wxString> userSignals = m_plotFrame->UserDefinedSignals();
|
||||
std::map<int, wxString> userSignals = m_plotFrame->UserDefinedSignals();
|
||||
|
||||
DIALOG_USER_DEFINED_SIGNALS dlg( m_plotFrame, &userSignals );
|
||||
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ public:
|
|||
/** Set layer name
|
||||
* @param name Name, will be copied to internal class member
|
||||
*/
|
||||
void SetName( wxString name ) { m_name = name; }
|
||||
virtual void SetName( wxString name ) { m_name = name; }
|
||||
|
||||
/** Set layer font
|
||||
* @param font Font, will be copied to internal class member
|
||||
|
|
|
|||
Loading…
Reference in New Issue