Make VectorItem::P_(X|Y|Z) private

GUI/Models/VectorItem.cpp

@@ -42,6 +42,11 @@ void VectorItem::setX(double value)
     setItemValue(P_X, value);
 }
 
+SessionItem* VectorItem::xItem() const
+{
+    return getItem(P_X);
+}
+
 double VectorItem::y() const
 {
     return getItemValue(P_Y).toDouble();
@@ -52,6 +57,11 @@ void VectorItem::setY(double value)
     setItemValue(P_Y, value);
 }
 
+SessionItem* VectorItem::yItem() const
+{
+    return getItem(P_Y);
+}
+
 double VectorItem::z() const
 {
     return getItemValue(P_Z).toDouble();
@@ -62,6 +72,11 @@ void VectorItem::setZ(double value)
     setItemValue(P_Z, value);
 }
 
+SessionItem* VectorItem::zItem() const
+{
+    return getItem(P_Z);
+}
+
 void VectorItem::setXYZ(double x_value, double y_value, double z_value)
 {
     setX(x_value);

GUI/Models/VectorItem.h

@@ -19,24 +19,27 @@
 #include "GUI/Models/SessionItem.h"
 
 class BA_CORE_API_ VectorItem : public SessionItem {
-
-public:
+private:
     static const QString P_X;
     static const QString P_Y;
     static const QString P_Z;
 
+public:
     static const QString M_TYPE;
 
     VectorItem();
 
     double x() const;
     void setX(double value);
+    SessionItem* xItem() const;
 
     double y() const;
     void setY(double value);
+    SessionItem* yItem() const;
 
     double z() const;
     void setZ(double value);
+    SessionItem* zItem() const;
 
     void setXYZ(double x_value, double y_value, double z_value);
 

Tests/UnitTests/GUI/TestModelUtils.cpp

@@ -86,7 +86,7 @@ TEST_F(TestModelUtils, test_vectorItem)
     // checking SessionItems visited during the iteration
     EXPECT_EQ(indices.size(), 4); // (VectorItem, P_X, P_Y, P_Z) x (row, col)
     EXPECT_EQ(model.itemForIndex(indices.front()), vectorItem);
-    EXPECT_EQ(model.itemForIndex(indices.back()), vectorItem->getItem(VectorItem::P_Z));
+    EXPECT_EQ(model.itemForIndex(indices.back()), vectorItem->zItem());
 }
 
 //! Tests iteration when some children is invisible.

Tests/UnitTests/GUI/TestSessionItemUtils.cpp

@@ -41,9 +41,9 @@ TEST_F(TestSessionItemUtils, test_ParentVisibleRow)
 
     // adding vector item
     auto vector = model.insertItem<VectorItem>();
-    auto x = vector->getItem(VectorItem::P_X);
-    auto y = vector->getItem(VectorItem::P_Y);
-    auto z = vector->getItem(VectorItem::P_Z);
+    auto x = vector->xItem();
+    auto y = vector->yItem();
+    auto z = vector->zItem();
     x->setVisible(false);
     EXPECT_EQ(GUI::Session::ItemUtils::ParentVisibleRow(*x), -1);
     EXPECT_EQ(GUI::Session::ItemUtils::ParentVisibleRow(*y), 0);