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

#2421 RelPerm: Remove invalid points on transparent curve

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-30 13:30:05 +01:00
parent 9f08f1264a
commit 4094fd1861
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@@ -22,6 +22,7 @@
#include "RiuLineSegmentQwtPlotCurve.h" #include "RiuLineSegmentQwtPlotCurve.h"
#include "RiuTextDialog.h" #include "RiuTextDialog.h"
#include "RigCurveDataTools.h"
#include "RigFlowDiagSolverInterface.h" #include "RigFlowDiagSolverInterface.h"
#include "cvfBase.h" #include "cvfBase.h"
@@ -232,7 +233,7 @@ void RiuRelativePermeabilityPlotPanel::plotUiSelectedCurves()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Add a transparent curve to make tooltip available on given points. /// Add a transparent curve to make tooltip available on given points.
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuRelativePermeabilityPlotPanel::addTransparentCurve(QwtPlot* plot, const std::vector<QPointF>& points, const std::vector<WhichYAxis>& axes) void RiuRelativePermeabilityPlotPanel::addTransparentCurve(QwtPlot* plot, const std::vector<QPointF>& points, const std::vector<WhichYAxis>& axes, bool logScaleLeftAxis)
{ {
QwtPlotCurve* curveLeftAxis = new QwtPlotCurve(); QwtPlotCurve* curveLeftAxis = new QwtPlotCurve();
QwtPlotCurve* curveRightAxis = new QwtPlotCurve(); QwtPlotCurve* curveRightAxis = new QwtPlotCurve();
@@ -245,6 +246,8 @@ void RiuRelativePermeabilityPlotPanel::addTransparentCurve(QwtPlot* plot, const
for (size_t i = 0; i < points.size(); i++) for (size_t i = 0; i < points.size(); i++)
{ {
if (!RigCurveDataTools::isValidValue(points[i].y(), logScaleLeftAxis)) continue;
if (axes[i] == LEFT_YAXIS) if (axes[i] == LEFT_YAXIS)
{ {
pointsOnLeftAxis.push_back(points[i]); pointsOnLeftAxis.push_back(points[i]);
@@ -382,7 +385,7 @@ void RiuRelativePermeabilityPlotPanel::plotCurvesInQwt(RiaEclipseUnitTools::Unit
plot->enableAxis(QwtPlot::yRight, shouldEnableRightYAxis); plot->enableAxis(QwtPlot::yRight, shouldEnableRightYAxis);
addTransparentCurve(plot, points, axes); addTransparentCurve(plot, points, axes, logScaleLeftAxis);
// Add vertical marker lines to indicate cell SWAT and/or SGAS saturations // Add vertical marker lines to indicate cell SWAT and/or SGAS saturations
if (swat != HUGE_VAL) if (swat != HUGE_VAL)

2
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h
View File

@@ -103,7 +103,7 @@ private:
static double interpolatedCurveYValue(const std::vector<double>& xVals, const std::vector<double>& yVals, double x); static double interpolatedCurveYValue(const std::vector<double>& xVals, const std::vector<double>& yVals, double x);
static void addTransparentCurve(QwtPlot* plot, const std::vector<QPointF>& points, const std::vector<WhichYAxis>& axes); static void addTransparentCurve(QwtPlot* plot, const std::vector<QPointF>& points, const std::vector<WhichYAxis>& axes, bool logScaleLeftAxis);
std::vector<RigFlowDiagSolverInterface::RelPermCurve> gatherUiSelectedCurves() const; std::vector<RigFlowDiagSolverInterface::RelPermCurve> gatherUiSelectedCurves() const;
QString asciiDataForUiSelectedCurves() const; QString asciiDataForUiSelectedCurves() const;