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

(#557, #560, #561) WLP: Massive renaming in WellLogCurveData. Fixed undiscovered bug.

Browse Source 
Curves plotted by TVD was not correctly splitted where well path went out in free air.
This commit is contained in:
Jacob Støren
2015-10-15 23:12:18 +02:00
parent aeeb445dae
commit 5d642719b7
7 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/UserInterface/RiuWellLogPlotCurve.cpp
View File

@@ -43,12 +43,12 @@ void RiuWellLogPlotCurve::drawCurve(QPainter* p, int style,
const QwtScaleMap& xMap, const QwtScaleMap& yMap,
const QRectF& canvasRect, int from, int to) const
{
size_t intervalCount = m_intervals.size();
size_t intervalCount = m_polyLineStartStopIndices.size();
if (intervalCount > 0)
{
for (size_t intIdx = 0; intIdx < intervalCount; intIdx++)
{
QwtPlotCurve::drawCurve(p, style, xMap, yMap, canvasRect, (int) m_intervals[intIdx].first, (int) m_intervals[intIdx].second);
QwtPlotCurve::drawCurve(p, style, xMap, yMap, canvasRect, (int) m_polyLineStartStopIndices[intIdx].first, (int) m_polyLineStartStopIndices[intIdx].second);
}
}
else QwtPlotCurve::drawCurve(p, style, xMap, yMap, canvasRect, from, to);
@@ -61,9 +61,9 @@ void RiuWellLogPlotCurve::setCurveData(const RigWellLogCurveData* curveData)
{
CVF_ASSERT(curveData);
std::vector<double> validXValues = curveData->validXValues();
std::vector<double> validYValues = curveData->validYValues();
std::vector<double> validXValues = curveData->xPlotValues();
std::vector<double> validYValues = curveData->depthPlotValues();
setSamples(validXValues.data(), validYValues.data(), (int) validXValues.size());
m_intervals = curveData->validPointsIntervals();
m_polyLineStartStopIndices = curveData->polylineStartStopIndices();
}

2
ApplicationCode/UserInterface/RiuWellLogPlotCurve.h
View File

@@ -45,5 +45,5 @@ protected:
const QRectF& canvasRect, int from, int to) const;
private:
std::vector< std::pair<size_t, size_t> > m_intervals;
std::vector< std::pair<size_t, size_t> > m_polyLineStartStopIndices;
};