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"
(cherry picked from commit 16b4ee92bb)
This commit is contained in:
committed by
Alex Shvartzkop
parent
ee513f7a8b
commit
91602ee7ba
@@ -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++;
|
||||
|
||||
@@ -261,6 +261,7 @@ public:
|
||||
{
|
||||
VECTOR2I SheetSize;
|
||||
int Version;
|
||||
int VersionMinor;
|
||||
int SheetNumber;
|
||||
std::vector<LT_SYMBOL> Symbols;
|
||||
std::vector<LINE> Lines;
|
||||
|
||||
Reference in New Issue
Block a user