+ add imageProviderSingleFromCpp

logic/include/viewModel/image/ImageViewModel.h

@@ -81,6 +81,13 @@ public:
     ColorImageProvider* imageProviderM;
     ColorImageProvider* imageProviderAnnot;
 
+    //for single image to QML
+    ColorImageProvider* imageProviderSingleFromCpp;
+    US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage)
+    US_MOUSE (mouse)
+    US_NOTIF(mousePressed)
+    US_NOTIF(mouseRealeased)
+
 };
 
 #endif //IMAGEVIEWMODEL_H

logic/include/viewModel/user/UserViewModel.h

@@ -21,7 +21,7 @@ private:
 
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementTopBar, false)
 
-    US_PROPERTY_VIEW_ONLY(bool, dialogPowerOffSystem, true)
+    US_PROPERTY_VIEW_ONLY(bool, dialogPowerOffSystem, false)
 };
 
 #endif //USERVIEWMODEL_H

logic/include/viewModel/utils/AutoProperty.h

@@ -5,6 +5,9 @@
 
 //See Gist Comment for description, usage, warnings and license information
 
+
+/*************************************************************************************************/
+
 #define US_PROPERTY(TYPE, NAME, DEFAULT_VALUE) \
 	Q_PROPERTY(TYPE NAME READ NAME WRITE NAME NOTIFY NAME ## Changed) \
 public: \
@@ -90,5 +93,9 @@ public: \
 private: \
 	TYPE _ ## NAME = DEFAULT_VALUE; \
 	void NAME ## Handle();
+/*************************************************************************************************/
+
+#define US_NOTIF(NAME) \
+    US_PROPERTY(bool,NAME,false)
 
 #endif //AUTOPROPERTY_H

logic/include/viewModel/utils/UsImage.h

@@ -90,4 +90,12 @@
                           NAME ## HorizontalRulerSmallLineEnable, \
                           HORIZONTAL_RULER_SMALL_LINE_ENABLE)
 
+
+#define US_MOUSE(NAME) \
+    US_PROPERTY(int, NAME ## X, -1) \
+    US_PROPERTY(int, NAME ## Y, -1)
+#define US_SONO_IMAGE_MONITOR_RESOLUTION(Name) \
+    US_PROPERTY(int, NAME ## With, -1) \
+    US_PROPERTY(int, NAME ## Height, -1)
+
 #endif //USIMAGE_H

logic/src/viewModel/image/ImageViewModel.cpp

@@ -13,6 +13,14 @@ ImageViewModel::ImageViewModel()
     imageProviderM = new ColorImageProvider();
     imageProviderAnnot = new ColorImageProvider();
 
+    imageProviderSingleFromCpp = new ColorImageProvider();
+
+    //================= for testing imageProviderSingleFromCPP ================
+    QPixmap pixMap(200,200);
+    pixMap.fill (Qt::red);
+    imageProviderSingleFromCpp->setPic (pixMap,100,100);
+    //=========================================================================
+
     _activeImageB = _image1;
 }
 

ui

@@ -1 +1 @@
-Subproject commit f61caa1a25d65c4401499251cb1ef26384842850
+Subproject commit e361ecad782962e70840bddafe593e0b212a716c