Use string constants for resolution function item type names

GUI/Models/DetectorItems.cpp

@@ -145,7 +145,7 @@ void DetectorItem::update_resolution_function_tooltips()
 {
     auto& resfuncItem = groupItem<ResolutionFunctionItem>(DetectorItem::P_RESOLUTION_FUNCTION);
 
-    if (resfuncItem.modelType() == "ResolutionFunction2DGaussian") {
+    if (resfuncItem.modelType() == ResolutionFunction2DGaussianItem::M_TYPE) {
         QString units = modelType() == SphericalDetectorItem::M_TYPE ? "deg" : "mm";
 
         resfuncItem.getItem(ResolutionFunction2DGaussianItem::P_SIGMA_X)

GUI/Models/GroupInfoCatalog.cpp

@@ -22,6 +22,7 @@
 #include "GUI/Models/PointwiseAxisItem.h"
 #include "GUI/Models/RealLimitsItems.h"
 #include "GUI/Models/RectangularDetectorItem.h"
+#include "GUI/Models/ResolutionFunctionItems.h"
 #include "GUI/Models/SphericalDetectorItem.h"
 
 GroupInfoCatalog::GroupInfoCatalog()
@@ -149,9 +150,9 @@ GroupInfoCatalog::GroupInfoCatalog()
     addInfo(info);
 
     info = GroupInfo("Resolution function group");
-    info.add("ResolutionFunctionNone", "None");
-    info.add("ResolutionFunction2DGaussian", "2D Gaussian");
-    info.setDefaultType("ResolutionFunctionNone");
+    info.add(ResolutionFunctionNoneItem::M_TYPE, "None");
+    info.add(ResolutionFunction2DGaussianItem::M_TYPE, "2D Gaussian");
+    info.setDefaultType(ResolutionFunctionNoneItem::M_TYPE);
     addInfo(info);
 
     info = GroupInfo("Minimizer library group");

GUI/Models/ItemCatalog.cpp

@@ -192,8 +192,8 @@ ItemCatalog::ItemCatalog()
     addItem<SpecularBeamInclinationItem>();
     addItem<SpecularBeamWavelengthItem>();
 
-    add("ResolutionFunctionNone", create_new<ResolutionFunctionNoneItem>);
-    add("ResolutionFunction2DGaussian", create_new<ResolutionFunction2DGaussianItem>);
+    addItem<ResolutionFunctionNoneItem>();
+    addItem<ResolutionFunction2DGaussianItem>();
 
     add("MaskContainer", create_new<MaskContainerItem>);
     add("RectangleMask", create_new<RectangleItem>);

GUI/Models/ResolutionFunctionItems.cpp

@@ -19,8 +19,10 @@ ResolutionFunctionItem::ResolutionFunctionItem(const QString& name) : SessionIte
 
 /* --------------------------------------------------------------------------------------------- */
 
+const QString ResolutionFunctionNoneItem::M_TYPE = "ResolutionFunctionNone";
+
 ResolutionFunctionNoneItem::ResolutionFunctionNoneItem()
-    : ResolutionFunctionItem("ResolutionFunctionNone")
+    : ResolutionFunctionItem(M_TYPE)
 {
 }
 
@@ -35,8 +37,10 @@ ResolutionFunctionNoneItem::createResolutionFunction(double) const
 const QString ResolutionFunction2DGaussianItem::P_SIGMA_X = QString::fromStdString("SigmaX");
 const QString ResolutionFunction2DGaussianItem::P_SIGMA_Y = QString::fromStdString("SigmaY");
 
+const QString ResolutionFunction2DGaussianItem::M_TYPE = "ResolutionFunction2DGaussian";
+
 ResolutionFunction2DGaussianItem::ResolutionFunction2DGaussianItem()
-    : ResolutionFunctionItem("ResolutionFunction2DGaussian")
+    : ResolutionFunctionItem(M_TYPE)
 {
     addProperty(P_SIGMA_X, 0.02)
         ->setLimits(RealLimits::lowerLimited(0.0))

GUI/Models/ResolutionFunctionItems.h

@@ -33,6 +33,8 @@ public:
 class BA_CORE_API_ ResolutionFunctionNoneItem : public ResolutionFunctionItem {
 
 public:
+    static const QString M_TYPE;
+
     ResolutionFunctionNoneItem();
     std::unique_ptr<IResolutionFunction2D> createResolutionFunction(double scale = 1.0) const;
 };
@@ -42,6 +44,9 @@ class BA_CORE_API_ ResolutionFunction2DGaussianItem : public ResolutionFunctionI
 public:
     static const QString P_SIGMA_X;
     static const QString P_SIGMA_Y;
+
+    static const QString M_TYPE;
+
     ResolutionFunction2DGaussianItem();
     std::unique_ptr<IResolutionFunction2D> createResolutionFunction(double scale = 1.0) const;
 };

GUI/Models/TransformFromDomain.cpp

@@ -321,7 +321,7 @@ void TransformFromDomain::setDetectorResolution(DetectorItem* detector_item,
         if (auto resfunc = dynamic_cast<const ResolutionFunction2DGaussian*>(
                 p_convfunc->getResolutionFunction2D())) {
             SessionItem* item = detector_item->setResolutionFunctionType
-                ("ResolutionFunction2DGaussian");
+                (ResolutionFunction2DGaussianItem::M_TYPE);
             double scale(1.0);
             if (detector_item->modelType() == SphericalDetectorItem::M_TYPE)
                 scale = 1. / Units::deg;

Tests/UnitTests/GUI/TestDetectorItems.cpp

@@ -6,6 +6,7 @@
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/InstrumentModel.h"
 #include "GUI/Models/RectangularDetectorItem.h"
+#include "GUI/Models/ResolutionFunctionItems.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestDetectorItems : public ::testing::Test {
@@ -35,7 +36,7 @@ TEST_F(TestDetectorItems, test_resolutionFunction)
 
     DetectorItem* detectorItem = instrument->detectorItem();
 
-    detectorItem->setResolutionFunctionType("ResolutionFunction2DGaussian");
+    detectorItem->setResolutionFunctionType(ResolutionFunction2DGaussianItem::M_TYPE);
 
     auto detector = detectorItem->createDetector();
     auto convol =