From 62d3623265e5a466c9055ff1fcd06347b6cb0ebe Mon Sep 17 00:00:00 2001
From: pouya <pooyasis@gmail.com>
Date: Mon, 15 Aug 2022 18:55:26 +0430
Subject: [PATCH] +

---
 logic/include/viewModel/image/ImageViewModel.h         | 8 +++++++-
 logic/src/viewModel/image/ImageViewModel.cpp           | 2 ++
 logic/src/viewModel/markerMode/MarkerModeViewModel.cpp | 8 ++++----
 ui                                                     | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h
index c85d32e..9ab3a36 100644
--- a/logic/include/viewModel/image/ImageViewModel.h
+++ b/logic/include/viewModel/image/ImageViewModel.h
@@ -77,17 +77,23 @@ private:
     US_PROPERTY_VIEW_ONLY(bool, cModeEnable, true)
 
 public:
+
+
     ColorImageProvider* imageProviderB;
     ColorImageProvider* imageProviderM;
     ColorImageProvider* imageProviderAnnot;
 
-    //for single image to QML
+    ColorImageProvider* imageProviderPictures;
+    // ##1 we use this for bodyMoark
+    // make new class that has inherited from QQuickImageProvider instead
+    // of imageProvider, send images regard to the name
     ColorImageProvider* imageProvider;
     US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage)
     US_MOUSE (mouse)
     US_NOTIF(mousePressed)
     US_NOTIF(mouseRealeased)
 
+
     US_PROPERTY (int, widthOfScene, 100)
     US_PROPERTY (int, heightOfScene, 100)
 
diff --git a/logic/src/viewModel/image/ImageViewModel.cpp b/logic/src/viewModel/image/ImageViewModel.cpp
index 2262fb9..708896d 100644
--- a/logic/src/viewModel/image/ImageViewModel.cpp
+++ b/logic/src/viewModel/image/ImageViewModel.cpp
@@ -14,11 +14,13 @@ ImageViewModel::ImageViewModel()
     imageProviderAnnot = new ColorImageProvider();
 
     imageProvider = new ColorImageProvider();
+    imageProviderPictures = new ColorImageProvider();
 
     //================= for testing imageProviderSingleFromCPP ================
     QPixmap pixMap(200,200);
     pixMap.fill (Qt::red);
     imageProvider->setPic (pixMap,100,100);
+    imageProviderPictures->setPic (pixMap,100,100);
     //=========================================================================
 
     _activeImageB = _image1;
diff --git a/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp b/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp
index 533a335..2053cbd 100644
--- a/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp
+++ b/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp
@@ -31,10 +31,10 @@ void MarkerModeViewModel::init()
     BodyPartJson (answer);
 
     //================================
-    connect (this,&MarkerModeViewModel::BodyMarkChanged,[=](){
-        qDebug() << this->BodyMark() << "k";
-    });
-    qDebug() << "Hi";
+//    connect (this,&MarkerModeViewModel::BodyMarkChanged,[=](){
+//        qDebug() << this->BodyMark() << "k";
+//    });
+//    qDebug() << "Hi";
 }
 void MarkerModeViewModel::setInitialValue()
 {
diff --git a/ui b/ui
index e065d81..e8cfdf3 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit e065d81a2ef2c17a3879badb16a90108327461be
+Subproject commit e8cfdf3d93166852f5120da2e1099ed03d377b75