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

#2091 Cross Plot : Update UI text for x axis address

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-15 08:20:54 +01:00
parent 42ee25d29e
commit c0d26a1d4e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ QString RimSummaryCurve::createCurveAutoName()
void RimSummaryCurve::updateZoomInParentPlot() void RimSummaryCurve::updateZoomInParentPlot()
{ {
RimSummaryPlot* plot = nullptr; RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType(plot); firstAncestorOrThisOfTypeAsserted(plot);
plot->updateZoomInQwt(); plot->updateZoomInQwt();
} }
@ -332,13 +332,15 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
this->RimPlotCurve::updateCurvePresentation(updateParentPlot); this->RimPlotCurve::updateCurvePresentation(updateParentPlot);
m_yValuesSelectedVariableDisplayField = QString::fromStdString(m_yValuesCurveVariable->address().uiText()); m_yValuesSelectedVariableDisplayField = QString::fromStdString(m_yValuesCurveVariable->address().uiText());
m_yValuesUiFilterResultSelection = m_yValuesCurveVariable->address(); m_yValuesUiFilterResultSelection = m_yValuesCurveVariable->address();
m_xValuesSelectedVariableDisplayField = QString::fromStdString(m_xValuesCurveVariable->address().uiText());
m_xValuesUiFilterResultSelection = m_xValuesCurveVariable->address();
updateConnectedEditors(); updateConnectedEditors();
if (isCurveVisible()) if (isCurveVisible())
{ {
std::vector<time_t> dateTimes = this->timeSteps();
std::vector<double> yValues = this->yValues(); std::vector<double> yValues = this->yValues();
RimSummaryPlot* plot = nullptr; RimSummaryPlot* plot = nullptr;
@ -362,6 +364,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
} }
else else
{ {
std::vector<time_t> dateTimes = this->timeSteps();
if (dateTimes.size() > 0 && dateTimes.size() == yValues.size()) if (dateTimes.size() > 0 && dateTimes.size() == yValues.size())
{ {
if (plot->timeAxisProperties()->timeMode() == RimSummaryTimeAxisProperties::DATE) if (plot->timeAxisProperties()->timeMode() == RimSummaryTimeAxisProperties::DATE)
@ -397,7 +400,7 @@ void RimSummaryCurve::onLoadDataAndUpdate(bool updateParentPlot)
m_qwtPlotCurve->setSamplesFromXValuesAndYValues(std::vector<double>(), std::vector<double>(), isLogCurve); m_qwtPlotCurve->setSamplesFromXValuesAndYValues(std::vector<double>(), std::vector<double>(), isLogCurve);
} }
if ( updateParentPlot && m_parentQwtPlot) if (updateParentPlot && m_parentQwtPlot)
{ {
updateZoomInParentPlot(); updateZoomInParentPlot();
m_parentQwtPlot->replot(); m_parentQwtPlot->replot();