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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad
2019-02-18 10:55:35 +01:00
parent f9021117f4
commit fdf3313320
3 changed files with 125 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -169,7 +169,7 @@ void RimEclipseResultDefinition::simpleCopy(const RimEclipseResultDefinition* ot
m_flowTracerSelectionMode = other->m_flowTracerSelectionMode();
m_phaseSelection = other->m_phaseSelection;
m_differenceCase = other->m_differenceCase();
m_differenceCase = other->m_differenceCase();
m_timeLapseBaseTimestep = other->m_timeLapseBaseTimestep();
}
@@ -238,9 +238,9 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (&m_resultVariableUiField == changedField)
{
m_porosityModel = m_porosityModelUiField;
m_resultType = m_resultTypeUiField;
m_resultVariable = m_resultVariableUiField;
m_porosityModel = m_porosityModelUiField;
m_resultType = m_resultTypeUiField;
m_resultVariable = m_resultVariableUiField;
if (m_resultTypeUiField() == RiaDefines::FLOW_DIAGNOSTICS)
{
@@ -261,7 +261,7 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
loadDataAndUpdate();
}
if (&m_timeLapseBaseTimestep == changedField)
if (&m_timeLapseBaseTimestep == changedField)
{
loadDataAndUpdate();
}
@@ -619,7 +619,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
if (fieldNeedingOptions == &m_resultVariableUiField)
{
options = calcOptionsForVariableUiFieldStandard();
}
}
else if (fieldNeedingOptions == &m_differenceCase)
{
options.push_back(caf::PdmOptionItemInfo("None", nullptr));
@@ -638,8 +638,11 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
if (otherCase->eclipseCaseData() && otherCase->eclipseCaseData()->mainGrid())
{
options.push_back(
caf::PdmOptionItemInfo(QString("%1 (#%2)").arg(otherCase->caseUserDescription()).arg(otherCase->caseId()), otherCase, false, otherCase->uiIcon()));
options.push_back(caf::PdmOptionItemInfo(
QString("%1 (#%2)").arg(otherCase->caseUserDescription()).arg(otherCase->caseId()),
otherCase,
false,
otherCase->uiIcon()));
}
}
}
@@ -839,7 +842,8 @@ QString RimEclipseResultDefinition::diffResultUiName() const
if (gridCellResults)
{
stepDates = gridCellResults->timeStepDates();
diffResult += QString("<b>Base Time Step</b>: %1").arg(stepDates[m_timeLapseBaseTimestep()].toString(RimTools::dateFormatString()));
diffResult += QString("<b>Base Time Step</b>: %1")
.arg(stepDates[m_timeLapseBaseTimestep()].toString(RimTools::dateFormatString()));
}
}
if (isCaseDiffResult())
@@ -1017,9 +1021,9 @@ void RimEclipseResultDefinition::initAfterRead()
assignFlowSolutionFromCase();
}
m_porosityModelUiField = m_porosityModel;
m_resultTypeUiField = m_resultType;
m_resultVariableUiField = m_resultVariable;
m_porosityModelUiField = m_porosityModel;
m_resultTypeUiField = m_resultType;
m_resultVariableUiField = m_resultVariable;
m_flowSolutionUiField = m_flowSolution();
m_selectedInjectorTracersUiField = m_selectedInjectorTracers;
@@ -1269,10 +1273,8 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
m_differenceCase.uiCapability()->setUiReadOnly(!isCaseDiffResultAvailable());
m_timeLapseBaseTimestep.uiCapability()->setUiReadOnly(!isTimeDiffResultAvailable());
if (isCaseDiffResultAvailable())
differenceGroup->add(&m_differenceCase);
if (isTimeDiffResultAvailable())
differenceGroup->add(&m_timeLapseBaseTimestep);
if (isCaseDiffResultAvailable()) differenceGroup->add(&m_differenceCase);
if (isTimeDiffResultAvailable()) differenceGroup->add(&m_timeLapseBaseTimestep);
QString resultPropertyLabel = "Result Property";
if (isTimeDiffResult() || isCaseDiffResult())
@@ -1921,7 +1923,6 @@ void RimEclipseResultDefinition::syncProducerToInjectorSelection()
bool RimEclipseResultDefinition::enableDiffResultOptions() const
{
return m_diffResultOptionsEnabled;
}
//--------------------------------------------------------------------------------------------------
@@ -1929,9 +1930,7 @@ bool RimEclipseResultDefinition::enableDiffResultOptions() const
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultDefinition::isTimeDiffResultAvailable() const
{
return enableDiffResultOptions() &&
m_resultType() == RiaDefines::DYNAMIC_NATIVE &&
!isTernarySaturationSelected();
return enableDiffResultOptions() && m_resultType() == RiaDefines::DYNAMIC_NATIVE && !isTernarySaturationSelected();
}
//--------------------------------------------------------------------------------------------------
@@ -1948,9 +1947,8 @@ bool RimEclipseResultDefinition::isTimeDiffResult() const
bool RimEclipseResultDefinition::isCaseDiffResultAvailable() const
{
return enableDiffResultOptions() && !isTernarySaturationSelected() &&
(m_resultType() == RiaDefines::DYNAMIC_NATIVE ||
m_resultType() == RiaDefines::STATIC_NATIVE ||
m_resultType() == RiaDefines::GENERATED);
(m_resultType() == RiaDefines::DYNAMIC_NATIVE || m_resultType() == RiaDefines::STATIC_NATIVE ||
m_resultType() == RiaDefines::GENERATED);
}
//--------------------------------------------------------------------------------------------------