From a5531d6cec64bcc8f2d8f22b3894fd004ba02fd4 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 1 Dec 2017 11:32:49 +0100
Subject: [PATCH] MaterialModel subscription decision moved to MaterialModel
---
GUI/coregui/Models/MaterialModel.cpp | 7 ++++---
GUI/coregui/mainwindow/AppSvc.cpp | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 1e9354c1c6a..0952255cccc 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -20,16 +20,17 @@
#include "MaterialDataItem.h"
#include "AppSvc.h"
-
MaterialModel::MaterialModel(QObject* parent) : SessionModel(SessionXML::MaterialModelTag, parent)
{
setObjectName(SessionXML::MaterialModelTag);
- AppSvc::subscribe(this);
+ if (AppSvc::materialModel() == nullptr)
+ AppSvc::subscribe(this);
}
MaterialModel::~MaterialModel()
{
- AppSvc::unsubscribe(this);
+ if (AppSvc::materialModel() == this)
+ AppSvc::unsubscribe(this);
}
MaterialModel* MaterialModel::createCopy(SessionItem* parent)
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/coregui/mainwindow/AppSvc.cpp
index ac140bee29b..c98c0518023 100644
--- a/GUI/coregui/mainwindow/AppSvc.cpp
+++ b/GUI/coregui/mainwindow/AppSvc.cpp
@@ -88,9 +88,9 @@ void AppSvc::this_unsubscribe(ProjectManager* projectManager)
void AppSvc::this_subscribe(MaterialModel* materialModel)
{
- // MaterialModel created first will be subscribed
if (m_materialModel)
- return;
+ throw GUIHelpers::Error("AppSvc::projectManager() -> Error. Attempt to subscribe "
+ "MaterialModel twice.");
m_materialModel = materialModel;
}
@@ -98,7 +98,8 @@ void AppSvc::this_subscribe(MaterialModel* materialModel)
void AppSvc::this_unsubscribe(MaterialModel* materialModel)
{
if (m_materialModel != materialModel)
- return;
+ throw GUIHelpers::Error("AppSvc::projectManager() -> Error. Attempt to unsubscribe "
+ "MaterialModel before it was subscribed.");
m_materialModel = nullptr;
}
--
GitLab