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

mv init statement

parent f6f741f4
No related branches found
No related tags found
1 merge request!2101cleanup of GUI/Masks ctd; decouple MaskGraphicsProxy from SceneAdaptor
...@@ -409,11 +409,10 @@ IMaskElementDisplay* MaskGraphicsScene::addViewForItem(MaskItemObject* item) ...@@ -409,11 +409,10 @@ IMaskElementDisplay* MaskGraphicsScene::addViewForItem(MaskItemObject* item)
IMaskElementDisplay* view = m_ItemToView[item]; IMaskElementDisplay* view = m_ItemToView[item];
if (!view) { if (!view) {
view = MaskViewFactory::createMaskView(item, m_adaptor.data()); view = MaskViewFactory::createMaskView(item);
if (view) { view->setViewSceneAdaptor(m_adaptor.data());
m_ItemToView[item] = view; m_ItemToView[item] = view;
addItem(view); addItem(view);
}
} }
return view; return view;
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "GUI/View/Shape/PolygonDisplay.h" #include "GUI/View/Shape/PolygonDisplay.h"
#include "GUI/View/Shape/PolygonPointDisplay.h" #include "GUI/View/Shape/PolygonPointDisplay.h"
IMaskElementDisplay* MaskViewFactory::createMaskView(MaskItemObject* item, SceneAdaptor* adaptor) IMaskElementDisplay* MaskViewFactory::createMaskView(MaskItemObject* item)
{ {
IMaskElementDisplay* result(nullptr); IMaskElementDisplay* result(nullptr);
...@@ -60,7 +60,5 @@ IMaskElementDisplay* MaskViewFactory::createMaskView(MaskItemObject* item, Scene ...@@ -60,7 +60,5 @@ IMaskElementDisplay* MaskViewFactory::createMaskView(MaskItemObject* item, Scene
else else
ASSERT_NEVER; ASSERT_NEVER;
result->setViewSceneAdaptor(adaptor);
return result; return result;
} }
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
class IMaskElementDisplay; class IMaskElementDisplay;
class MaskItemObject; class MaskItemObject;
class SceneAdaptor;
namespace MaskViewFactory { namespace MaskViewFactory {
//! Factory to construct views out of MaskItems for MaskGraphicsScene //! Factory to construct views out of MaskItems for MaskGraphicsScene
IMaskElementDisplay* createMaskView(MaskItemObject* item, SceneAdaptor* adaptor); IMaskElementDisplay* createMaskView(MaskItemObject* item);
} }
......
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