From dc2c04de396df145b0c533965a819fedc29c25cc Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 5 Oct 2023 10:27:23 +0200
Subject: [PATCH] merge fct
---
GUI/View/PlotScale/ColorMap.cpp | 11 +++--------
GUI/View/PlotScale/ColorMap.h | 1 -
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/GUI/View/PlotScale/ColorMap.cpp b/GUI/View/PlotScale/ColorMap.cpp
index 18b8da0618f..f3a68e64bfc 100644
--- a/GUI/View/PlotScale/ColorMap.cpp
+++ b/GUI/View/PlotScale/ColorMap.cpp
@@ -269,14 +269,9 @@ void ColorMap::connectItem()
connect(ii->zAxisItem(), &BasicAxisItem::axisVisibilityChanged, this,
&ColorMap::setColorScaleVisible, Qt::UniqueConnection);
- setConnected(true);
-}
-
-void ColorMap::setConnected(bool isConnected)
-{
- setAxesRangeConnected(isConnected);
- setDataRangeConnected(isConnected);
- setUpdateTimerConnected(isConnected);
+ setAxesRangeConnected(true);
+ setDataRangeConnected(true);
+ setUpdateTimerConnected(true);
}
//! Connects/disconnects signals related to ColorMap's X,Y axes rectangle change.
diff --git a/GUI/View/PlotScale/ColorMap.h b/GUI/View/PlotScale/ColorMap.h
index 7e67f79df38..00cd0432eeb 100644
--- a/GUI/View/PlotScale/ColorMap.h
+++ b/GUI/View/PlotScale/ColorMap.h
@@ -70,7 +70,6 @@ private:
void initColorMap();
void connectItem();
- void setConnected(bool isConnected);
void setAxesRangeConnected(bool isConnected);
void setDataRangeConnected(bool isConnected);
void setUpdateTimerConnected(bool isConnected);
--
GitLab