From edcd1a5cbb777f9cad005dc24eb20708db7744de Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 11 Jan 2024 17:04:04 +0100
Subject: [PATCH] ProjectionsEditorCanvas rm m_block...
---
GUI/View/Canvas/ProjectionsEditorCanvas.cpp | 20 +-------------------
GUI/View/Canvas/ProjectionsEditorCanvas.h | 1 -
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/GUI/View/Canvas/ProjectionsEditorCanvas.cpp b/GUI/View/Canvas/ProjectionsEditorCanvas.cpp
index 408ed88416e..baaf748ebed 100644
--- a/GUI/View/Canvas/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Canvas/ProjectionsEditorCanvas.cpp
@@ -93,11 +93,9 @@ void ProjectionsEditorCanvas::resetProjsCanvas()
void ProjectionsEditorCanvas::onEnteringColorMap()
{
- if (m_liveProjection || m_block_update)
+ if (m_liveProjection)
return;
- m_block_update = true;
-
if (m_currentActivity == MaskFlags::HORIZONTAL_LINE_MODE)
m_liveProjection = std::make_unique<HorizontalLineItem>();
else if (m_currentActivity == MaskFlags::VERTICAL_LINE_MODE)
@@ -109,41 +107,25 @@ void ProjectionsEditorCanvas::onEnteringColorMap()
emit m_data2DItem->projectionPositionChanged(m_liveProjection.get());
}
-
- m_block_update = false;
}
void ProjectionsEditorCanvas::onLeavingColorMap()
{
- if (m_block_update)
- return;
-
- m_block_update = true;
-
if (m_liveProjection) {
disconnect(m_liveProjection.get(), nullptr, m_data2DItem, nullptr);
emit m_data2DItem->projectionGone(m_liveProjection.get());
m_liveProjection.reset();
}
-
- m_block_update = false;
}
void ProjectionsEditorCanvas::onPositionChanged(double x, double y)
{
- if (m_block_update)
- return;
-
- m_block_update = true;
-
if (m_liveProjection) {
if (m_currentActivity == MaskFlags::HORIZONTAL_LINE_MODE)
dynamic_cast<HorizontalLineItem*>(m_liveProjection.get())->setPos(y);
else if (m_currentActivity == MaskFlags::VERTICAL_LINE_MODE)
dynamic_cast<VerticalLineItem*>(m_liveProjection.get())->setPos(x);
}
-
- m_block_update = false;
}
void ProjectionsEditorCanvas::onResetViewRequest()
diff --git a/GUI/View/Canvas/ProjectionsEditorCanvas.h b/GUI/View/Canvas/ProjectionsEditorCanvas.h
index 05eff7bc031..d10f903fcf9 100644
--- a/GUI/View/Canvas/ProjectionsEditorCanvas.h
+++ b/GUI/View/Canvas/ProjectionsEditorCanvas.h
@@ -67,7 +67,6 @@ private:
ColorMap* m_colorMap;
std::unique_ptr<LineItem> m_liveProjection; //!< temporary, matching mouse move
MaskFlags::MaskMode m_currentActivity;
- bool m_block_update = false;
};
#endif // BORNAGAIN_GUI_VIEW_CANVAS_PROJECTIONSEDITORCANVAS_H
--
GitLab