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

Fix ambiguous cast compiler errors on MSVC

This commit is contained in:
Marek Roszko 2023-10-12 19:07:12 -04:00
parent 5a8f38952b
commit 0fe2e06949
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sim/simulator_frame_ui.cpp
View File

@ -1933,7 +1933,7 @@ bool SIMULATOR_FRAME_UI::loadJsonWorkbook( const wxString& aPath )
else if( cmd == ".probe allp" ) else if( cmd == ".probe allp" )
simOptions |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_DISSIPATIONS; simOptions |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_DISSIPATIONS;
else else
simCommand += wxString( cmd ).Trim(); simCommand += wxString( cmd.get<wxString>() ).Trim();
} }
SIM_TAB* simTab = NewSimTab( simCommand ); SIM_TAB* simTab = NewSimTab( simCommand );
@ -1999,7 +1999,7 @@ bool SIMULATOR_FRAME_UI::loadJsonWorkbook( const wxString& aPath )
if( js.contains( "user_defined_signals" ) ) if( js.contains( "user_defined_signals" ) )
{ {
for( const nlohmann::json& signal_js : js[ "user_defined_signals" ] ) for( const nlohmann::json& signal_js : js[ "user_defined_signals" ] )
m_userDefinedSignals[ii++] = wxString( signal_js ); m_userDefinedSignals[ii++] = wxString( signal_js.get<wxString>() );
} }
auto addCursor = auto addCursor =
@ -2044,7 +2044,7 @@ bool SIMULATOR_FRAME_UI::loadJsonWorkbook( const wxString& aPath )
if( trace_js.contains( "color" ) ) if( trace_js.contains( "color" ) )
{ {
wxColour color; wxColour color;
color.Set( wxString( trace_js[ "color" ] ) ); color.Set( wxString( trace_js["color"].get<wxString>() ) );
trace->SetTraceColour( color ); trace->SetTraceColour( color );
plotTab->UpdateTraceStyle( trace ); plotTab->UpdateTraceStyle( trace );
} }