Avoid showing extraction curve name if no fields are set

This commit is contained in:
Rebecca Cox 2017-11-03 15:31:52 +01:00
parent c638d63dfe
commit c5fd04f3f6

View File

@ -705,6 +705,8 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
QStringList generatedCurveName; QStringList generatedCurveName;
if (m_addWellNameToCurveName) if (m_addWellNameToCurveName)
{
if (!wellName().isEmpty())
{ {
generatedCurveName += wellName(); generatedCurveName += wellName();
if (m_trajectoryType == SIMULATION_WELL && m_generatedSimulationWellPathBranches.size() > 1) if (m_trajectoryType == SIMULATION_WELL && m_generatedSimulationWellPathBranches.size() > 1)
@ -712,13 +714,14 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
generatedCurveName.push_back(" Br" + QString::number(m_branchIndex + 1)); generatedCurveName.push_back(" Br" + QString::number(m_branchIndex + 1));
} }
} }
}
if (m_addCaseNameToCurveName && m_case()) if (m_addCaseNameToCurveName && m_case())
{ {
generatedCurveName.push_back(m_case->caseUserDescription()); generatedCurveName.push_back(m_case->caseUserDescription());
} }
if (m_addPropertyToCurveName) if (m_addPropertyToCurveName && !wellLogChannelName().isEmpty())
{ {
generatedCurveName.push_back(wellLogChannelName()); generatedCurveName.push_back(wellLogChannelName());
} }