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

Thermal Fracture Import: handle csv with space between name and unit

Browse Source
This commit is contained in:
Kristian Bendiksen 2022-08-01 11:30:26 +02:00
parent 76edb49e89
commit 65600f58b3
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/FileInterface/RifThermalFractureReader.cpp
View File

@ -24,8 +24,11 @@
#include "RifFileParseTools.h" #include "RifFileParseTools.h"
#include "cafAssert.h"
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>
#include <QRegularExpression>
#include <QTextStream> #include <QTextStream>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -45,6 +48,7 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
QString separator = ","; QString separator = ",";
auto appendPropertyValues = [def]( int nodeIndex, int valueOffset, const QStringList& values ) { auto appendPropertyValues = [def]( int nodeIndex, int valueOffset, const QStringList& values ) {
CAF_ASSERT( valueOffset <= values.size() );
for ( int i = valueOffset; i < values.size() - 1; i++ ) for ( int i = valueOffset; i < values.size() - 1; i++ )
{ {
double value = values[i].toDouble(); double value = values[i].toDouble();
@ -79,7 +83,7 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
for ( int i = valueOffset; i < headerValues.size() - 1; i++ ) for ( int i = valueOffset; i < headerValues.size() - 1; i++ )
{ {
auto [name, unit] = parseNameAndUnit( headerValues[i] ); auto [name, unit] = parseNameAndUnit( headerValues[i] );
def->addProperty( name, unit ); if ( !name.isEmpty() && !unit.isEmpty() ) def->addProperty( name, unit );
} }
isFirstHeader = false; isFirstHeader = false;
@ -179,8 +183,18 @@ bool RifThermalFractureReader::isPerimeterNodeLine( const QString& line )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::pair<QString, QString> RifThermalFractureReader::parseNameAndUnit( const QString& value ) std::pair<QString, QString> RifThermalFractureReader::parseNameAndUnit( const QString& value )
{ {
QStringList values = value.split( " " ); // Expected values: "name(unit)" or "name (unit)"
QString name = values[0]; QRegularExpression re( "(\\w*)\\s?\\(([^\\)]+)\\)" );
QString unit = values[1].replace( "(", "" ).replace( ")", "" );
QRegularExpressionMatch match = re.match( value );
if ( match.hasMatch() )
{
QString name = match.captured( 1 );
QString unit = match.captured( 2 );
return std::make_pair( name, unit ); return std::make_pair( name, unit );
}
else
{
return std::make_pair( "", "" );
}
} }