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

Better fix for primary param in value field with other params in params field. 

(Replaces 2c8178829982c6e15e443b5a7868b8c953d5126f.)
This commit is contained in:
Jeff Young 2023-08-30 00:52:43 +01:00
parent f8dac43325
commit 30a6d33177
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -157,26 +157,40 @@ bool DIALOG_SIM_MODEL<T_symbol, T_field>::TransferDataToWindow()
wxString msg;
WX_STRING_REPORTER reporter( &msg );
auto setFieldValue =
[&]( const wxString& aFieldName, const wxString& aValue )
{
for( T_field& field : m_fields )
{
if( field.GetName() == aFieldName )
{
field.SetText( aValue );
return;
}
}
m_fields.emplace_back( &m_symbol, -1, aFieldName );
m_fields.back().SetText( aValue );
};
// Infer RLC and VI models if they aren't specified
if( SIM_MODEL::InferSimModel( m_symbol, &m_fields, false, SIM_VALUE_GRAMMAR::NOTATION::SI,
&deviceType, &modelType, &modelParams, &pinMap ) )
{
m_fields.emplace_back( &m_symbol, -1, SIM_DEVICE_TYPE_FIELD );
m_fields.back().SetText( deviceType );
setFieldValue( SIM_DEVICE_TYPE_FIELD, deviceType );
if( !modelType.IsEmpty() )
{
m_fields.emplace_back( &m_symbol, -1, SIM_TYPE_FIELD );
m_fields.back().SetText( modelType );
}
setFieldValue( SIM_TYPE_FIELD, modelType );
m_fields.emplace_back( &m_symbol, -1, SIM_PARAMS_FIELD );
m_fields.back().SetText( modelParams );
setFieldValue( SIM_PARAMS_FIELD, modelParams );
m_fields.emplace_back( &m_symbol, -1, SIM_PINS_FIELD );
m_fields.back().SetText( pinMap );
setFieldValue( SIM_PINS_FIELD, pinMap );
storeInValue = true;
// In case the storeInValue checkbox is turned off (if it's left on then we'll overwrite
// this field with the actual value):
m_fields[ VALUE_FIELD ].SetText( wxT( "${SIM.PARAMS}" ) );
}
std::string libraryFilename = SIM_MODEL::GetFieldValue( &m_fields, SIM_LIBRARY::LIBRARY_FIELD );
@ -302,14 +316,8 @@ bool DIALOG_SIM_MODEL<T_symbol, T_field>::TransferDataToWindow()
}
if( storeInValue )
{
curModel().SetIsStoredInValue( true );
// In case the storeInValue checkbox is turned off (if it's left on then we'll overwrite
// this field with the actual value):
m_fields[ VALUE_FIELD ].SetText( wxT( "${SIM.PARAMS}" ) );
}
m_saveInValueCheckbox->SetValue( curModel().IsStoredInValue() );
onRadioButton( dummyEvent );

17
eeschema/sim/sim_model.cpp
View File

@ -1385,7 +1385,7 @@ bool SIM_MODEL::InferSimModel( T_symbol& aSymbol, std::vector<T_field>* aFields,
&& !value.IsEmpty()
&& ( prefix.StartsWith( "V" ) || prefix.StartsWith( "I" ) ) ) )
{
if( aModelParams->IsEmpty() && !value.IsEmpty() )
if( !value.IsEmpty() )
{
wxString param = "dc";
@ -1418,23 +1418,28 @@ bool SIM_MODEL::InferSimModel( T_symbol& aSymbol, std::vector<T_field>* aFields,
if( valueMantissa.Contains( wxT( "." ) ) || valueFraction.IsEmpty() )
{
aModelParams->Printf( wxT( "%s=\"%s%s\"" ),
aModelParams->Printf( wxT( "%s=\"%s%s\" %s" ),
param,
valueMantissa,
convertNotation( valueExponent ) );
convertNotation( valueExponent ),
*aModelParams );
}
else
{
aModelParams->Printf( wxT( "%s=\"%s.%s%s\"" ),
aModelParams->Printf( wxT( "%s=\"%s.%s%s\" %s" ),
param,
valueMantissa,
valueFraction,
convertNotation( valueExponent ) );
convertNotation( valueExponent ),
*aModelParams );
}
}
else
{
aModelParams->Printf( wxT( "%s=\"%s\"" ), param, value );
aModelParams->Printf( wxT( "%s=\"%s\" %s" ),
param,
value,
*aModelParams );
}
}

2
eeschema/sim/sim_model_serializer.cpp
View File

@ -252,7 +252,7 @@ bool SIM_MODEL_SERIALIZER::ParseParams( const std::string& aParams )
}
}
return !m_model.HasPrimaryValue() || isPrimaryValueSet;
return !m_model.HasPrimaryValue() || m_model.HasAutofill() || isPrimaryValueSet;
}