Move native axis handling from instrument down to beam item

Redmine: #2217

GUI/coregui/Models/BeamItems.cpp

@@ -192,6 +192,14 @@ void SpecularBeamItem::updateFileName(const QString& filename)
     item<SpecularBeamInclinationItem>(BeamItem::P_INCLINATION_ANGLE).updateFileName(filename);
 }
 
+void SpecularBeamItem::updateToData(const IAxis& axis, QString units)
+{
+    auto axis_group = inclinationAxisGroup();
+    axis_group->setCurrentType(Constants::PointwiseAxisType);
+    auto axis_item = static_cast<PointwiseAxisItem*>(axis_group->currentItem());
+    axis_item->init(axis, units);
+}
+
 // GISAS beam item
 /* ------------------------------------------------------------------------- */
 

GUI/coregui/Models/BeamItems.h

@@ -21,6 +21,7 @@ class BasicAxisItem;
 class Beam;
 class FootprintItem;
 class GroupItem;
+class IAxis;
 
 class BA_CORE_API_ BeamItem : public SessionItem
 {
@@ -70,6 +71,7 @@ public:
     FootprintItem* currentFootprintItem() const;
 
     void updateFileName(const QString& filename);
+    void updateToData(const IAxis& axis, QString units);
 };
 
 class BA_CORE_API_ GISASBeamItem : public BeamItem

GUI/coregui/Models/InstrumentItems.cpp

@@ -150,15 +150,13 @@ void SpecularInstrumentItem::updateToRealData(const RealDataItem* item)
     if (item->getItemValue(RealDataItem::P_NATIVE_UNITS).toString() == Constants::UnitsNbins) {
         beamItem()->inclinationAxisGroup()->setCurrentType(Constants::BasicAxisType);
         setShape(item->shape());
-    } else {
-        QString units = item->getItemValue(RealDataItem::P_NATIVE_UNITS).toString();
-        const auto& data = item->nativeData()->getOutputData()->getAxis(0);
-
-        auto axis_group = beamItem()->inclinationAxisGroup();
-        axis_group->setCurrentType(Constants::PointwiseAxisType);
-        auto axis = dynamic_cast<PointwiseAxisItem*>(axis_group->currentItem());
-        axis->init(data, units);
+        return;
     }
+
+    // the case of dimensional units in user data
+    QString units = item->getItemValue(RealDataItem::P_NATIVE_UNITS).toString();
+    const auto& data = item->nativeData()->getOutputData()->getAxis(0);
+    beamItem()->updateToData(data, units);
 }
 
 bool SpecularInstrumentItem::alignedWith(const RealDataItem* item) const