New icons for InstrumentView switched on.

GUI/coregui/Models/SessionDecorationModel.cpp

@@ -13,35 +13,74 @@
 // ************************************************************************** //
 
 #include "SessionDecorationModel.h"
-#include "SessionModel.h"
 #include "MaterialItem.h"
+#include "SessionModel.h"
 #include <QColor>
 #include <QIcon>
 #include <QPixmap>
 
-namespace {
+namespace
+{
 
-QIcon instrumentIcon() {
-    QIcon result;
-    result.addPixmap(QPixmap(":/images/gisas_instrument_bw.png"), QIcon::Normal);
-    result.addPixmap(QPixmap(":/images/gisas_instrument.png"), QIcon::Selected);
+struct IconCatalogue {
+    QIcon gisasIcon;
+    QIcon offspecIcon;
+    QIcon specularIcon;
+
+    IconCatalogue()
+    {
+        gisasIcon.addPixmap(QPixmap(":/images/gisas_instrument.svg"), QIcon::Selected);
+        gisasIcon.addPixmap(QPixmap(":/images/gisas_instrument_shaded.svg"), QIcon::Normal);
+        offspecIcon.addPixmap(QPixmap(":/images/offspec_instrument.svg"), QIcon::Selected);
+        offspecIcon.addPixmap(QPixmap(":/images/offspec_instrument_shaded.svg"), QIcon::Normal);
+        specularIcon.addPixmap(QPixmap(":/images/specular_instrument.svg"), QIcon::Selected);
+        specularIcon.addPixmap(QPixmap(":/images/specular_instrument_shaded.svg"), QIcon::Normal);
+    }
+};
+
+IconCatalogue& iconCatalogue()
+{
+    static IconCatalogue result;
     return result;
 }
 
 QIcon materialIcon(const QColor& color)
 {
     QIcon result;
-    QPixmap pixmap(10,10);
+    QPixmap pixmap(10, 10);
     pixmap.fill(color);
     result.addPixmap(pixmap);
     return result;
 }
 
+QVariant itemIcon(const SessionItem* item)
+{
+    QVariant result;
+
+    auto modelType = item->modelType();
+
+    auto& icons = iconCatalogue();
+
+    if (modelType == Constants::GISASInstrumentType) {
+        return QVariant(icons.gisasIcon);
+
+    } else if (modelType == Constants::OffSpecInstrumentType) {
+        return QVariant(icons.offspecIcon);
+
+    } else if (modelType == Constants::SpecularInstrumentType) {
+        return QVariant(icons.specularIcon);
+
+    } else if (modelType == Constants::MaterialType) {
+        auto materialItem = dynamic_cast<const MaterialItem*>(item);
+        return QVariant(materialIcon(materialItem->color()));
+    }
+
+    return result;
+}
 }
 
 SessionDecorationModel::SessionDecorationModel(QObject* parent, SessionModel* model)
-    : QIdentityProxyModel(parent)
-    , m_model(nullptr)
+    : QIdentityProxyModel(parent), m_model(nullptr)
 {
     setSessionModel(model);
 }
@@ -60,7 +99,7 @@ QVariant SessionDecorationModel::data(const QModelIndex& index, int role) const
             return result;
     }
 
-    if(role == Qt::TextColorRole) {
+    if (role == Qt::TextColorRole) {
         QVariant result = textColor(index);
         if (result.isValid())
             return result;
@@ -69,25 +108,12 @@ QVariant SessionDecorationModel::data(const QModelIndex& index, int role) const
     return QIdentityProxyModel::data(index, role);
 }
 
-SessionModel* SessionDecorationModel::sessionModel()
-{
-    return m_model;
-}
-
 QVariant SessionDecorationModel::createIcon(const QModelIndex& index) const
 {
-    QVariant result;
-
-    if (SessionItem* item = m_model->itemForIndex(index)) {
-        if (item->modelType() == Constants::GISASInstrumentType) {
-            return instrumentIcon();
-        } else if(item->modelType() == Constants::MaterialType) {
-            if (const MaterialItem *materialItem = dynamic_cast<const MaterialItem *>(item))
-                return materialIcon(materialItem->color());
-        }
-    }
+    if (SessionItem* item = m_model->itemForIndex(index))
+        return itemIcon(item);
 
-    return result;
+    return QVariant();
 }
 
 //! Returns text color. Disabled SessionItem's will appear in gray.

GUI/coregui/Models/SessionDecorationModel.h

@@ -35,8 +35,6 @@ public:
 
     QVariant data(const QModelIndex& index, int role) const;
 
-    SessionModel* sessionModel();
-
 private:
     QVariant createIcon(const QModelIndex& index) const;
     QVariant textColor(const QModelIndex& index) const;

GUI/coregui/coregui.qrc

@@ -4,8 +4,6 @@
         <file>images/closebutton.png</file>
         <file>images/reset.png</file>
         <file>images/darkclosebutton.png</file>
-        <file>images/gisas_instrument.png</file>
-        <file>images/gisas_instrument_bw.png</file>
         <file>mainwindow/tooltips.xml</file>
         <file>images/treeview-branch-closed.png</file>
         <file>images/treeview-branch-end.png</file>
@@ -54,5 +52,11 @@
         <file>images/caret-down.svg</file>
         <file>images/caret-right.svg</file>
         <file>images/toolbar16light_fft.svg</file>
+        <file>images/gisas_instrument.svg</file>
+        <file>images/gisas_instrument_shaded.svg</file>
+        <file>images/offspec_instrument.svg</file>
+        <file>images/offspec_instrument_shaded.svg</file>
+        <file>images/specular_instrument.svg</file>
+        <file>images/specular_instrument_shaded.svg</file>
     </qresource>
 </RCC>