From 7b3a9de19988ed4a2da92c175fcee32f21371f69 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 4 Dec 2017 19:00:10 +0100 Subject: [PATCH] #2215 Plt Plot : Extract unit string text generation --- .../Flow/RimWellPlotTools.cpp | 63 ++++++++++--------- .../ProjectDataModel/Flow/RimWellPlotTools.h | 3 + 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp index 02d6070b73..7007df8eec 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp @@ -669,48 +669,51 @@ QString RimWellPlotTools::flowPlotAxisTitle(RimWellLogFile::WellFlowCondition co if (condition == RimWellLogFile::WELL_FLOW_COND_RESERVOIR) { - QString unitText; - switch ( unitSystem ) - { - case RiaEclipseUnitTools::UNITS_METRIC: - unitText = "[m3/day]"; - break; - case RiaEclipseUnitTools::UNITS_FIELD: - unitText = "[Brl/day]"; - break; - case RiaEclipseUnitTools::UNITS_LAB: - unitText = "[cm3/hr]"; - break; - default: - break; - } + QString unitText = RimWellPlotTools::flowUnitText(condition, unitSystem); axisTitle = "Reservoir Flow Rate " + unitText; } else { - QString unitText; - switch ( unitSystem ) - { - case RiaEclipseUnitTools::UNITS_METRIC: - unitText = "[Liquid Sm3/day], [Gas kSm3/day]"; - break; - case RiaEclipseUnitTools::UNITS_FIELD: - unitText = "[Liquid BBL/day], [Gas BOE/day]"; - break; - case RiaEclipseUnitTools::UNITS_LAB: - unitText = "[cm3/hr]"; - break; - default: - break; + QString unitText = RimWellPlotTools::flowUnitText(condition, unitSystem); - } axisTitle = "Surface Flow Rate " + unitText; } return axisTitle; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimWellPlotTools::flowUnitText(RimWellLogFile::WellFlowCondition condition, RiaEclipseUnitTools::UnitSystem unitSystem) +{ + QString unitText; + + if (condition == RimWellLogFile::WELL_FLOW_COND_RESERVOIR) + { + switch (unitSystem) + { + case RiaEclipseUnitTools::UNITS_METRIC: unitText = "[m3/day]"; break; + case RiaEclipseUnitTools::UNITS_FIELD: unitText = "[Brl/day]"; break; + case RiaEclipseUnitTools::UNITS_LAB: unitText = "[cm3/hr]"; break; + default: break; + } + } + else + { + switch (unitSystem) + { + case RiaEclipseUnitTools::UNITS_METRIC: unitText = "[Liquid Sm3/day], [Gas kSm3/day]"; break; + case RiaEclipseUnitTools::UNITS_FIELD: unitText = "[Liquid BBL/day], [Gas BOE/day]"; break; + case RiaEclipseUnitTools::UNITS_LAB: unitText = "[cm3/hr]"; break; + default: break; + } + } + + return unitText; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h index af900fde80..1aa6349d84 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h @@ -96,6 +96,9 @@ public: static QString flowPlotAxisTitle(RimWellLogFile::WellFlowCondition condition, RiaEclipseUnitTools::UnitSystem unitSystem); + + static QString flowUnitText(RimWellLogFile::WellFlowCondition condition, + RiaEclipseUnitTools::UnitSystem unitSystem); private: friend class StaticFieldsInitializer; static const std::set PRESSURE_DATA_NAMES;