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

#871 Keep new zoom settings when toggling the curves/curve filter

Browse Source
This commit is contained in:
Jacob Støren
2016-10-05 13:56:27 +02:00
parent b3657bcf43
commit b2728b070b
6 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp
View File

@@ -323,7 +323,7 @@ void RimSummaryCurve::updateZoomInParentPlot()
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType(plot);
plot->updateZoom();
plot->updateZoomInQwt();
}
//--------------------------------------------------------------------------------------------------

37
ApplicationCode/ProjectDataModel/RimSummaryPlot.cpp
View File

@@ -160,6 +160,24 @@ QWidget* RimSummaryPlot::viewer()
return m_qwtPlot;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::setZoomWindow(const QRectF& zoomWindow)
{
if(!zoomWindow.isEmpty())
{
std::vector<float> window;
window.push_back(zoomWindow.left());
window.push_back(zoomWindow.top());
window.push_back(zoomWindow.width());
window.push_back(zoomWindow.height());
m_visibleWindow = window;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -168,6 +186,7 @@ void RimSummaryPlot::zoomAll()
if (m_qwtPlot)
{
m_qwtPlot->zoomAll();
this->setZoomWindow(m_qwtPlot->currentVisibleWindow());
}
}
@@ -239,19 +258,7 @@ void RimSummaryPlot::setupBeforeSave()
this->setMdiWindowGeometry(RiaApplication::instance()->mainPlotWindow()->windowGeometryForViewer(m_qwtPlot));
}
QRectF visibleWindow = m_qwtPlot->currentVisibleWindow();
if (!visibleWindow.isEmpty())
{
//QRectF(qreal left, qreal top, qreal width, qreal height);
std::vector<float> window;
window.push_back(visibleWindow.left());
window.push_back(visibleWindow.top());
window.push_back(visibleWindow.width());
window.push_back(visibleWindow.height());
m_visibleWindow = window;
}
this->setZoomWindow(m_qwtPlot->currentVisibleWindow());
}
}
@@ -296,13 +303,13 @@ void RimSummaryPlot::loadDataAndUpdate()
this->updateYAxisUnit();
updateZoom();
updateZoomInQwt();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateZoom()
void RimSummaryPlot::updateZoomInQwt()
{
if (!m_qwtPlot) return;

4
ApplicationCode/ProjectDataModel/RimSummaryPlot.h
View File

@@ -53,7 +53,6 @@ public:
void loadDataAndUpdate();
void updateZoom();
void handleViewerDeletion();
void updateYAxisUnit();
@@ -61,8 +60,9 @@ public:
QWidget* viewer();
void setZoomWindow(const QRectF& zoomWindow);
virtual void zoomAll() override;
void updateZoomInQwt();
protected:
// Overridden PDM methods