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

#4096 Make sure the base time steps are taken from the base case

Browse Source 
* Also clear time lapse option when changing base case. We don't know if the currently
  selected time step exists in the new case.
This commit is contained in:
Gaute Lindkvist
2019-02-15 13:09:50 +01:00
parent e0913d8a21
commit aeb964a89a
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -252,8 +252,13 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
loadDataAndUpdate(); loadDataAndUpdate();
} }
if (&m_timeLapseBaseTimestep == changedField || if (&m_differenceCase == changedField)
&m_differenceCase == changedField) {
m_timeLapseBaseTimestep = RigEclipseResultAddress::NO_TIME_LAPSE;
loadDataAndUpdate();
}
if (&m_timeLapseBaseTimestep == changedField)
{ {
loadDataAndUpdate(); loadDataAndUpdate();
} }
@@ -611,26 +616,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
if (fieldNeedingOptions == &m_resultVariableUiField) if (fieldNeedingOptions == &m_resultVariableUiField)
{ {
options = calcOptionsForVariableUiFieldStandard(); options = calcOptionsForVariableUiFieldStandard();
} }
else if (fieldNeedingOptions == &m_timeLapseBaseTimestep)
{
std::vector<QDateTime> stepDates;
const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults();
if (gridCellResults)
{
stepDates = gridCellResults->timeStepDates();
}
options.push_back(caf::PdmOptionItemInfo("Disabled", RigEclipseResultAddress::NO_TIME_LAPSE));
for (size_t stepIdx = 0; stepIdx < stepDates.size(); ++stepIdx)
{
QString displayString = stepDates[stepIdx].toString(RimTools::dateFormatString());
displayString += QString(" (#%1)").arg(stepIdx);
options.push_back(caf::PdmOptionItemInfo(displayString, static_cast<int>(stepIdx)));
}
}
else if (fieldNeedingOptions == &m_differenceCase) else if (fieldNeedingOptions == &m_differenceCase)
{ {
options.push_back(caf::PdmOptionItemInfo("None", nullptr)); options.push_back(caf::PdmOptionItemInfo("None", nullptr));
@@ -655,6 +641,28 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
} }
} }
} }
else if (fieldNeedingOptions == &m_timeLapseBaseTimestep)
{
RimEclipseCase* currentCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted(currentCase);
RimEclipseCase* baseCase = currentCase;
if (m_differenceCase)
{
baseCase = m_differenceCase;
}
options.push_back(caf::PdmOptionItemInfo("Disabled", RigEclipseResultAddress::NO_TIME_LAPSE));
std::vector<QDateTime> stepDates = baseCase->timeStepDates();
for (size_t stepIdx = 0; stepIdx < stepDates.size(); ++stepIdx)
{
QString displayString = stepDates[stepIdx].toString(RimTools::dateFormatString());
displayString += QString(" (#%1)").arg(stepIdx);
options.push_back(caf::PdmOptionItemInfo(displayString, static_cast<int>(stepIdx)));
}
}
} }
(*useOptionsOnly) = true; (*useOptionsOnly) = true;