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

(#437) Using MD or TVD depth values for well log extraction curves

Browse Source 
Also renamed some methods for clarity, and fixed a bug in
RimWellLogPlot::updateViewerWidget(). Using this method instead of
loadDataAndUpdate() when toggling visibility of the plot.
This commit is contained in:
Pål Hagen 2015-09-11 10:44:10 +02:00
parent b841af62bb
commit d3909c5d27
9 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -120,7 +120,7 @@ void RicDeleteItemExec::redo()
parentObj->firstAnchestorOrThisOfType(wellLogPlotTrace);
if (wellLogPlotTrace)
{
wellLogPlotTrace->updateAxisRanges();
wellLogPlotTrace->updateAxisRangesAndReplot();
}
RimWellLogPlotCollection* wellLogPlotCollection = NULL;

13
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -32,9 +32,9 @@
#include "RigCaseCellResultsData.h"
#include "RigCaseData.h"
#include "RimWellLogPlotCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogPlotTrace.h"
#include "RiuWellLogTracePlot.h"
#include "qwt_plot_curve.h"
#include "RimWellLogPlotCollection.h"
@ -90,7 +90,7 @@ void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* chan
{
RimWellLogPlotCurve::fieldChangedByUi(changedField, oldValue, newValue);
if (changedField == &m_case)
if (changedField == &m_case)
{
this->updatePlotData();
}
@ -104,7 +104,6 @@ void RimWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* chan
{
this->updatePlotData();
}
}
//--------------------------------------------------------------------------------------------------
@ -136,7 +135,11 @@ void RimWellLogExtractionCurve::updatePlotData()
if (eclExtractor.notNull())
{
const std::vector<double>& depthValues = eclExtractor->measuredDepth();
RimWellLogPlot* wellLogPlot;
firstAnchestorOrThisOfType(wellLogPlot);
CVF_ASSERT(wellLogPlot);
const std::vector<double>& depthValues = wellLogPlot->depthType() == RimWellLogPlot::MEASURED_DEPTH ? eclExtractor->measuredDepth() : eclExtractor->trueVerticalDepth();
RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(m_eclipseResultDefinition->porosityModel());
m_eclipseResultDefinition->loadResult();
@ -192,7 +195,7 @@ void RimWellLogExtractionCurve::updatePlotData()
}
else if (plotTrace->curveCount() == 1)
{
plotTrace->updateAxisRanges();
plotTrace->updateAxisRangesAndReplot();
}
}
}

1
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.h
View File

@ -38,6 +38,7 @@ class RimWellLogExtractionCurve : public RimWellLogPlotCurve
public:
RimWellLogExtractionCurve();
virtual ~RimWellLogExtractionCurve();
virtual void updatePlotData();
protected:

30
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@ -101,11 +101,11 @@ void RimWellLogPlot::updateViewerWidget()
m_viewer = new RiuWellLogPlot(this, RiuMainWindow::instance());
recreateTracePlots();
RiuMainWindow::instance()->addViewer(m_viewer, windowGeometry());
RiuMainWindow::instance()->setActiveViewer(m_viewer);
}
RiuMainWindow::instance()->addViewer(m_viewer, windowGeometry());
RiuMainWindow::instance()->setActiveViewer(m_viewer);
updateAxisRanges();
updateViewerWidgetWindowTitle();
}
else
@ -130,7 +130,7 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
if (changedField == &m_showWindow)
{
updateViewerWidget();
loadDataAndUpdate();
}
else if (changedField == &m_minimumVisibleDepth || changedField == &m_maximumVisibleDepth)
{
@ -140,6 +140,10 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
updateViewerWidgetWindowTitle();
}
if (changedField == &m_depthType)
{
updateTraces();
}
}
//--------------------------------------------------------------------------------------------------
@ -289,7 +293,14 @@ void RimWellLogPlot::setupBeforeSave()
void RimWellLogPlot::loadDataAndUpdate()
{
updateViewerWidget();
updateTraces();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogPlot::updateTraces()
{
for (size_t tIdx = 0; tIdx < traces.size(); ++tIdx)
{
traces[tIdx]->loadDataAndUpdate();
@ -299,6 +310,7 @@ void RimWellLogPlot::loadDataAndUpdate()
updateAxisRanges();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -309,7 +321,7 @@ void RimWellLogPlot::updateAxisRanges()
double minDepth = m_minimumVisibleDepth < HUGE_VAL ? m_minimumVisibleDepth : RI_LOGPLOT_MINDEPTH_DEFAULT;
double maxDepth = m_maximumVisibleDepth > -HUGE_VAL ? m_maximumVisibleDepth : RI_LOGPLOT_MAXDEPTH_DEFAULT;
m_viewer->setDepthRange(minDepth, maxDepth);
m_viewer->setDepthRangeAndReplot(minDepth, maxDepth);
}
}
@ -391,3 +403,11 @@ void RimWellLogPlot::handleViewerDeletion()
uiCapability()->updateUiIconFromToggleField();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogPlot::DepthTypeEnum RimWellLogPlot::depthType() const
{
return m_depthType.value();
}

3
ApplicationCode/ProjectDataModel/RimWellLogPlot.h
View File

@ -56,6 +56,7 @@ public:
size_t traceCount() { return traces.size();}
void loadDataAndUpdate();
void updateTraces();
RiuWellLogPlot* viewer();
@ -71,6 +72,8 @@ public:
void updateAxisRanges();
void setVisibleDepthRangeFromContents();
DepthTypeEnum depthType() const;
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
protected:

12
ApplicationCode/ProjectDataModel/RimWellLogPlotTrace.cpp
View File

@ -44,8 +44,8 @@ RimWellLogPlotTrace::RimWellLogPlotTrace()
{
CAF_PDM_InitObject("Trace", "", "", "");
CAF_PDM_InitField(&show, "Show", true, "Show trace", "", "", "");
show.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_show, "Show", true, "Show trace", "", "", "");
m_show.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&curves, "Curves", "", "", "", "");
curves.uiCapability()->setUiHidden(true);
@ -67,9 +67,9 @@ RimWellLogPlotTrace::~RimWellLogPlotTrace()
//--------------------------------------------------------------------------------------------------
void RimWellLogPlotTrace::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &show)
if (changedField == &m_show)
{
if (m_viewer) m_viewer->setVisible(show());
if (m_viewer) m_viewer->setVisible(m_show());
}
else if (changedField == &m_minimumValue || changedField == &m_maximumValue)
{
@ -83,7 +83,7 @@ void RimWellLogPlotTrace::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimWellLogPlotTrace::objectToggleField()
{
return &show;
return &m_show;
}
//--------------------------------------------------------------------------------------------------
@ -195,7 +195,7 @@ void RimWellLogPlotTrace::detachAllCurves()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogPlotTrace::updateAxisRanges()
void RimWellLogPlotTrace::updateAxisRangesAndReplot()
{
bool rangesChanged = false;

4
ApplicationCode/ProjectDataModel/RimWellLogPlotTrace.h
View File

@ -50,7 +50,7 @@ public:
void loadDataAndUpdate();
bool availableDepthRange(double* minimumDepth, double* maximumDepth);
void updateAxisRanges();
void updateAxisRangesAndReplot();
RiuWellLogTracePlot* viewer();
@ -61,7 +61,7 @@ protected:
virtual caf::PdmFieldHandle* objectToggleField();
private:
caf::PdmField<bool> show;
caf::PdmField<bool> m_show;
caf::PdmChildArrayField<RimWellLogPlotCurve*> curves;
caf::PdmField<double> m_minimumValue;
caf::PdmField<double> m_maximumValue;

2
ApplicationCode/UserInterface/RiuWellLogPlot.cpp
View File

@ -76,7 +76,7 @@ void RiuWellLogPlot::insertTracePlot(RiuWellLogTracePlot* tracePlot)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuWellLogPlot::setDepthRange(double minDepth, double maxDepth)
void RiuWellLogPlot::setDepthRangeAndReplot(double minDepth, double maxDepth)
{
for (int tpIdx = 0; tpIdx < m_tracePlots.count(); tpIdx++)
{

2
ApplicationCode/UserInterface/RiuWellLogPlot.h
View File

@ -46,7 +46,7 @@ public:
void insertTracePlot(RiuWellLogTracePlot* tracePlot);
void setDepthRange(double minDepth, double maxDepth);
void setDepthRangeAndReplot(double minDepth, double maxDepth);
private:
void updateScrollBar(double minDepth, double maxDepth);