haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/eeschema/sim/sim_value.cpp

743 lines
23 KiB
C++
Raw Normal View History

Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2022 Mikolaj Wielgus
* Copyright (C) 2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* https://www.gnu.org/licenses/gpl-3.0.html
* or you may search the http://www.gnu.org website for the version 3 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <sim/sim_value.h>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
#include <wx/translation.h>
#include <ki_exception.h>
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
#include <locale_io.h>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
#include <pegtl/contrib/parse_tree.hpp>
LOCALE_IO is expensive to hammer, use fmt Fixes https://gitlab.com/kicad/code/kicad/-/issues/12377
2022-09-08 11:04:31 +00:00
#include <fmt/core.h>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
#define CALL_INSTANCE( ValueType, Notation, func, ... ) \
switch( ValueType ) \
{ \
case SIM_VALUE::TYPE_INT: \
switch( Notation ) \
{ \
case NOTATION::SI: \
func<SIM_VALUE::TYPE_INT, NOTATION::SI>( __VA_ARGS__ ); \
break; \
\
case NOTATION::SPICE: \
func<SIM_VALUE::TYPE_INT, NOTATION::SPICE>( __VA_ARGS__ ); \
break; \
} \
break; \
\
case SIM_VALUE::TYPE_FLOAT: \
switch( Notation ) \
{ \
case NOTATION::SI: \
func<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>( __VA_ARGS__ ); \
break; \
\
case NOTATION::SPICE: \
func<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>( __VA_ARGS__ ); \
break; \
} \
break; \
\
case SIM_VALUE::TYPE_BOOL: \
case SIM_VALUE::TYPE_COMPLEX: \
case SIM_VALUE::TYPE_STRING: \
case SIM_VALUE::TYPE_BOOL_VECTOR: \
case SIM_VALUE::TYPE_INT_VECTOR: \
case SIM_VALUE::TYPE_FLOAT_VECTOR: \
case SIM_VALUE::TYPE_COMPLEX_VECTOR: \
wxFAIL_MSG( "Unhandled SIM_VALUE type" ); \
break; \
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
namespace SIM_VALUE_PARSER
{
using namespace SIM_VALUE_GRAMMAR;
template <typename Rule>
struct numberSelector : std::false_type {};
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
// TODO: Reorder. NOTATION should be before TYPE.
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<SIM_VALUE_GRAMMAR::significand<SIM_VALUE::TYPE_INT>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<SIM_VALUE_GRAMMAR::significand<SIM_VALUE::TYPE_FLOAT>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
template <> struct numberSelector<intPart> : std::true_type {};
template <> struct numberSelector<fracPart> : std::true_type {};
template <> struct numberSelector<exponent> : std::true_type {};
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SI>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SPICE>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>>
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
: std::true_type {};
struct PARSE_RESULT
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
bool isOk = true;
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
bool isEmpty = true;
std::string significand;
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
std::optional<int64_t> intPart;
std::optional<int64_t> fracPart;
std::optional<int> exponent;
std::optional<int> metricSuffixExponent;
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
};
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
PARSE_RESULT Parse( const std::string& aString,
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
NOTATION aNotation = NOTATION::SI,
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE::TYPE aValueType = SIM_VALUE::TYPE_FLOAT );
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int MetricSuffixToExponent( std::string aMetricSuffix, NOTATION aNotation = NOTATION::SI );
std::string ExponentToMetricSuffix( double aExponent, int& aReductionExponent,
LOCALE_IO is expensive to hammer, use fmt Fixes https://gitlab.com/kicad/code/kicad/-/issues/12377
2022-09-08 11:04:31 +00:00
NOTATION aNotation = NOTATION::SI );
}
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
template <SIM_VALUE::TYPE ValueType, SIM_VALUE_PARSER::NOTATION Notation>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
static inline void doIsValid( tao::pegtl::string_input<>& aIn )
{
tao::pegtl::parse<SIM_VALUE_PARSER::numberGrammar<ValueType, Notation>>( aIn );
}
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_GRAMMAR::IsValid( const std::string& aString,
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
SIM_VALUE::TYPE aValueType,
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
NOTATION aNotation )
{
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
tao::pegtl::string_input<> in( aString, "from_content" );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
try
{
CALL_INSTANCE( aValueType, aNotation, doIsValid, in );
}
Fix a few unused variable warnings on msvc
2022-08-15 19:45:54 +00:00
catch( const tao::pegtl::parse_error& )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
return false;
}
return true;
}
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
template <SIM_VALUE::TYPE ValueType, SIM_VALUE_PARSER::NOTATION Notation>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
static inline std::unique_ptr<tao::pegtl::parse_tree::node> doParse(
tao::pegtl::string_input<>& aIn )
{
return tao::pegtl::parse_tree::parse<SIM_VALUE_PARSER::numberGrammar<ValueType, Notation>,
SIM_VALUE_PARSER::numberSelector>
( aIn );
}
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
template <SIM_VALUE::TYPE ValueType, SIM_VALUE_PARSER::NOTATION Notation>
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
static inline void handleNodeForParse( tao::pegtl::parse_tree::node& aNode,
SIM_VALUE_PARSER::PARSE_RESULT& aParseResult )
{
if( aNode.is_type<SIM_VALUE_PARSER::significand<ValueType>>() )
{
aParseResult.significand = aNode.string();
aParseResult.isEmpty = false;
for( const auto& subnode : aNode.children )
{
if( subnode->is_type<SIM_VALUE_PARSER::intPart>() )
aParseResult.intPart = std::stol( subnode->string() );
else if( subnode->is_type<SIM_VALUE_PARSER::fracPart>() )
aParseResult.fracPart = std::stol( subnode->string() );
}
}
else if( aNode.is_type<SIM_VALUE_PARSER::exponent>() )
{
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
aParseResult.exponent = std::stoi( aNode.string() );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
aParseResult.isEmpty = false;
}
else if( aNode.is_type<SIM_VALUE_PARSER::metricSuffix<ValueType, Notation>>() )
{
aParseResult.metricSuffixExponent =
SIM_VALUE_PARSER::MetricSuffixToExponent( aNode.string(), Notation );
aParseResult.isEmpty = false;
}
else
wxFAIL_MSG( "Unhandled parse tree node" );
}
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
SIM_VALUE_PARSER::PARSE_RESULT SIM_VALUE_PARSER::Parse( const std::string& aString,
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
NOTATION aNotation,
SIM_VALUE::TYPE aValueType )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
LOCALE_IO toggle;
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
tao::pegtl::string_input<> in( aString, "from_content" );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
std::unique_ptr<tao::pegtl::parse_tree::node> root;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
PARSE_RESULT result;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
try
{
CALL_INSTANCE( aValueType, aNotation, root = doParse, in );
}
Fix a few unused variable warnings on msvc
2022-08-15 19:45:54 +00:00
catch( tao::pegtl::parse_error& )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
result.isOk = false;
return result;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
wxASSERT( root );
try
{
for( const auto& node : root->children )
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
{
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
CALL_INSTANCE( aValueType, aNotation, handleNodeForParse, *node, result );
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
}
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
Sim: Transmission line models Implement transmission line models and perform some adjustments to the current models. Add some QA tests.
2022-05-31 02:55:48 +00:00
catch( const std::invalid_argument& e )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
wxFAIL_MSG( fmt::format( "Parsing simulator value failed: {:s}", e.what() ) );
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
result.isOk = false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
return result;
}
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int SIM_VALUE_PARSER::MetricSuffixToExponent( std::string aMetricSuffix, NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
switch( aNotation )
{
case NOTATION::SI:
if( aMetricSuffix.empty() )
return 0;
switch( aMetricSuffix[0] )
{
case 'a': return -18;
case 'f': return -15;
case 'p': return -12;
case 'n': return -9;
case 'u': return -6;
case 'm': return -3;
case 'k':
case 'K': return 3;
case 'M': return 6;
case 'G': return 9;
case 'T': return 12;
case 'P': return 15;
case 'E': return 18;
}
break;
case NOTATION::SPICE:
std::transform( aMetricSuffix.begin(), aMetricSuffix.end(), aMetricSuffix.begin(),
::tolower );
if( aMetricSuffix == "f" )
return -15;
else if( aMetricSuffix == "p" )
return -12;
else if( aMetricSuffix == "n" )
return -9;
else if( aMetricSuffix == "u" )
return -6;
else if( aMetricSuffix == "m" )
return -3;
else if( aMetricSuffix == "" )
return 0;
else if( aMetricSuffix == "k" )
return 3;
else if( aMetricSuffix == "meg" )
return 6;
else if( aMetricSuffix == "g" )
return 9;
else if( aMetricSuffix == "t" )
return 12;
break;
}
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
wxFAIL_MSG( fmt::format( "Unknown simulator value suffix: '{:s}'", aMetricSuffix ) );
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return 0;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
std::string SIM_VALUE_PARSER::ExponentToMetricSuffix( double aExponent, int& aReductionExponent,
NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
if( aNotation == NOTATION::SI && aExponent >= -18 && aExponent <= -15 )
{
aReductionExponent = -18;
return "a";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= -15 && aExponent < -12 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = -15;
return "f";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= -12 && aExponent < -9 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = -12;
return "p";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= -9 && aExponent < -6 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = -9;
return "n";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= -6 && aExponent < -3 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = -6;
return "u";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= -3 && aExponent < 0 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = -3;
return "m";
}
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
else if( aExponent >= 0 && aExponent < 3 )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
aReductionExponent = 0;
return "";
}
else if( aExponent >= 3 && aExponent < 6 )
{
aReductionExponent = 3;
return "k";
}
else if( aExponent >= 6 && aExponent < 9 )
{
aReductionExponent = 6;
return ( aNotation == NOTATION::SI ) ? "M" : "Meg";
}
else if( aExponent >= 9 && aExponent < 12 )
{
aReductionExponent = 9;
return "G";
}
else if( aExponent >= 12 && aExponent < 15 )
{
aReductionExponent = 12;
return "T";
}
else if( aNotation == NOTATION::SI && aExponent >= 15 && aExponent < 18 )
{
aReductionExponent = 15;
return "P";
}
else if( aNotation == NOTATION::SI && aExponent >= 18 && aExponent <= 21 )
{
aReductionExponent = 18;
return "E";
}
Fix a few unused variable warnings on msvc
2022-08-15 19:45:54 +00:00
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
aReductionExponent = 0;
return "";
}
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
Sim: Support ako models
2022-10-04 15:17:41 +00:00
std::unique_ptr<SIM_VALUE> SIM_VALUE::Create( TYPE aType, std::string aString, NOTATION aNotation )
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
std::unique_ptr<SIM_VALUE> value = SIM_VALUE::Create( aType );
Sim: Support ako models
2022-10-04 15:17:41 +00:00
value->FromString( aString, aNotation );
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
return value;
}
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
std::unique_ptr<SIM_VALUE> SIM_VALUE::Create( TYPE aType )
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
switch( aType )
{
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
case TYPE_BOOL: return std::make_unique<SIM_VALUE_BOOL>();
case TYPE_INT: return std::make_unique<SIM_VALUE_INT>();
case TYPE_FLOAT: return std::make_unique<SIM_VALUE_FLOAT>();
case TYPE_COMPLEX: return std::make_unique<SIM_VALUE_COMPLEX>();
case TYPE_STRING: return std::make_unique<SIM_VALUE_STRING>();
case TYPE_BOOL_VECTOR: return std::make_unique<SIM_VALUE_BOOL>();
case TYPE_INT_VECTOR: return std::make_unique<SIM_VALUE_INT>();
case TYPE_FLOAT_VECTOR: return std::make_unique<SIM_VALUE_FLOAT>();
case TYPE_COMPLEX_VECTOR: return std::make_unique<SIM_VALUE_COMPLEX>();
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
Fix a few unused variable warnings on msvc
2022-08-15 19:45:54 +00:00
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
wxFAIL_MSG( _( "Unknown SIM_VALUE type" ) );
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
return nullptr;
}
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
void SIM_VALUE::operator=( const std::string& aString )
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
FromString( aString );
}
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
bool SIM_VALUE::operator!=( const SIM_VALUE& aOther ) const
{
return !( *this == aOther );
}
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE_INST<T>::SIM_VALUE_INST( const T& aValue ) : m_value( aValue )
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
}
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_BOOL::SIM_VALUE_INST( const bool& aValue );
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
template SIM_VALUE_INT::SIM_VALUE_INST( const int& aValue );
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_FLOAT::SIM_VALUE_INST( const double& aValue );
template SIM_VALUE_COMPLEX::SIM_VALUE_INST( const std::complex<double>& aValue );
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
template SIM_VALUE_STRING::SIM_VALUE_INST( const std::string& aValue );
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
Sim: Support ako models
2022-10-04 15:17:41 +00:00
template <> SIM_VALUE::TYPE SIM_VALUE_BOOL::GetType() const { return TYPE_BOOL; }
template <> SIM_VALUE::TYPE SIM_VALUE_INT::GetType() const { return TYPE_INT; }
template <> SIM_VALUE::TYPE SIM_VALUE_FLOAT::GetType() const { return TYPE_FLOAT; }
template <> SIM_VALUE::TYPE SIM_VALUE_COMPLEX::GetType() const { return TYPE_FLOAT; }
template <> SIM_VALUE::TYPE SIM_VALUE_STRING::GetType() const { return TYPE_STRING; }
// TODO
/*template <> SIM_VALUE::TYPE SIM_VALUE_BOOL_VECTOR::GetType() const { return TYPE_BOOL; }
template <> SIM_VALUE::TYPE SIM_VALUE_INT_VECTOR::GetType() const { return TYPE_INT; }
template <> SIM_VALUE::TYPE SIM_VALUE_FLOAT_VECTOR::GetType() const { return TYPE_FLOAT; }
template <> SIM_VALUE::TYPE SIM_VALUE_COMPLEX_VECTOR::GetType() const { return TYPE_COMPLEX; }*/
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template <typename T>
bool SIM_VALUE_INST<T>::HasValue() const
{
return m_value.has_value();
}
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_BOOL::FromString( const std::string& aString, NOTATION aNotation )
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
Replace boost::optional with std::optional
2022-08-25 22:50:47 +00:00
m_value = std::nullopt;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
if( !parseResult.isOk )
return false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
if( parseResult.isEmpty )
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
if( !parseResult.intPart
|| ( *parseResult.intPart != 0 && *parseResult.intPart != 1 )
|| parseResult.fracPart
|| parseResult.exponent
|| parseResult.metricSuffixExponent )
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
m_value = *parseResult.intPart;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_INT::FromString( const std::string& aString, NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
Replace boost::optional with std::optional
2022-08-25 22:50:47 +00:00
m_value = std::nullopt;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
if( !parseResult.isOk )
return false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
if( parseResult.isEmpty )
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Transmission line models Implement transmission line models and perform some adjustments to the current models. Add some QA tests.
2022-05-31 02:55:48 +00:00
if( !parseResult.intPart || ( parseResult.fracPart && *parseResult.fracPart != 0 ) )
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int exponent = parseResult.exponent ? *parseResult.exponent : 0;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
exponent += parseResult.metricSuffixExponent ? *parseResult.metricSuffixExponent : 0;
m_value = static_cast<double>( *parseResult.intPart ) * std::pow( 10, exponent );
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_FLOAT::FromString( const std::string& aString, NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
Replace boost::optional with std::optional
2022-08-25 22:50:47 +00:00
m_value = std::nullopt;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
if( !parseResult.isOk )
return false;
if( parseResult.isEmpty )
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
// Single dot should be allowed in fields.
// TODO: disallow single dot in models.
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
if( parseResult.significand.empty() || parseResult.significand == "." )
return false;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int exponent = parseResult.exponent ? *parseResult.exponent : 0;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
exponent += parseResult.metricSuffixExponent ? *parseResult.metricSuffixExponent : 0;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
try
{
m_value = std::stod( parseResult.significand ) * std::pow( 10, exponent );
}
Fix a few unused variable warnings on msvc
2022-08-15 19:45:54 +00:00
catch( const std::invalid_argument& )
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
{
return false;
}
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_COMPLEX::FromString( const std::string& aString,
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
// TODO
/*LOCALE_IO toggle;
double value = 0;
if( !aString.ToDouble( &value ) )
throw KI_PARAM_ERROR( _( "Invalid complex sim value string" ) );
m_value = value;*/
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
bool SIM_VALUE_STRING::FromString( const std::string& aString, NOTATION aNotation )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
m_value = aString;
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
return true;
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
template <typename T>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_INST<T>::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
static_assert( std::is_same<T, std::vector<T>>::value );
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string string = "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
for( auto it = m_value.cbegin(); it != m_value.cend(); it++ )
{
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
string += SIM_VALUE_INST<T>( *it ).ToString();
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
string += ",";
}
return string;
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_BOOL::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Forgot to actually change the fmt specifiers...
2022-09-08 11:17:09 +00:00
return fmt::format( "{:d}", *m_value );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
return "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_INT::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int value = std::abs( *m_value );
int exponent = 0;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
while( value != 0 && value % 1000 == 0 )
Sim: Implement loading Spice library files Implement parsing and loading Spice libraries into KiCad. This is done without any involvement of Ngspice -- we create our own in-tree parser using PEGTL -- because Ngspice doesn't offer any intermediate output we could plug ourselves into. We don't parse everything -- just the library content, so this won't be that much effort. We implement some basic Spice code preview to give the user a hint what Spice code eir model will correspond to.
2022-04-01 04:30:50 +00:00
{
exponent += 3;
value /= 1000;
}
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int dummy = 0;
LOCALE_IO is expensive to hammer, use fmt Fixes https://gitlab.com/kicad/code/kicad/-/issues/12377
2022-09-08 11:04:31 +00:00
std::string metricSuffix = SIM_VALUE_PARSER::ExponentToMetricSuffix(
Sim: Spice netlist exporter rewrite Rewrite the spice exporter to work with the new simulation model architecture and data model, with many bugfixes related to the latter two along the way.
2022-04-12 14:37:06 +00:00
static_cast<double>( exponent ), dummy, aNotation );
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
return fmt::format( "{:d}{:s}", value, metricSuffix );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
return "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_FLOAT::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Transmission line models Implement transmission line models and perform some adjustments to the current models. Add some QA tests.
2022-05-31 02:55:48 +00:00
double exponent = std::log10( std::abs( *m_value ) );
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
int reductionExponent = 0;
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
LOCALE_IO is expensive to hammer, use fmt Fixes https://gitlab.com/kicad/code/kicad/-/issues/12377
2022-09-08 11:04:31 +00:00
std::string metricSuffix =
SIM_VALUE_PARSER::ExponentToMetricSuffix( exponent, reductionExponent, aNotation );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
double reducedValue = *m_value / std::pow( 10, reductionExponent );
Forgot to actually change the fmt specifiers...
2022-09-08 11:17:09 +00:00
return fmt::format( "{:g}{}", reducedValue, metricSuffix );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
}
else
return "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_COMPLEX::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Forgot to actually change the fmt specifiers...
2022-09-08 11:17:09 +00:00
return fmt::format( "{:g}+{:g}i", m_value->real(), m_value->imag() );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
return "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_STRING::ToString( NOTATION aNotation ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
return *m_value;
return ""; // Empty string is completely equivalent to null string.
}
template <typename T>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_INST<T>::ToSimpleString() const
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
Sim: Improvements to model serialization Don't serialize parameters in certain models for default values. Infer models from Value field for some kinds of models. Resolve synonyms when loading models from Spice libraries.
2022-05-08 09:54:35 +00:00
if( m_value )
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
return fmt::format( "{}", *m_value );
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
return "";
}
template <>
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
std::string SIM_VALUE_COMPLEX::ToSimpleString() const
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
{
// TODO
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
/*std::string result = "";
Sim Model Editor: Serialize models in fields Implemented serialization and deserialization of models in symbol fields through the SIM_VALUE class. We don't carry the Spice legacy of case-insensitive suffixes, instead we conform to the SI standard (i.e. M is Mega, not milli, P is peta, p is pico). Parameter grid value validation is implemented by simply not allowing any characters that will make the value invalid (instead of highlighting the field in a red color). This will likely be changed at some point in the future.
2022-03-09 01:40:59 +00:00
result << *m_value;
return result;*/
return "";
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
}
Sim: Support ako models
2022-10-04 15:17:41 +00:00
template <typename T>
void SIM_VALUE_INST<T>::operator=( const SIM_VALUE& aOther )
{
auto other = dynamic_cast<const SIM_VALUE_INST<T>*>( &aOther );
m_value = other->m_value;
}
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
bool SIM_VALUE_INST<T>::operator==( const T& aOther ) const
{
return m_value == aOther;
}
template <>
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
bool SIM_VALUE_BOOL::operator==( const bool& aOther ) const
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
{
Create class for voltage and current -controlled switches Unfortunately, along the way it turned out that Ngspice's .probe alli breaks current-controlled switches. So they won't work in that case for now.
2022-08-28 12:51:03 +00:00
// Note that we take nullopt as the same as false here.
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
if( !m_value )
return false == aOther;
return m_value == aOther;
}
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
template bool SIM_VALUE_INT::operator==( const int& aOther ) const;
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template bool SIM_VALUE_FLOAT::operator==( const double& aOther ) const;
template bool SIM_VALUE_COMPLEX::operator==( const std::complex<double>& aOther ) const;
Sim: Replace all wxStrings with std::strings in SIM_VALUE
2022-09-16 04:11:14 +00:00
template bool SIM_VALUE_STRING::operator==( const std::string& aOther ) const;
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
template <typename T>
bool SIM_VALUE_INST<T>::operator==( const SIM_VALUE& aOther ) const
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
{
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
const SIM_VALUE_INST<T>* otherValue = dynamic_cast<const SIM_VALUE_INST<T>*>( &aOther );
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
Sim: Transmission line models Implement transmission line models and perform some adjustments to the current models. Add some QA tests.
2022-05-31 02:55:48 +00:00
if( otherValue )
return m_value == otherValue->m_value;
Sim Model Editor: Display model parameters This commit adds parameter display functionality, via a wxPropertyGrid widget, to the Sim Model Editor. To faciliate that, a SIM_VALUE class is created to serialize, deserialize, and validate numeric values in the new parameter grid. SPICE_MODEL is renamed to SIM_MODEL and split into several subclasses that correspond to different model kinds.
2022-02-21 03:58:31 +00:00
return false;
}
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE_INST<T> operator+( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
return SIM_VALUE_INST( aLeft.m_value.value() + aRight.m_value.value() );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
}
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_INT operator+( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INT& aRight );
template SIM_VALUE_FLOAT operator+( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_FLOAT& aRight );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
Sim: Don't use long type in SIM_VALUE
2022-09-18 00:22:51 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE_INST<T> operator-( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
return SIM_VALUE_INST( aLeft.m_value.value() - aRight.m_value.value() );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
}
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_INT operator-( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INT& aRight );
template SIM_VALUE_FLOAT operator-( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_FLOAT& aRight );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE_INST<T> operator*( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
return SIM_VALUE_INST( aLeft.m_value.value() * aRight.m_value.value() );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
}
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_INT operator*( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INT& aRight );
template SIM_VALUE_FLOAT operator*( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_FLOAT& aRight );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template <typename T>
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
SIM_VALUE_INST<T> operator/( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
return SIM_VALUE_INST( aLeft.m_value.value() / aRight.m_value.value() );
Sim: Bugfixes, mostly for MS Windows compilation errors Unfortunately, Windows headers define a lot of macros for common words, so we had to rename some enums to not collide. We also fix some of the many bugs related to the new simulation architecture and the Spice Model Editor dialog.
2022-06-21 02:22:52 +00:00
}
Sim Model Editor: Fix crash on selecting tline models Dereferencing std::optional<T> objects was undefined behavior. Change some forgotten SIM_VALUE_INST<T> usages to their corresponding typedefs.
2022-09-03 17:39:49 +00:00
template SIM_VALUE_INT operator/( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INT& aRight );
template SIM_VALUE_FLOAT operator/( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_FLOAT& aRight );