Method selectMaterialProperty removed from MaterialSvc

GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp

@@ -24,6 +24,8 @@
 #include "MaterialSvc.h"
 #include "ParticleItem.h"
 #include "LayerItem.h"
+#include "MaterialEditorDialog.h"
+#include "AppSvc.h"
 
 
 QColor MaterialItemUtils::suggestMaterialColor(const QString &name)
@@ -94,3 +96,14 @@ MaterialProperty MaterialItemUtils::materialProperty(const SessionItem& material
 
     return result;
 }
+
+MaterialProperty MaterialItemUtils::selectMaterialProperty(const MaterialProperty& previousMaterial)
+{
+    MaterialEditorDialog dialog(AppSvc::materialModel());
+    dialog.setInitialMaterialProperty(previousMaterial);
+    if(dialog.exec() == QDialog::Accepted) {
+        return dialog.getSelectedMaterialProperty();
+    }
+
+    return MaterialProperty();
+}

GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h

@@ -39,6 +39,10 @@ BA_CORE_API_ QString materialTag(const SessionItem &item);
 
 //! Constructs material property corresponding to given material.
 BA_CORE_API_ MaterialProperty materialProperty(const SessionItem& materialItem);
+
+//! Calls material selector dialog.
+BA_CORE_API_ MaterialProperty selectMaterialProperty(const MaterialProperty &previousMaterial=MaterialProperty());
+
 }
 
 

GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp

@@ -41,27 +41,6 @@ MaterialSvc *MaterialSvc::instance()
 }
 
 
-MaterialProperty
-MaterialSvc::selectMaterialProperty(const MaterialProperty &previousMaterial)
-{
-    Q_ASSERT(m_instance);
-    return m_instance->this_selectMaterialProperty(previousMaterial);
-}
-
-
-MaterialProperty
-MaterialSvc::this_selectMaterialProperty(const MaterialProperty &previousMaterial)
-{
-    MaterialEditorDialog dialog(AppSvc::materialModel());
-    dialog.setInitialMaterialProperty(previousMaterial);
-    if(dialog.exec() == QDialog::Accepted) {
-        return dialog.getSelectedMaterialProperty();
-    }
-
-    return MaterialProperty();
-}
-
-
 MaterialProperty MaterialSvc::getDefaultMaterialProperty()
 {
     Q_ASSERT(m_instance);

GUI/coregui/Views/MaterialEditor/MaterialSvc.h

@@ -35,13 +35,11 @@ public:
 
     static MaterialSvc *instance();
 
-    static MaterialProperty selectMaterialProperty(const MaterialProperty &previousMaterial=MaterialProperty());
     static MaterialProperty getDefaultMaterialProperty();
 
     static MaterialItem *getMaterial(const MaterialProperty &property);
 
 private:
-    MaterialProperty this_selectMaterialProperty(const MaterialProperty &previousMaterial);
     MaterialProperty this_getDefaultMaterialProperty();
     MaterialItem *this_getMaterial(const MaterialProperty &property);
 

GUI/coregui/Views/PropertyEditor/CustomEditors.cpp

@@ -21,6 +21,7 @@
 #include "GroupProperty.h"
 #include "ComboProperty.h"
 #include "ColorProperty.h"
+#include "MaterialItemUtils.h"
 #include <QBoxLayout>
 #include <QLabel>
 #include <QToolButton>
@@ -87,7 +88,7 @@ void MaterialPropertyEditor::buttonClicked()
     // temporarily installing filter to prevent loss of focus caused by too insistent dialog
     installEventFilter(m_focusFilter);
     MaterialProperty materialProperty = m_data.value<MaterialProperty>();
-    MaterialProperty mat = MaterialSvc::selectMaterialProperty(materialProperty);
+    MaterialProperty mat = MaterialItemUtils::selectMaterialProperty(materialProperty);
     removeEventFilter(m_focusFilter);
 
     if(mat.isDefined() )

GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.cpp

@@ -17,6 +17,7 @@
 #include "ObsoletePropertyBrowserUtils.h"
 #include "MaterialSvc.h"
 #include "CustomEventFilters.h"
+#include "MaterialItemUtils.h"
 #include <QColorDialog>
 #include <QComboBox>
 #include <QDoubleValidator>
@@ -70,7 +71,7 @@ void ObsoleteMaterialPropertyEdit::buttonClicked()
 {
     // temporarily installing filter to prevent loss of focus caused by too  insistent dialog
     installEventFilter(m_focusFilter);
-    MaterialProperty mat = MaterialSvc::selectMaterialProperty(m_materialProperty);
+    MaterialProperty mat = MaterialItemUtils::selectMaterialProperty(m_materialProperty);
     removeEventFilter(m_focusFilter);
 
     if(mat.isDefined() ) {

GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp

@@ -18,6 +18,7 @@
 #include "DesignerView.h"
 #include "MaterialProperty.h"
 #include "MaterialSvc.h"
+#include "MaterialItemUtils.h"
 #include <QAction>
 #include <QButtonGroup>
 #include <QComboBox>
@@ -142,5 +143,5 @@ void SampleToolBar::onScaleComboChanged(const QString &scale_string)
 
 void SampleToolBar::onMaterialEditorCall()
 {
-    MaterialProperty mp = MaterialSvc::selectMaterialProperty();
+    MaterialProperty mp = MaterialItemUtils::selectMaterialProperty();
 }