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

(#538) Display correct unit in curve name

Browse Source
This commit is contained in:
Magne Sjaastad
2015-12-02 14:21:22 +01:00
parent de14b93f6b
commit a215e080cc
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@@ -263,7 +263,11 @@ QString RimWellLogFileCurve::createCurveName()
RigWellLogFile* wellLogFile = logFileInfo ? logFileInfo->wellLogFile() : NULL; RigWellLogFile* wellLogFile = logFileInfo ? logFileInfo->wellLogFile() : NULL;
if (wellLogFile) if (wellLogFile)
{ {
QString unitName = wellLogFile->wellLogChannelUnitString(m_wellLogChannnelName); RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
CVF_ASSERT(wellLogPlot);
QString unitName = wellLogFile->wellLogChannelUnitString(m_wellLogChannnelName, wellLogPlot->depthUnit());
if (!unitName.isEmpty()) if (!unitName.isEmpty())
{ {
txt += QString(" [%1]").arg(unitName); txt += QString(" [%1]").arg(unitName);

15
ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
View File

@@ -206,7 +206,7 @@ QString RigWellLogFile::depthUnitString() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RigWellLogFile::wellLogChannelUnitString(const QString& wellLogChannelName) const QString RigWellLogFile::wellLogChannelUnitString(const QString& wellLogChannelName, RimDefines::DepthUnitType displayDepthUnit) const
{ {
QString unit; QString unit;
@@ -216,10 +216,19 @@ QString RigWellLogFile::wellLogChannelUnitString(const QString& wellLogChannelNa
unit = QString::fromStdString(lasWell->unitName(wellLogChannelName.toStdString())); unit = QString::fromStdString(lasWell->unitName(wellLogChannelName.toStdString()));
} }
// Special handling of depth unit - we convert depth to meter
if (unit == depthUnitString()) if (unit == depthUnitString())
{ {
return "m"; if (displayDepthUnit != depthUnit())
{
if (displayDepthUnit == RimDefines::UNIT_METER)
{
return "M";
}
else if (displayDepthUnit == RimDefines::UNIT_FEET)
{
return "FT";
}
}
} }
return unit; return unit;

2
ApplicationCode/ReservoirDataModel/RigWellLogFile.h
View File

@@ -51,7 +51,7 @@ public:
std::vector<double> depthValues() const; std::vector<double> depthValues() const;
std::vector<double> values(const QString& name) const; std::vector<double> values(const QString& name) const;
QString wellLogChannelUnitString(const QString& wellLogChannelName) const; QString wellLogChannelUnitString(const QString& wellLogChannelName, RimDefines::DepthUnitType displayDepthUnit) const;
RimDefines::DepthUnitType depthUnit() const; RimDefines::DepthUnitType depthUnit() const;
static bool exportToLasFile(const RimWellLogCurve* curve, const QString& fileName); static bool exportToLasFile(const RimWellLogCurve* curve, const QString& fileName);