#5164 Fix crash when adding LAS curve and support TVDRKB from LAS-files

This commit is contained in:
Gaute Lindkvist
2020-01-22 13:20:18 +01:00
parent df5ba4c0d1
commit 1c283d9c2d
5 changed files with 116 additions and 82 deletions

View File

@@ -104,6 +104,10 @@ bool RigWellLogFile::open( const QString& fileName, QString* errorMessage )
{
m_tvdMslLogName = logName;
}
else if ( logName.toUpper() == "TVDRKB" )
{
m_tvdRkbLogName = logName;
}
}
m_wellLogChannelNames = wellLogNames;
@@ -169,6 +173,14 @@ std::vector<double> RigWellLogFile::tvdMslValues() const
return values( m_tvdMslLogName );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::tvdRkbValues() const
{
return values( m_tvdRkbLogName );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -251,11 +263,19 @@ QString RigWellLogFile::wellLogChannelUnitString( const QString& well
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigWellLogFile::hasTvdChannel() const
bool RigWellLogFile::hasTvdMslChannel() const
{
return !m_tvdMslLogName.isEmpty();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigWellLogFile::hasTvdRkbChannel() const
{
return !m_tvdRkbLogName.isEmpty();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------