working on power dialog

logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h

@@ -14,7 +14,6 @@ class ColorModeDisplayViewModel : public BaseViewModel
 
     US_PROPERTY_VIEW_ONLY(bool, colorModeEnable, true)
 
-
 };
 
 #endif // COLORMODEDISPLAYVIEWMODEL_H

logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h

@@ -53,6 +53,14 @@ class ColorModeSettingViewModel : public BaseViewModel
 
 
 
+    US_SPIN_BOX(reject, "Reject", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(depth, "Depth", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(dynamicContrast, "Dy.Cnt.", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(enhance, "Enhance", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(infoMax, "Max", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(infoMin, "Min", (QList<QString>({""})), "", "", true, true, 0)
+    US_PROPERTY(QString, displayInfoColorMap, "")
+
 };
 
 #endif // COLORMODESETTINGVIEWMODEL_H

logic/include/viewModel/MainViewModel.h

@@ -15,8 +15,8 @@
 #include "viewModel/mMode/display/MModeDisplayViewModel.h"
 #include "viewModel/mMode/setting/MModeSettingViewModel.h"
 
-#include "viewModel/ColorMode/display/colormodedisplayviewmodel.h"
-#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h"
+#include "viewModel/ColorMode/display/ColorModeDisplayViewModel.h"
+#include "viewModel/ColorMode/setting/ColorModeSettingViewModel.h"
 
 #include "viewModel/cine/display/CineDisplayViewModel.h"
 #include "viewModel/cine/setting/CineSettingViewModel.h"

logic/include/viewModel/image/ImageViewModel.h

@@ -73,7 +73,8 @@ private:
 	US_SWITCH_BUTTON_CUSTOM_SETTER_INTERNAL(quad, "Quad", "", true, true, false)
 
     US_PROPERTY_VIEW_ONLY(bool, mModeEnable, true)
-    US_PROPERTY_VIEW_ONLY(bool, mModeLineSelected, false)
+    US_PROPERTY_VIEW_ONLY(bool, mModeLineSelected, true)
+    US_PROPERTY_VIEW_ONLY(bool, cModeEnable, true)
 
 public:
     ColorImageProvider* imageProviderB;

logic/include/viewModel/mMode/setting/MModeSettingViewModel.h

@@ -34,7 +34,6 @@ private:
 
     US_INFO_BOX(gain, "Gain", (QList<QString>({""})), "", "dB", true, true, 0)
 
-
     US_SWITCH_BUTTON(maxAngle, "Max Angle", "", true, true, false)
     US_JOYSTICK_NUMBER(angle, "Angle", "", "°", true, true, 0)
     US_SWITCH_BUTTON(virtualConvex, "Virtual Convex", "", true, true, false)

logic/include/viewModel/user/UserViewModel.h

@@ -20,6 +20,8 @@ private:
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementCalculation, false)
 
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementTopBar, false)
+
+    US_PROPERTY_VIEW_ONLY(bool, dialogPowerOffSystem, true)
 };
 
 #endif //USERVIEWMODEL_H

logic/src/viewModel/MainViewModel.cpp

@@ -27,6 +27,9 @@ MainViewModel::MainViewModel(QObject* parent) :
 	_vms.push_back(_mModeDisplayViewModel);
 	_vms.push_back(_mModeSettingViewModel);
 
+    _vms.push_back(_colorModeDisplayViewModel);
+    _vms.push_back(_colorModeSettingViewModel);
+
 	_vms.push_back(_cineDisplayViewModel);
 	_vms.push_back(_cineSettingViewModel);
 

logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp

@@ -1,4 +1,4 @@
-#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h"
+#include "viewModel/ColorMode/setting/ColorModeSettingViewModel.h"
 
 SINGLETON_DEF(ColorModeSettingViewModel)
 

ui

@@ -1 +1 @@
-Subproject commit 8f04d999366ec1d722742feb9a1ce1a7e8826456
+Subproject commit 0f4a4ebaccd468937eb9fe15cad1e97087807a95