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

Fix transient SPICE source field check logic 

Fixes: lp:1743486
https://bugs.launchpad.net/kicad/+bug/1743486
This commit is contained in:
Dan Weatherill 2018-01-16 20:45:16 +00:00 committed by Maciej Suminski
parent c1649b1138
commit 590cac9d55
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eeschema/dialogs/dialog_spice_model.cpp
View File

@ -535,43 +535,41 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
if( genericProcessing )
{
bool finished = false;
unsigned int paramCounter = 0;
trans += "(";
for( auto textCtrl : genericControls )
{
if( empty( textCtrl ) )
{
finished = true;
auto isempty = [] ( wxTextCtrl* ctrl ) {
return empty( ctrl );
};
if( paramCounter < genericReqParamsCount )
auto first_empty = std::find_if( genericControls.begin(), genericControls.end(), isempty );
if( std::distance( first_empty, genericControls.end() ) == 0 )
{
if( paramCounter == 0 )
{
// It is fine, no parameters were entered
// all empty
useTrans = false;
break;
}
DisplayError( NULL,
else if( std::distance( genericControls.begin(), first_empty ) < genericReqParamsCount )
{
DisplayError( nullptr,
wxString::Format( wxT( "You need to specify at least the "
"first %d parameters for the transient source" ),
genericReqParamsCount ) );
return false;
}
}
else if( finished )
else if( std::find_if_not( first_empty, genericControls.end(),
isempty ) != genericControls.end() )
{
DisplayError( NULL, wxT( "You cannot leave interleaved blank "
DisplayError( nullptr, wxT( "You cannot leave interleaved blank "
"spaces for the transient source" ) );
return false;
}
trans += wxString::Format( "%s ", textCtrl->GetValue() );
++paramCounter;
else
{
std::for_each( genericControls.begin(), first_empty,
[&trans] ( wxTextCtrl* ctrl ) {
trans += wxString::Format( "%s ", ctrl->GetValue() );
} );
}
trans.Trim();