+

logic/include/viewModel/image/ImageViewModel.h

@@ -88,6 +88,9 @@ public:
     US_NOTIF(mousePressed)
     US_NOTIF(mouseRealeased)
 
+    US_PROPERTY (int, widthOfScene, 100)
+    US_PROPERTY (int, heightOfScene, 100)
+
 };
 
 #endif //IMAGEVIEWMODEL_H

logic/include/viewModel/markerMode/MarkerModeViewModel.h

@@ -10,7 +10,13 @@ class MarkerModeViewModel : public BaseViewModel
     SINGLETON(MarkerModeViewModel)
 
 
-    US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, false)
+    US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, true)
+
+    //=======JoySticks=======
+    US_JOYSTICK_NUMBER(BodyMarkAngle, "Angle", "", "", true, true, 0)
+    US_JOYSTICK_NUMBER(BodyMark, "BodyMark", "", "", true, true, 0)
+    US_JOYSTICK_NUMBER(PointerAngle, "Angle", "", "", true, true, 0)
+    US_JOYSTICK_NUMBER(IndicatorSize, "Indicator Size", "", "", true, true, 0)
 
 };
 

logic/include/viewModel/user/UserViewModel.h

@@ -15,7 +15,7 @@ private:
     US_PROPERTY(EMenuTab::eMenuTab, activeTab, EMenuTab::M_TAB)
 
 	US_PROPERTY_VIEW_ONLY(bool, viewTGC, false)
-    US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, true)
+    US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, false)
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementMonitor, false)
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementCalculation, false)
 

logic/include/viewModel/utils/UsJoystick.h

@@ -31,4 +31,14 @@
 	US_PROPERTY_VIEW_ONLY(bool, NAME ## Visible, VISIBLE)   \
 	US_PROPERTY(int, NAME, DEFAULT_VALUE)
 
+#define US_JOYSTICK_PUSH(NAME, \
+                           TITLE, \
+                           ENABLE, \
+                           VISIBLE, \
+                           DEFAULT_VALUE)   \
+    US_PROPERTY_VIEW_ONLY(QString, NAME ## Title, TITLE) \
+    US_PROPERTY_VIEW_ONLY(bool, NAME ## Enable, ENABLE)     \
+    US_PROPERTY_VIEW_ONLY(bool, NAME ## Visible, VISIBLE)   \
+    US_PROPERTY(int, NAME, DEFAULT_VALUE)
+
 #endif //USJOYSTICK_H

ui

@@ -1 +1 @@
-Subproject commit c6aed7d8113da6547c5526eea44fc04ca6071529
+Subproject commit d0bf556c101384b62f4d595d03043cad148eb1d7