Make RectangularDetectorItem::P_(U|V)0 private

GUI/Models/RectangularDetectorItem.cpp

@@ -219,6 +219,26 @@ void RectangularDetectorItem::setDirectionVector(const kvector_t& direction)
     item<VectorItem>(P_DIRECTION)->setVector(direction);
 }
 
+SessionItem* RectangularDetectorItem::u0Item() const
+{
+    return getItem(P_U0);
+}
+
+void RectangularDetectorItem::setU0(const double u0)
+{
+    setItemValue(P_U0, u0);
+}
+
+SessionItem* RectangularDetectorItem::v0Item() const
+{
+    return getItem(P_V0);
+}
+
+void RectangularDetectorItem::setV0(const double v0)
+{
+    setItemValue(P_V0, v0);
+}
+
 std::unique_ptr<IDetector2D> RectangularDetectorItem::createDomainDetector() const
 {
     // basic axes parameters

GUI/Models/RectangularDetectorItem.h

@@ -28,10 +28,10 @@ private:
     static const QString P_ALIGNMENT;
     static const QString P_NORMAL;
     static const QString P_DIRECTION;
-
-public:
     static const QString P_U0;
     static const QString P_V0;
+
+public:
     static const QString P_DBEAM_U0;
     static const QString P_DBEAM_V0;
     static const QString P_DISTANCE;
@@ -61,6 +61,12 @@ public:
     SessionItem* directionVectorItem() const;
     void setDirectionVector(const kvector_t& direction);
 
+    SessionItem* u0Item() const;
+    void setU0(double u0);
+
+    SessionItem* v0Item() const;
+    void setV0(double v0);
+
 private:
     std::unique_ptr<IDetector2D> createDomainDetector() const override;
     void update_properties_appearance();

GUI/Models/TransformFromDomain.cpp

@@ -394,15 +394,15 @@ void TransformFromDomain::setRectangularDetector(RectangularDetectorItem* detect
         kvector_t direction = detector.getDirectionVector();
         detector_item->setDirectionVector(direction);
 
-        detector_item->setItemValue(RectangularDetectorItem::P_U0, detector.getU0());
-        detector_item->setItemValue(RectangularDetectorItem::P_V0, detector.getV0());
+        detector_item->setU0(detector.getU0());
+        detector_item->setV0(detector.getV0());
     }
 
     else if (detector.getDetectorArrangment() == RectangularDetector::PERPENDICULAR_TO_SAMPLE) {
         detector_item->setDetectorAlignment("Perpendicular to sample x-axis");
         detector_item->setItemValue(RectangularDetectorItem::P_DISTANCE, detector.getDistance());
-        detector_item->setItemValue(RectangularDetectorItem::P_U0, detector.getU0());
-        detector_item->setItemValue(RectangularDetectorItem::P_V0, detector.getV0());
+        detector_item->setU0(detector.getU0());
+        detector_item->setV0(detector.getV0());
 
     } else if (detector.getDetectorArrangment()
                == RectangularDetector::PERPENDICULAR_TO_DIRECT_BEAM) {
@@ -415,8 +415,8 @@ void TransformFromDomain::setRectangularDetector(RectangularDetectorItem* detect
                == RectangularDetector::PERPENDICULAR_TO_REFLECTED_BEAM) {
         detector_item->setDetectorAlignment("Perpendicular to reflected beam");
         detector_item->setItemValue(RectangularDetectorItem::P_DISTANCE, detector.getDistance());
-        detector_item->setItemValue(RectangularDetectorItem::P_U0, detector.getU0());
-        detector_item->setItemValue(RectangularDetectorItem::P_V0, detector.getV0());
+        detector_item->setU0(detector.getU0());
+        detector_item->setV0(detector.getV0());
 
     } else if (detector.getDetectorArrangment()
                == RectangularDetector::PERPENDICULAR_TO_REFLECTED_BEAM_DPOS) {

GUI/Views/InstrumentWidgets/RectangularDetectorEditor.cpp

@@ -135,8 +135,8 @@ void RectangularDetectorEditor::init_alignment_editors()
         m_normalEditor->show();
         m_directionEditor->show();
 
-        m_positionsEditor->addItem(detectorItem()->getItem(RectangularDetectorItem::P_U0));
-        m_positionsEditor->addItem(detectorItem()->getItem(RectangularDetectorItem::P_V0));
+        m_positionsEditor->addItem(detectorItem()->u0Item());
+        m_positionsEditor->addItem(detectorItem()->v0Item());
 
         auto normalVectorItem = detectorItem()->normalVectorItem();
         m_normalEditor->setItem(normalVectorItem);
@@ -155,8 +155,8 @@ void RectangularDetectorEditor::init_alignment_editors()
                || alignment.getValue() == "Perpendicular to reflected beam") {
         m_positionsEditor->show();
 
-        m_positionsEditor->addItem(detectorItem()->getItem(RectangularDetectorItem::P_U0));
-        m_positionsEditor->addItem(detectorItem()->getItem(RectangularDetectorItem::P_V0));
+        m_positionsEditor->addItem(detectorItem()->u0Item());
+        m_positionsEditor->addItem(detectorItem()->v0Item());
         m_positionsEditor->addItem(detectorItem()->getItem(RectangularDetectorItem::P_DISTANCE));
     }
 }