new fct Data2DItem::isZoomed instead of MaskEditorCanvas::isAxisRangeMatchData

GUI/Model/Data/Data2DItem.cpp

@@ -130,6 +130,11 @@ void Data2DItem::copyZRangeFromItem(DataItem* sourceItem)
     setZrange(source->lowerZ(), source->upperZ());
 }
 
+bool Data2DItem::isZoomed() const
+{
+    return lowerX() > xMin() || upperX() < xMax() || lowerY() > yMin() || upperY() < yMax();
+}
+
 QCPColorGradient Data2DItem::currentGradientQCP() const
 {
     if (gradient_map.contains(currentGradient()))

GUI/Model/Data/Data2DItem.h

@@ -48,6 +48,7 @@ public:
     double upperZ() const;
     void setZrange(double zmin, double zmax);
     void copyZRangeFromItem(DataItem* sourceItem);
+    bool isZoomed() const;
 
     //! Color scheme of the color map
     QCPColorGradient currentGradientQCP() const;

GUI/View/Mask/MaskEditorCanvas.cpp

@@ -101,30 +101,13 @@ void MaskEditorCanvas::onResetViewRequest()
 {
     m_view->onResetViewRequest();
 
-    if (isAxisRangeMatchData())
-        setZoomToROI();
-    else
+    if (m_data2DItem->isZoomed())
         m_data2DItem->resetView();
+    else
+        setZoomToROI();
     gProjectDocument.value()->setModified();
 }
 
-//! Returns true if IntensityData is currently at 100% zoom level
-
-bool MaskEditorCanvas::isAxisRangeMatchData() const
-{
-    ASSERT(m_data2DItem);
-
-    if (m_data2DItem->lowerX() != m_data2DItem->xMin())
-        return false;
-    if (m_data2DItem->upperX() != m_data2DItem->xMax())
-        return false;
-    if (m_data2DItem->lowerY() != m_data2DItem->yMin())
-        return false;
-    if (m_data2DItem->upperY() != m_data2DItem->yMax())
-        return false;
-    return true;
-}
-
 void MaskEditorCanvas::setZoomToROI()
 {
     if (MaskContainerItem* maskContainer = m_data2DItem->maskContainerItem()) {

GUI/View/Mask/MaskEditorCanvas.h

@@ -52,7 +52,6 @@ public slots:
     void onResetViewRequest();
 
 private:
-    bool isAxisRangeMatchData() const;
     void setZoomToROI();
 
     MaskGraphicsScene* m_scene;