OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-23 23:13:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2153 Cross Plot : Show warning when no overlapping time steps are present

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-21 11:52:49 +01:00
parent a51b4be1dc
commit d19089710c
3 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -35,6 +35,7 @@
#include "RimSummaryFilter.h"
#include "RimSummaryPlot.h"
#include "RimSummaryTimeAxisProperties.h"
#include "RimTools.h"
#include "RiuLineSegmentQwtPlotCurve.h"
#include "RiuSummaryCurveDefSelectionDialog.h"
@ -47,6 +48,8 @@
#include "qwt_date.h"
#include <QMessageBox>
// See also corresponding fake implementations in RimSummaryCurveFilter
QTextStream& operator << (QTextStream& str, const RifEclipseSummaryAddress& sobj)
@ -268,7 +271,7 @@ std::vector<double> RimSummaryCurve::valuesX() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RimSummaryCurve::timeSteps() const
const std::vector<time_t>& RimSummaryCurve::timeStepsY() const
{
static std::vector<time_t> emptyVector;
RifSummaryReaderInterface* reader = valuesSummaryReaderY();
@ -394,7 +397,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
auto curveValuesX = this->valuesX();
auto curveTimeStepsX = timeStepsX();
auto curveTimeStepsY = timeSteps();
auto curveTimeStepsY = timeStepsY();
if (curveValuesY.empty() || curveValuesX.empty())
{
@ -421,7 +424,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
}
else
{
std::vector<time_t> curveTimeStepsY = this->timeSteps();
std::vector<time_t> curveTimeStepsY = this->timeStepsY();
if (curveTimeStepsY.size() > 0 && curveTimeStepsY.size() == curveValuesY.size())
{
if (plot->timeAxisProperties()->timeMode() == RimSummaryTimeAxisProperties::DATE)
@ -616,6 +619,7 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
CVF_ASSERT(plot);
bool loadAndUpdate = false;
bool crossPlotTestForMatchingTimeSteps = false;
if(changedField == &m_yValuesUiFilterResultSelection)
{
@ -661,6 +665,7 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
m_yValuesSummaryCase = curveSelection[0].summaryCase();
m_yValuesCurveVariable->setAddress(curveSelection[0].summaryAddress());
crossPlotTestForMatchingTimeSteps = true;
loadAndUpdate = true;
}
}
@ -680,6 +685,7 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
m_xValuesSummaryCase = curveSelection[0].summaryCase();
m_xValuesCurveVariable->setAddress(curveSelection[0].summaryAddress());
crossPlotTestForMatchingTimeSteps = true;
loadAndUpdate = true;
}
}
@ -687,6 +693,61 @@ void RimSummaryCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
m_xPushButtonSelectSummaryAddress = false;
}
if (crossPlotTestForMatchingTimeSteps)
{
auto curveValuesX = this->valuesX();
auto curveTimeStepsX = timeStepsX();
auto curveValuesY = this->valuesY();
auto curveTimeStepsY = timeStepsY();
if (!curveValuesX.empty() && !curveValuesY.empty())
{
RigTimeHistoryCurveMerger curveMerger;
curveMerger.addCurveData(curveValuesX, curveTimeStepsX);
curveMerger.addCurveData(curveValuesY, curveTimeStepsY);
curveMerger.computeInterpolatedValues();
if (curveMerger.validIntervalsForAllTimeSteps().size() == 0)
{
QString description;
{
QDateTime first = QDateTime::fromTime_t(curveTimeStepsX.front());
QDateTime last = QDateTime::fromTime_t(curveTimeStepsX.back());
std::vector<QDateTime> timeSteps;
timeSteps.push_back(first);
timeSteps.push_back(last);
QString formatString = RimTools::createTimeFormatStringFromDates(timeSteps);
description += QString("Time step range for X : '%1' - '%2'")
.arg(first.toString(formatString))
.arg(last.toString(formatString));
}
{
QDateTime first = QDateTime::fromTime_t(curveTimeStepsY.front());
QDateTime last = QDateTime::fromTime_t(curveTimeStepsY.back());
std::vector<QDateTime> timeSteps;
timeSteps.push_back(first);
timeSteps.push_back(last);
QString formatString = RimTools::createTimeFormatStringFromDates(timeSteps);
description += "\n";
description += QString("Time step range for Y : '%1' - '%2'")
.arg(first.toString(formatString))
.arg(last.toString(formatString));
}
QMessageBox::warning(NULL, "Detected no overlapping time steps", description);
}
}
}
if (loadAndUpdate)
{
this->loadDataAndUpdate(true);

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@ -60,6 +60,7 @@ public:
std::vector<double> valuesY() const;
void setLeftOrRightAxisY(RiaDefines::PlotAxis plotAxis);
RiaDefines::PlotAxis axisY() const;
const std::vector<time_t>& timeStepsY() const;
// X Axis functions
RifEclipseSummaryAddress summaryAddressX() const;
@ -67,7 +68,6 @@ public:
std::vector<double> valuesX() const;
// Other
const std::vector<time_t>& timeSteps() const;
void updateQwtPlotAxis();
void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings);

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -228,9 +228,9 @@ time_t RimSummaryPlot::firstTimeStepOfFirstCurve()
++i;
}
if (firstCurve && firstCurve->timeSteps().size() > 0)
if (firstCurve && firstCurve->timeStepsY().size() > 0)
{
return firstCurve->timeSteps()[0];
return firstCurve->timeStepsY()[0];
}
else return time_t(0);
}
@ -278,7 +278,7 @@ QString RimSummaryPlot::asciiDataForPlotExport() const
{
caseNames.push_back(curveCaseName);
std::vector<time_t> curveTimeSteps = curve->timeSteps();
std::vector<time_t> curveTimeSteps = curve->timeStepsY();
timeSteps.push_back(curveTimeSteps);
std::vector<std::vector<double> > curveDataForCase;