RFT curve: Change name format to match extraction curve

This commit is contained in:
Rebecca Cox 2017-11-01 14:34:47 +01:00
parent d645ecbfa4
commit 6e3cdb6a77

View File

@ -230,30 +230,27 @@ void RimWellLogRftCurve::updateWellChannelNameAndTimeStep()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimWellLogRftCurve::createCurveAutoName() QString RimWellLogRftCurve::createCurveAutoName()
{ {
QString name; QStringList name;
if (m_eclipseResultCase)
{
name += m_eclipseResultCase->caseName();
}
if (wellName() != "") if (wellName() != "")
{ {
name += ", "; name.push_back(wellName());
name += wellName(); }
if (m_eclipseResultCase)
{
name.push_back(m_eclipseResultCase->caseName());
} }
if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::text(RifEclipseRftAddress::NONE)) if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::text(RifEclipseRftAddress::NONE))
{ {
name += ", ";
RifEclipseRftAddress::RftWellLogChannelName channelNameEnum = caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::fromText(wellLogChannelName()); RifEclipseRftAddress::RftWellLogChannelName channelNameEnum = caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::fromText(wellLogChannelName());
name += caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(channelNameEnum); name.push_back(caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(channelNameEnum));
} }
if ( !m_timeStep().isNull()) if ( !m_timeStep().isNull())
{ {
QString dateFormat = "dd MMM yyyy"; name.push_back(m_timeStep().toString(RimTools::dateFormatString()));
name += ", ";
name += m_timeStep().toString(dateFormat);
} }
return name; return name.join(", ");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------