From 9455d5ea23d2fbfd2f4d8d84cd7820da0dd27cbb Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 10 Oct 2016 15:51:52 +0200
Subject: [PATCH] MaskGraphicsProxy now relies on ColorMapCanvas to have status
string.
---
GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp | 8 +++++---
GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index 63d16171243..9bd4305b07f 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -18,14 +18,16 @@
#include "ColorMapSceneAdaptor.h"
#include "ColorMap.h"
#include "IntensityDataItem.h"
+#include "ColorMapCanvas.h"
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
MaskGraphicsProxy::MaskGraphicsProxy()
- : m_colorMap(new ColorMap)
+ : m_colorMap(new ColorMapCanvas)
, m_sceneAdaptor(0)
, m_send_signals_to_colormap(false)
{
+ m_colorMap->setStatusLabelEnabled(true);
resize(1200, 1000);
setAcceptedMouseButtons(Qt::NoButton);
}
@@ -48,7 +50,7 @@ void MaskGraphicsProxy::setSceneAdaptor(ISceneAdaptor *sceneAdaptor)
{
m_sceneAdaptor = dynamic_cast<ColorMapSceneAdaptor *>(sceneAdaptor);
Q_ASSERT(m_sceneAdaptor);
- m_sceneAdaptor->setColorMapPlot(m_colorMap);
+ m_sceneAdaptor->setColorMapPlot(m_colorMap->colorMap());
}
//! Sets widget to zoom mode, when signals (zoom wheel, mouse clicks) are send down to
@@ -66,7 +68,7 @@ void MaskGraphicsProxy::setInZoomMode(bool value)
void MaskGraphicsProxy::resetView()
{
Q_ASSERT(m_colorMap);
- m_colorMap->resetView();
+ m_colorMap->colorMap()->resetView();
}
void MaskGraphicsProxy::mousePressEvent(QGraphicsSceneMouseEvent *event)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
index ba1b0088083..86cf30bb0a1 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
@@ -24,6 +24,7 @@ class SessionItem;
class ISceneAdaptor;
class ColorMapSceneAdaptor;
class ColorMap;
+class ColorMapCanvas;
class IntensityDataItem;
//! Graphics proxy to place QWidget inside QGraphicsScene, used by MaskEditorCanvas.
@@ -51,7 +52,7 @@ protected:
void wheelEvent(QGraphicsSceneWheelEvent *event);
private:
- ColorMap *m_colorMap;
+ ColorMapCanvas *m_colorMap;
ColorMapSceneAdaptor *m_sceneAdaptor;
bool m_send_signals_to_colormap;
};
--
GitLab