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

Fix merge error.

This commit is contained in:
Jeff Young 2023-07-04 18:53:15 +01:00
parent 886a7c2c04
commit e494017b54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sim/simulator_panel.cpp
View File

@ -1449,7 +1449,7 @@ void SIMULATOR_PANEL::SetUserDefinedSignals( const std::map<int, wxString>& aNew
for( int subType : { SPT_AC_MAG, SPT_AC_PHASE } ) for( int subType : { SPT_AC_MAG, SPT_AC_PHASE } )
plotPanel->DeleteTrace( vectorName, traceType | subType ); plotPanel->DeleteTrace( vectorName, traceType | subType );
} }
else if( plotPanel->GetType() == ST_S_PARAM ) else if( plotPanel->GetSimType() == ST_S_PARAM )
{ {
for( int subType : { SPT_SP_AMP, SPT_AC_PHASE } ) for( int subType : { SPT_SP_AMP, SPT_AC_PHASE } )
plotPanel->DeleteTrace( vectorName, traceType | subType ); plotPanel->DeleteTrace( vectorName, traceType | subType );
@ -1469,7 +1469,7 @@ void SIMULATOR_PANEL::SetUserDefinedSignals( const std::map<int, wxString>& aNew
trace->SetName( aNewSignals.at( id ) ); trace->SetName( aNewSignals.at( id ) );
} }
} }
else if( plotPanel->GetType() == ST_S_PARAM ) else if( plotPanel->GetSimType() == ST_S_PARAM )
{ {
for( int subType : { SPT_SP_AMP, SPT_AC_PHASE } ) for( int subType : { SPT_SP_AMP, SPT_AC_PHASE } )
{ {