From fb45d89d627bda6e1354be94e97bcc0eab950afc Mon Sep 17 00:00:00 2001
From: pouya <pooyasis@gmail.com>
Date: Mon, 6 Jun 2022 17:53:03 +0430
Subject: [PATCH] + add imageProviderSingleFromCpp

---
 ...modedisplayviewmodel.h => ColorModeDisplayViewModel.h} | 0
 ...modesettingviewmodel.h => ColorModeSettingViewModel.h} | 0
 logic/include/viewModel/image/ImageViewModel.h            | 7 +++++++
 logic/include/viewModel/user/UserViewModel.h              | 2 +-
 logic/include/viewModel/utils/AutoProperty.h              | 7 +++++++
 logic/include/viewModel/utils/UsImage.h                   | 8 ++++++++
 ...settingviewmodel.cpp => ColorModeSettingViewModel.cpp} | 0
 logic/src/viewModel/image/ImageViewModel.cpp              | 8 ++++++++
 ui                                                        | 2 +-
 9 files changed, 32 insertions(+), 2 deletions(-)
 rename logic/include/viewModel/ColorMode/display/{colormodedisplayviewmodel.h => ColorModeDisplayViewModel.h} (100%)
 rename logic/include/viewModel/ColorMode/setting/{colormodesettingviewmodel.h => ColorModeSettingViewModel.h} (100%)
 rename logic/src/viewModel/colorMode/{colormodesettingviewmodel.cpp => ColorModeSettingViewModel.cpp} (100%)

diff --git a/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h b/logic/include/viewModel/ColorMode/display/ColorModeDisplayViewModel.h
similarity index 100%
rename from logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h
rename to logic/include/viewModel/ColorMode/display/ColorModeDisplayViewModel.h
diff --git a/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h b/logic/include/viewModel/ColorMode/setting/ColorModeSettingViewModel.h
similarity index 100%
rename from logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h
rename to logic/include/viewModel/ColorMode/setting/ColorModeSettingViewModel.h
diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h
index f1b7d21..76043e7 100644
--- a/logic/include/viewModel/image/ImageViewModel.h
+++ b/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
diff --git a/logic/include/viewModel/user/UserViewModel.h b/logic/include/viewModel/user/UserViewModel.h
index c05bdcb..a0adb74 100644
--- a/logic/include/viewModel/user/UserViewModel.h
+++ b/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
diff --git a/logic/include/viewModel/utils/AutoProperty.h b/logic/include/viewModel/utils/AutoProperty.h
index 637ed0c..e9baa69 100644
--- a/logic/include/viewModel/utils/AutoProperty.h
+++ b/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
diff --git a/logic/include/viewModel/utils/UsImage.h b/logic/include/viewModel/utils/UsImage.h
index a668ecc..96ffed4 100644
--- a/logic/include/viewModel/utils/UsImage.h
+++ b/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
diff --git a/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp b/logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
similarity index 100%
rename from logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp
rename to logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
diff --git a/logic/src/viewModel/image/ImageViewModel.cpp b/logic/src/viewModel/image/ImageViewModel.cpp
index 8ebc413..78ec3bd 100644
--- a/logic/src/viewModel/image/ImageViewModel.cpp
+++ b/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;
 }
 
diff --git a/ui b/ui
index f61caa1..e361eca 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit f61caa1a25d65c4401499251cb1ef26384842850
+Subproject commit e361ecad782962e70840bddafe593e0b212a716c