From 6e3cdb6a77a837addfc2f7f12c6fc072e0d97472 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Wed, 1 Nov 2017 14:34:47 +0100 Subject: [PATCH] RFT curve: Change name format to match extraction curve --- .../ProjectDataModel/RimWellLogRftCurve.cpp | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp index 91adef5aaa..244f2f86df 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp @@ -230,30 +230,27 @@ void RimWellLogRftCurve::updateWellChannelNameAndTimeStep() //-------------------------------------------------------------------------------------------------- QString RimWellLogRftCurve::createCurveAutoName() { - QString name; - if (m_eclipseResultCase) - { - name += m_eclipseResultCase->caseName(); - } + QStringList name; + if (wellName() != "") { - name += ", "; - name += wellName(); + name.push_back(wellName()); + } + if (m_eclipseResultCase) + { + name.push_back(m_eclipseResultCase->caseName()); } if (wellLogChannelName() != caf::AppEnum::text(RifEclipseRftAddress::NONE)) { - name += ", "; RifEclipseRftAddress::RftWellLogChannelName channelNameEnum = caf::AppEnum::fromText(wellLogChannelName()); - name += caf::AppEnum::uiText(channelNameEnum); + name.push_back(caf::AppEnum::uiText(channelNameEnum)); } if ( !m_timeStep().isNull()) { - QString dateFormat = "dd MMM yyyy"; - name += ", "; - name += m_timeStep().toString(dateFormat); + name.push_back(m_timeStep().toString(RimTools::dateFormatString())); } - return name; + return name.join(", "); } //--------------------------------------------------------------------------------------------------