Browse Source

Schematic: Fix Ltspice import with minor version number

- Files that contained a minor version number failed
- Now both works "Version X.X" and "Version X"
revert-0c36e162
Lucas Gerads 7 months ago
parent
commit
16b4ee92bb
  1. 13
      eeschema/sch_io/ltspice/ltspice_schematic.cpp
  2. 1
      eeschema/sch_io/ltspice/ltspice_schematic.h

13
eeschema/sch_io/ltspice/ltspice_schematic.cpp

@ -788,6 +788,7 @@ std::vector<LTSPICE_SCHEMATIC::LT_ASC> LTSPICE_SCHEMATIC::StructureBuilder()
ascFile.SheetSize = VECTOR2I( 0, 0 );
ascFile.Symbols = symbolArray;
ascFile.Version = 0;
ascFile.VersionMinor = 0;
ascFile.SheetNumber = 0;
int lineNumber = 1;
@ -1122,7 +1123,17 @@ std::vector<LTSPICE_SCHEMATIC::LT_ASC> LTSPICE_SCHEMATIC::StructureBuilder()
else if( element == "VERSION" )
{
wxString versionNumber = tokens[1];
ascFile.Version = integerCheck( versionNumber, lineNumber, fileName );
if( versionNumber.Contains( '.' ) )
{
wxString majorStr = versionNumber.BeforeFirst( '.' );
wxString minorStr = versionNumber.AfterFirst( '.' );
ascFile.Version = integerCheck( majorStr, lineNumber, fileName );
ascFile.VersionMinor = integerCheck( minorStr, lineNumber, fileName );
}
else
{
ascFile.Version = integerCheck( versionNumber, lineNumber, fileName );
}
}
lineNumber++;

1
eeschema/sch_io/ltspice/ltspice_schematic.h

@ -261,6 +261,7 @@ public:
{
VECTOR2I SheetSize;
int Version;
int VersionMinor;
int SheetNumber;
std::vector<LT_SYMBOL> Symbols;
std::vector<LINE> Lines;

Loading…
Cancel
Save