From 1a1e27a43bb4b67ebdb8fef7069b272fe9577045 Mon Sep 17 00:00:00 2001
From: pouya <pooyasis@gmail.com>
Date: Sun, 24 Jul 2022 17:33:39 +0430
Subject: [PATCH] necessary changes for project to run

---
 .../include/viewModel/markerMode/MarkerModeViewModel.h |  2 +-
 logic/include/viewModel/user/UserViewModel.h           |  2 +-
 .../viewModel/colorMode/ColorModeSettingViewModel.cpp  | 10 +++++-----
 ui                                                     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/logic/include/viewModel/markerMode/MarkerModeViewModel.h b/logic/include/viewModel/markerMode/MarkerModeViewModel.h
index a3c9463..68ffee6 100644
--- a/logic/include/viewModel/markerMode/MarkerModeViewModel.h
+++ b/logic/include/viewModel/markerMode/MarkerModeViewModel.h
@@ -10,7 +10,7 @@ class MarkerModeViewModel : public BaseViewModel
     SINGLETON(MarkerModeViewModel)
 
 
-    US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, true)
+    US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, false)
 
 };
 
diff --git a/logic/include/viewModel/user/UserViewModel.h b/logic/include/viewModel/user/UserViewModel.h
index a0adb74..866fbdf 100644
--- a/logic/include/viewModel/user/UserViewModel.h
+++ b/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, false)
+    US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, true)
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementMonitor, false)
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementCalculation, false)
 
diff --git a/logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp b/logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
index 42575b1..18a3660 100644
--- a/logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
+++ b/logic/src/viewModel/colorMode/ColorModeSettingViewModel.cpp
@@ -17,12 +17,12 @@ void ColorModeSettingViewModel::prepareData()
 }
 void ColorModeSettingViewModel::init()
 {
-    qDebug() << "color init";
+//    qDebug() << "color init";
 
-    QTimer::singleShot(5000,[=](){
-        cfmMapNames({"1","2","3","4","5"});
-        cfmMapImageList({"11","22","33","44","55"});
-    });
+//    QTimer::singleShot(5000,[=](){
+//        cfmMapNames({"1","2","3","4","5"});
+//        cfmMapImageList({"11","22","33","44","55"});
+//    });
 
 }
 void ColorModeSettingViewModel::turnOnMinimalMode()
diff --git a/ui b/ui
index 9bc1a99..c6aed7d 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit 9bc1a9945ffb929f13c1803b85e641fab1e73def
+Subproject commit c6aed7d8113da6547c5526eea44fc04ca6071529