OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6759 Fix freeze when loading project with input grid

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-10-09 13:20:46 +02:00
parent b3abe284ce
commit c291f22d4d
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -979,25 +979,31 @@ void RifEclipseInputFileTools::findKeywordsOnFile( const QString& fileName, std:
if ( lineLength > 0 )
{
line = QString::fromLatin1( buf );
if ( line.size() && line[0].isLetter() )
RifKeywordAndFilePos keyPos;
filepos = data.pos() - lineLength;
keyPos.filePos = filepos;
QString trimmedLine = line;
int commentStart = trimmedLine.indexOf( "--" );
if ( commentStart > 0 )
{
RifKeywordAndFilePos keyPos;
trimmedLine = trimmedLine.left( commentStart );
}
filepos = data.pos() - lineLength;
keyPos.filePos = filepos;
QString keywordCandidate = line;
int commentStart = keywordCandidate.indexOf( "--" );
if ( commentStart > 0 )
trimmedLine = trimmedLine.trimmed();
if ( !trimmedLine.isEmpty() && trimmedLine[0].isLetter() )
{
// Ensure we don't attempt to find keywords with a space in it.
QStringList keywordCandidates = trimmedLine.split( " " );
if ( !keywordCandidates.isEmpty() )
{
keywordCandidate = keywordCandidate.left( commentStart );
QString keywordCandidate = keywordCandidates.front();
keyPos.keyword = keywordCandidate;
keywords->push_back( keyPos );
// qDebug() << keyPos.keyword << " - " << keyPos.filePos;
}
keywordCandidate = keywordCandidate.trimmed();
keyPos.keyword = keywordCandidate;
keywords->push_back( keyPos );
// qDebug() << keyPos.keyword << " - " << keyPos.filePos;
}
}
} while ( lineLength != -1 );