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

Merge branch 'dev' of https://github.com/OPM/ResInsight into dev

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-29 14:46:31 +01:00
commit 5338a6c2ec
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@ -98,6 +98,7 @@ void RimSummaryCurveCollection::loadDataAndUpdate(bool updateParentPlot)
for (RimSummaryCurve* curve : m_curves) for (RimSummaryCurve* curve : m_curves)
{ {
curve->loadDataAndUpdate(false); curve->loadDataAndUpdate(false);
curve->updateQwtPlotAxis();
} }
if ( updateParentPlot ) if ( updateParentPlot )

4
ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@ -140,7 +140,9 @@ void RiuSummaryQwtPlot::setZoomWindow(const QwtInterval& leftAxis, const QwtInte
zoomWindow.setTop(leftAxis.maxValue()); zoomWindow.setTop(leftAxis.maxValue());
zoomWindow.setBottom(leftAxis.minValue()); zoomWindow.setBottom(leftAxis.minValue());
m_zoomerLeft->blockSignals(true);
m_zoomerLeft->zoom(zoomWindow); m_zoomerLeft->zoom(zoomWindow);
m_zoomerLeft->blockSignals(false);
} }
{ {
@ -150,8 +152,10 @@ void RiuSummaryQwtPlot::setZoomWindow(const QwtInterval& leftAxis, const QwtInte
zoomWindow.setTop(rightAxis.maxValue()); zoomWindow.setTop(rightAxis.maxValue());
zoomWindow.setBottom(rightAxis.minValue()); zoomWindow.setBottom(rightAxis.minValue());
// No need to block signal since there is no connected slot
m_zoomerRight->zoom(zoomWindow); m_zoomerRight->zoom(zoomWindow);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------