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

#2123 Formation/Well Path: Make well formations only valid for MD plot

Browse Source
This commit is contained in:
Rebecca Cox 2017-11-28 11:32:54 +01:00
parent 38e2b7a74a
commit d48113dcdb
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -1156,14 +1156,6 @@ void RimWellLogTrack::setFormationFieldsUiReadOnly(bool readOnly /*= true*/)
m_formationBranchIndex.uiCapability()->setUiReadOnly(readOnly);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::updateFormationNamesFromCase()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -1181,6 +1173,9 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
std::vector<QString> formationNamesToPlot;
std::vector<std::pair<double, double>> yValues;
RimWellLogPlot* plot = nullptr;
firstAncestorOrThisOfTypeAsserted(plot);
if (m_formationSource == CASE)
{
if ((m_formationSimWellName == QString("None") && m_formationWellPath == nullptr) || m_formationCase == nullptr) return;
@ -1190,11 +1185,10 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
RimWellLogPlotCollection* wellLogCollection = mainPlotCollection->wellLogPlotCollection();
CurveSamplingPointData curveData;
RigEclipseWellLogExtractor* eclWellLogExtractor;
RigGeoMechWellLogExtractor* geoMechWellLogExtractor;
RigEclipseWellLogExtractor* eclWellLogExtractor = nullptr;
RigGeoMechWellLogExtractor* geoMechWellLogExtractor = nullptr;
if (m_formationTrajectoryType == SIMULATION_WELL)
{
@ -1232,9 +1226,6 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
RigFemResultAddress(RIG_FORMATION_NAMES, activeFormationNamesResultName, ""));
}
RimWellLogPlot* plot;
firstAncestorOrThisOfTypeAsserted(plot);
std::vector<QString> formationNamesVector = RimWellLogTrack::formationNamesVector(m_formationCase);
RimWellLogTrack::findFormationNamesToPlot(curveData,
@ -1246,6 +1237,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
else
{
if (m_formationWellPath == nullptr) return;
if (plot->depthType() != RimWellLogPlot::MEASURED_DEPTH) return;
std::vector<double> topYValues;

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@ -148,8 +148,6 @@ private:
void setFormationFieldsUiReadOnly(bool readOnly = true);
void updateFormationNamesFromCase();
void updateFormationNamesFromWellPath();
void updateFormationNamesOnPlot();
void removeFormationNames();
void updateAxisScaleEngine();