Remove double definition of MaterialUtils

GUI/coregui/Models/GUIObjectBuilder.cpp

@@ -31,9 +31,9 @@
 #include "Layer.h"
 #include "LayerItem.h"
 #include "Material.h"
+#include "MaterialItem.h"
 #include "MaterialModel.h"
 #include "MaterialSvc.h"
-#include "MaterialUtils.h"
 #include "MesoCrystal.h"
 #include "MesoCrystalItem.h"
 #include "MultiLayer.h"

GUI/coregui/Models/LayerItem.cpp

@@ -16,7 +16,7 @@
 
 #include "LayerItem.h"
 #include "BornAgainNamespace.h"
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 
 namespace {
 const QString layer_nslices_tooltip =
@@ -38,7 +38,7 @@ LayerItem::LayerItem()
     addProperty(P_THICKNESS, 0.0)->setLimits(RealLimits::lowerLimited(0.0))
         .setToolTip(QStringLiteral("Thickness of a layer in nanometers"));
 
-    addProperty(P_MATERIAL, MaterialUtils::getDefaultMaterialProperty().getVariant())
+    addProperty(P_MATERIAL, MaterialItemUtils::getDefaultMaterialProperty().getVariant())
             ->setToolTip(QStringLiteral("Material the layer is made of"));
 
     addProperty(P_NSLICES, 1)->setLimits(RealLimits::lowerLimited(0.0))

GUI/coregui/Models/MaterialItem.cpp

@@ -15,11 +15,10 @@
 // ************************************************************************** //
 
 #include "MaterialItem.h"
+#include "ColorProperty.h"
 #include "GUIHelpers.h"
 #include "MaterialDataItem.h"
 #include "MaterialFactoryFuncs.h"
-#include "MaterialUtils.h"
-
 
 namespace {
 const QString magnetization_tooltip =

GUI/coregui/Models/MaterialModel.cpp

@@ -15,7 +15,7 @@
 // ************************************************************************** //
 
 #include "MaterialModel.h"
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 #include "GUIHelpers.h"
 #include "MaterialDataItem.h"
 
@@ -45,7 +45,7 @@ MaterialItem* MaterialModel::addMaterial(const QString& name, double material_da
     materialDataItem->setImag(material_data_imag);
 
     materialItem->setItemValue(MaterialItem::P_COLOR,
-                               MaterialUtils::suggestMaterialColorProperty(name).getVariant());
+                               MaterialItemUtils::suggestMaterialColorProperty(name).getVariant());
 
     return materialItem;
 }

GUI/coregui/Models/ParticleItem.cpp

@@ -17,7 +17,7 @@
 #include "ParticleItem.h"
 #include "BornAgainNamespace.h"
 #include "FormFactorItems.h"
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 #include "ModelPath.h"
 #include "ParticleCoreShellItem.h"
 #include "TransformToDomain.h"
@@ -44,7 +44,7 @@ ParticleItem::ParticleItem()
     : SessionGraphicsItem(Constants::ParticleType)
 {
     addGroupProperty(P_FORM_FACTOR, Constants::FormFactorGroup);
-    addProperty(P_MATERIAL, MaterialUtils::getDefaultMaterialProperty().getVariant())
+    addProperty(P_MATERIAL, MaterialItemUtils::getDefaultMaterialProperty().getVariant())
         ->setToolTip(QStringLiteral("Material of particle"));
 
     addProperty(P_ABUNDANCE, 1.0)->setLimits(RealLimits::limited(0.0, 1.0)).setDecimals(3)

GUI/coregui/Models/SampleModel.cpp

@@ -20,7 +20,7 @@
 #include "MultiLayerItem.h"
 #include "MaterialProperty.h"
 #include "MaterialSvc.h"
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 
 SampleModel::SampleModel(QObject *parent)
     : SessionModel(SessionXML::SampleModelTag, parent)
@@ -58,7 +58,7 @@ void SampleModel::exploreForMaterials(const QModelIndex &parentIndex)
         QModelIndex itemIndex = index(i_row, 0, parentIndex);
         if (SessionItem *item = itemForIndex(itemIndex)) {
 
-            QString materialTag = MaterialUtils::materialTag(*item);
+            QString materialTag = MaterialItemUtils::materialTag(*item);
 
             if(materialTag.size()) {
                 // TODO take care of the case, when material doesn't exist anymore and

GUI/coregui/Models/TransformToDomain.cpp

@@ -37,7 +37,7 @@
 #include "LayerItem.h"
 #include "LayerRoughnessItems.h"
 #include "MaskItems.h"
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 #include "MesoCrystal.h"
 #include "MesoCrystalItem.h"
 #include "MultiLayerItem.h"
@@ -70,7 +70,7 @@ std::unique_ptr<Material> TransformToDomain::createDomainMaterial(const SessionI
             "TransformToDomain::createDomainMaterial() -> Error. Can't create material "
             "for item '"+item.displayName()+"'.");
 
-    return MaterialUtils::createDomainMaterial(material_property);
+    return MaterialItemUtils::createDomainMaterial(material_property);
 }
 
 std::unique_ptr<MultiLayer> TransformToDomain::createMultiLayer(const SessionItem& item)

GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp

@@ -17,7 +17,7 @@
 #include "MaterialEditorDialog.h"
 #include "MaterialEditor.h"
 #include "MaterialModel.h"
-#include "MaterialUtils.h"
+#include "MaterialItem.h"
 #include "mainwindow_constants.h"
 #include <QAction>
 #include <QPushButton>

GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp → GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
-//! @brief     Implements class MaterialUtils
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+//! @brief     Implements class MaterialItemUtils
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
 //
 // ************************************************************************** //
 
-#include "MaterialUtils.h"
+#include "MaterialItemUtils.h"
 #include "MaterialDataItem.h"
 #include "ComboProperty.h"
 #include "DesignerHelper.h"
@@ -26,7 +26,7 @@
 #include "LayerItem.h"
 
 
-QColor MaterialUtils::suggestMaterialColor(const QString &name)
+QColor MaterialItemUtils::suggestMaterialColor(const QString &name)
 {
     if(name.contains("Air") ) {
         return QColor(179, 242, 255);
@@ -46,7 +46,7 @@ QColor MaterialUtils::suggestMaterialColor(const QString &name)
 }
 
 
-MaterialProperty MaterialUtils::getDefaultMaterialProperty()
+MaterialProperty MaterialItemUtils::getDefaultMaterialProperty()
 {
     if(MaterialSvc::instance()) {
         return MaterialSvc::getDefaultMaterialProperty();
@@ -55,13 +55,13 @@ MaterialProperty MaterialUtils::getDefaultMaterialProperty()
 }
 
 
-ColorProperty MaterialUtils::suggestMaterialColorProperty(const QString &name)
+ColorProperty MaterialItemUtils::suggestMaterialColorProperty(const QString &name)
 {
-    return ColorProperty(MaterialUtils::suggestMaterialColor(name));
+    return ColorProperty(MaterialItemUtils::suggestMaterialColor(name));
 }
 
 std::unique_ptr<Material>
-MaterialUtils::createDomainMaterial(const MaterialProperty &material_property)
+MaterialItemUtils::createDomainMaterial(const MaterialProperty &material_property)
 {
     MaterialItem *materialItem
         = MaterialSvc::getMaterial(material_property);
@@ -75,7 +75,7 @@ MaterialUtils::createDomainMaterial(const MaterialProperty &material_property)
 
 //! Returns material tag for given item. Returns empty string, if item doesn't have materials.
 
-QString MaterialUtils::materialTag(const SessionItem &item)
+QString MaterialItemUtils::materialTag(const SessionItem &item)
 {
     QString result;
     if (item.modelType() == Constants::ParticleType) {

GUI/coregui/Views/MaterialEditor/MaterialUtils.h → GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Views/MaterialEditor/MaterialUtils.h
-//! @brief     Defines class MaterialUtils
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
+//! @brief     Defines class MaterialItemUtils
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALUTILS_H
-#define MATERIALUTILS_H
+#ifndef MATERIALITEMUTILS_H
+#define MATERIALITEMUTILS_H
 
 #include "ColorProperty.h"
 #include "MaterialItem.h"
@@ -26,7 +26,7 @@
 
 class Material;
 
-namespace MaterialUtils
+namespace MaterialItemUtils
 {
 
 BA_CORE_API_ QColor suggestMaterialColor(const QString &name);
@@ -39,4 +39,4 @@ BA_CORE_API_ QString materialTag(const SessionItem &item);
 }
 
 
-#endif // MATERIALUTILS_H
+#endif // MATERIALITEMUTILS_H

GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp

@@ -18,7 +18,6 @@
 #include "MaterialEditorDialog.h"
 #include "MaterialItem.h"
 #include "MaterialModel.h"
-#include "MaterialUtils.h"
 #include "SessionModel.h"
 
 MaterialSvc *MaterialSvc::m_instance = 0;