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

#4276 RFT-plot: Add support for Measured Depth as Y-axis

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-03 12:27:49 +02:00
parent 7d78956781
commit e486432391
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -856,12 +856,39 @@ void RimWellRftPlot::onLoadDataAndUpdate()
updateMdiWindowVisibility(); updateMdiWindowVisibility();
updateFormationsOnPlot(); updateFormationsOnPlot();
if (m_wellLogPlot->depthType() == RimWellLogPlot::MEASURED_DEPTH)
{
assignWellPathToExtractionCurves();
}
m_wellLogPlot->loadDataAndUpdate(); m_wellLogPlot->loadDataAndUpdate();
updateEditorsFromCurves(); updateEditorsFromCurves();
updateWidgetTitleWindowTitle(); updateWidgetTitleWindowTitle();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::assignWellPathToExtractionCurves()
{
RimProject* proj = RiaApplication::instance()->project();
RimWellPath* wellPath = proj->wellPathByName(m_wellPathNameOrSimWellName);
if (wellPath)
{
for (RimWellLogCurve* curve : m_wellLogPlot->trackByIndex(0)->curvesVector())
{
auto extractionCurve = dynamic_cast<RimWellLogExtractionCurve*>(curve);
if (extractionCurve)
{
extractionCurve->setTrajectoryType(RimWellLogExtractionCurve::WELL_PATH);
extractionCurve->setWellPath(wellPath);
}
}
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
View File

@ -106,6 +106,7 @@ private:
void updateEditorsFromCurves(); void updateEditorsFromCurves();
void updateWidgetTitleWindowTitle(); void updateWidgetTitleWindowTitle();
void syncCurvesFromUiSelection(); void syncCurvesFromUiSelection();
void assignWellPathToExtractionCurves();
std::set<RiaRftPltCurveDefinition> selectedCurveDefs() const; std::set<RiaRftPltCurveDefinition> selectedCurveDefs() const;
std::set<RiaRftPltCurveDefinition> curveDefsFromCurves() const; std::set<RiaRftPltCurveDefinition> curveDefsFromCurves() const;

20
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@ -178,13 +178,17 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{ {
RimWellAllocationPlot* wellAllocPlot; RimWellAllocationPlot* wellAllocPlot;
firstAncestorOrThisOfType(wellAllocPlot); firstAncestorOrThisOfType(wellAllocPlot);
if (wellAllocPlot) wellAllocPlot->loadDataAndUpdate(); if (wellAllocPlot)
else if (isRftPlotChild()) rftPlot()->loadDataAndUpdate();
else
{ {
updateTracks(); wellAllocPlot->loadDataAndUpdate();
updateDepthZoom();
} }
else if (isRftPlotChild())
{
rftPlot()->loadDataAndUpdate();
}
updateTracks();
updateDepthZoom();
} }
else if ( changedField == &m_depthUnit) else if ( changedField == &m_depthUnit)
{ {
@ -586,8 +590,7 @@ void RimWellLogPlot::uiOrderingForDepthAxis(caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Depth Axis"); caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Depth Axis");
RimWellRftPlot* rftp = rftPlot(); if (!pltPlot())
if (!(rftp || pltPlot()))
{ {
gridGroup->add(&m_depthType); gridGroup->add(&m_depthType);
} }
@ -595,7 +598,7 @@ void RimWellLogPlot::uiOrderingForDepthAxis(caf::PdmUiOrdering& uiOrdering)
RimWellAllocationPlot* wap; RimWellAllocationPlot* wap;
firstAncestorOrThisOfType(wap); firstAncestorOrThisOfType(wap);
if (!(wap || rftp)) if (!wap)
{ {
gridGroup->add(&m_depthUnit); gridGroup->add(&m_depthUnit);
} }
@ -1127,7 +1130,6 @@ void RimWellLogPlot::updateDisabledDepthTypes()
} }
else if (isRftPlotChild()) else if (isRftPlotChild())
{ {
m_disabledDepthTypes.insert(MEASURED_DEPTH);
m_disabledDepthTypes.insert(PSEUDO_LENGTH); m_disabledDepthTypes.insert(PSEUDO_LENGTH);
m_disabledDepthTypes.insert(CONNECTION_NUMBER); m_disabledDepthTypes.insert(CONNECTION_NUMBER);
} }