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

Speed-up Spice model library loading 

Thanks to Jeff Wheeler for determining the slow down cause.

Fixes: lp:1779566
* https://bugs.launchpad.net/kicad/+bug/1779566
This commit is contained in:
Maciej Suminski 2018-07-03 15:28:59 +02:00
parent 0013e0cad1
commit 14ce518208
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/dialogs/dialog_spice_model.cpp
View File

@ -31,6 +31,7 @@
#include <project.h>
#include <wx/tokenzr.h>
#include <wx/wupdlock.h>
// Helper function to shorten conditions
static bool empty( const wxTextCtrl* aCtrl )
@ -604,12 +605,20 @@ void DIALOG_SPICE_MODEL::loadLibrary( const wxString& aFilePath )
}
// Display the library contents
m_libraryContents->LoadFile( filePath.GetFullPath() );
wxWindowUpdateLocker updateLock( this );
m_libraryContents->Clear();
wxTextFile file;
file.Open( filePath.GetFullPath() );
int line_nr = 0;
// Process the file, looking for components
for( int line_nr = 0; line_nr < m_libraryContents->GetNumberOfLines(); ++line_nr )
while( !file.Eof() )
{
wxStringTokenizer tokenizer( m_libraryContents->GetLineText( line_nr ) );
const wxString& line = line_nr == 0 ? file.GetFirstLine() : file.GetNextLine();
m_libraryContents->AppendText( line );
m_libraryContents->AppendText( "\n" );
wxStringTokenizer tokenizer( line );
while( tokenizer.HasMoreTokens() )
{
@ -650,6 +659,8 @@ void DIALOG_SPICE_MODEL::loadLibrary( const wxString& aFilePath )
in_subckt = false;
}
}
++line_nr;
}
wxArrayString models;