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

(#535) Added field for toggling of date in curve name

Browse Source 
Date is on by default, time step is off.
This commit is contained in:
Pål Hagen 2015-09-25 10:44:35 +02:00
parent b151200ffc
commit 285cd6ccea
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -84,7 +84,8 @@ RimWellLogExtractionCurve::RimWellLogExtractionCurve()
CAF_PDM_InitField(&m_addCaseNameToCurveName, "AddCaseNameToCurveName", true, " Case Name", "", "", ""); CAF_PDM_InitField(&m_addCaseNameToCurveName, "AddCaseNameToCurveName", true, " Case Name", "", "", "");
CAF_PDM_InitField(&m_addPropertyToCurveName, "AddPropertyToCurveName", true, " Property", "", "", ""); CAF_PDM_InitField(&m_addPropertyToCurveName, "AddPropertyToCurveName", true, " Property", "", "", "");
CAF_PDM_InitField(&m_addWellNameToCurveName, "AddWellNameToCurveName", true, " Well Name", "", "", ""); CAF_PDM_InitField(&m_addWellNameToCurveName, "AddWellNameToCurveName", true, " Well Name", "", "", "");
CAF_PDM_InitField(&m_addTimestepToCurveName, "AddTimestepToCurveName", true, " Timestep", "", "", ""); CAF_PDM_InitField(&m_addTimestepToCurveName, "AddTimestepToCurveName", false, " Timestep", "", "", "");
CAF_PDM_InitField(&m_addDateToCurveName, "AddDateToCurveName", true, " Date", "", "", "");
updateOptionSensitivity(); updateOptionSensitivity();
} }
@ -129,7 +130,8 @@ void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* chan
if (changedField == &m_addCaseNameToCurveName || if (changedField == &m_addCaseNameToCurveName ||
changedField == &m_addPropertyToCurveName || changedField == &m_addPropertyToCurveName ||
changedField == &m_addWellNameToCurveName || changedField == &m_addWellNameToCurveName ||
changedField == &m_addTimestepToCurveName) changedField == &m_addTimestepToCurveName ||
changedField == &m_addDateToCurveName)
{ {
this->uiCapability()->updateConnectedEditors(); this->uiCapability()->updateConnectedEditors();
updateCurveName(); updateCurveName();
@ -329,6 +331,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
appearanceGroup->add(&m_addCaseNameToCurveName); appearanceGroup->add(&m_addCaseNameToCurveName);
appearanceGroup->add(&m_addPropertyToCurveName); appearanceGroup->add(&m_addPropertyToCurveName);
appearanceGroup->add(&m_addWellNameToCurveName); appearanceGroup->add(&m_addWellNameToCurveName);
appearanceGroup->add(&m_addDateToCurveName);
appearanceGroup->add(&m_addTimestepToCurveName); appearanceGroup->add(&m_addTimestepToCurveName);
} }
@ -531,13 +534,8 @@ QString RimWellLogExtractionCurve::createCurveName()
generatedCurveName = m_geomResultDefinition->resultFieldUiName() + "." + resCompName; generatedCurveName = m_geomResultDefinition->resultFieldUiName() + "." + resCompName;
} }
if (m_addTimestepToCurveName) if (m_addTimestepToCurveName || m_addDateToCurveName)
{ {
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
size_t maxTimeStep = 0; size_t maxTimeStep = 0;
QStringList timeStepNames; QStringList timeStepNames;
@ -556,11 +554,25 @@ QString RimWellLogExtractionCurve::createCurveName()
timeStepNames = geomCase->timeStepStrings(); timeStepNames = geomCase->timeStepStrings();
} }
if (m_timeStep < timeStepNames.size()) if (m_addDateToCurveName && m_timeStep < timeStepNames.size())
{ {
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += timeStepNames[m_timeStep]; generatedCurveName += timeStepNames[m_timeStep];
} }
generatedCurveName += QString("[%1/%2]").arg(m_timeStep()).arg(maxTimeStep);
if (m_addTimestepToCurveName)
{
if (!generatedCurveName.isEmpty())
{
generatedCurveName += ",";
}
generatedCurveName += QString("[%1/%2]").arg(m_timeStep()).arg(maxTimeStep);
}
} }
return generatedCurveName; return generatedCurveName;

1
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h
View File

@ -66,6 +66,7 @@ protected:
caf::PdmField<bool> m_addPropertyToCurveName; caf::PdmField<bool> m_addPropertyToCurveName;
caf::PdmField<bool> m_addWellNameToCurveName; caf::PdmField<bool> m_addWellNameToCurveName;
caf::PdmField<bool> m_addTimestepToCurveName; caf::PdmField<bool> m_addTimestepToCurveName;
caf::PdmField<bool> m_addDateToCurveName;
private: private:
static void validValuesIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals); static void validValuesIntervals(const std::vector<double>& values, std::vector< std::pair<size_t, size_t> >& intervals);