Skip to content
Snippets Groups Projects
Commit edcd1a5c authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

ProjectionsEditorCanvas rm m_block...

parent ce663cec
No related branches found
No related tags found
1 merge request!2287rm m_blocking
......@@ -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()
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment