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

#4219 Contact Pressure plots : Add color to annotation lines

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-22 15:11:56 +01:00
parent 49c66d0a5f
commit 0dd5d40199
7 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp
View File

@@ -147,7 +147,7 @@ void RimGridCrossPlotCurveSet::setCellFilterView(RimGridView* cellFilterView)
m_xAxisProperty->setResultType(resAddr.m_resultCatType);
m_xAxisProperty->setResultVariable(resAddr.m_resultName);
m_yAxisProperty->setResultType(RiaDefines::STATIC_NATIVE);
m_yAxisProperty->setResultVariable("DEPTH");
m_yAxisProperty->setResultVariable("DEPTH");
m_timeStep = eclipseView->currentTimeStep();
m_grouping = NO_GROUPING;
@@ -158,7 +158,7 @@ void RimGridCrossPlotCurveSet::setCellFilterView(RimGridView* cellFilterView)
parentPlot->setYAxisInverted(true);
}
}
}
}
}
//--------------------------------------------------------------------------------------------------
@@ -507,7 +507,7 @@ void RimGridCrossPlotCurveSet::assignCurveDataGroups(const RigEclipseCrossPlotRe
if (!result.groupValuesDiscrete.empty())
m_groupedResults[categoryNum].groupValuesDiscrete.push_back(result.groupValuesDiscrete[i]);
}
}
}
}
}
@@ -534,7 +534,7 @@ void RimGridCrossPlotCurveSet::createCurves(const RigEclipseCrossPlotResult& res
curve->setSamples(result.xValues, result.yValues);
curve->setCurveAutoAppearance();
curve->updateUiIconFromPlotSymbol();
m_crossPlotCurves.push_back(curve);
m_crossPlotCurves.push_back(curve);
}
else
{
@@ -1061,6 +1061,13 @@ void RimGridCrossPlotCurveSet::configureForPressureSaturationCurves(RimEclipseRe
m_yAxisProperty->setResultVariable("DEPTH");
m_grouping = NO_GROUPING;
m_nameConfig->setCustomName(dynamicResultName);
m_nameConfig->addCaseName = false;
m_nameConfig->addAxisVariables = false;
m_nameConfig->addTimestep = false;
m_nameConfig->addGrouping = false;
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp
View File

@@ -61,6 +61,9 @@ void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclip
plot->setAsPlotMdiWindow();
int equilibriumRegion = static_cast<int>(i);
// As discussed with Liv Merete, it is not any use for creation of different plots for matrix/fracture. For now, use
// hardcoded value for MATRIX
plot->assignCaseAndEquilibriumRegion(RiaDefines::MATRIX_MODEL, eclipseResultCase, equilibriumRegion);
m_saturationPressurePlots.push_back(plot);

17
ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp
View File

@@ -116,6 +116,23 @@ double RimPlotAxisAnnotation::value() const
return m_value();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QColor RimPlotAxisAnnotation::color() const
{
if (m_annotationType() == PL_EQUIL_WATER_OIL_CONTACT)
{
return QColor(0, 0, 0);
}
else if (m_annotationType() == PL_EQUIL_GAS_OIL_CONTACT)
{
return QColor(220, 0, 0);
}
return QColor(0, 0, 100);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.h
View File

@@ -54,6 +54,7 @@ public:
QString name() const;
double value() const;
QColor color() const;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;