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

Extraction curve: Use QStringList to build curve name

Browse Source
This commit is contained in:
Rebecca Cox 2017-11-01 14:35:44 +01:00
parent 6e3cdb6a77
commit 94ecb3a084
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -685,41 +685,32 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
{ {
RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>(m_case.value()); RimGeoMechCase* geomCase = dynamic_cast<RimGeoMechCase*>(m_case.value());
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case.value()); RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case.value());
QString generatedCurveName;
QStringList generatedCurveName;
if (m_addWellNameToCurveName ) if (m_addWellNameToCurveName)
{ {
generatedCurveName += wellName(); generatedCurveName += wellName();
if (m_trajectoryType == SIMULATION_WELL && m_generatedSimulationWellPathBranches.size() > 1) if (m_trajectoryType == SIMULATION_WELL && m_generatedSimulationWellPathBranches.size() > 1)
{ {
generatedCurveName += " 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())
{ {
if (!generatedCurveName.isEmpty()) generatedCurveName.push_back(m_case->caseUserDescription());
{
generatedCurveName += ", ";
}
generatedCurveName += m_case->caseUserDescription();
} }
if (m_addPropertyToCurveName) if (m_addPropertyToCurveName)
{ {
if (!generatedCurveName.isEmpty()) generatedCurveName.push_back(wellLogChannelName());
{
generatedCurveName += ",";
}
generatedCurveName += wellLogChannelName();
} }
if (m_addTimestepToCurveName || m_addDateToCurveName) if (m_addTimestepToCurveName || m_addDateToCurveName)
{ {
size_t maxTimeStep = 0; size_t maxTimeStep = 0;
if (eclipseCase) if (eclipseCase)
{ {
if (eclipseCase->eclipseCaseData()) if (eclipseCase->eclipseCaseData())
@ -740,27 +731,17 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
QString dateString = wellDate(); QString dateString = wellDate();
if (!dateString.isEmpty()) if (!dateString.isEmpty())
{ {
if (!generatedCurveName.isEmpty()) generatedCurveName.push_back(dateString);
{
generatedCurveName += ", ";
}
generatedCurveName += dateString;
} }
} }
if (m_addTimestepToCurveName) if (m_addTimestepToCurveName)
{ {
if (!generatedCurveName.isEmpty()) generatedCurveName.push_back(QString("[%1/%2]").arg(m_timeStep()).arg(maxTimeStep));
{
generatedCurveName += ", ";
}
generatedCurveName += QString("[%1/%2]").arg(m_timeStep()).arg(maxTimeStep);
} }
} }
return generatedCurveName; return generatedCurveName.join(", ");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------