color mode is ready

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

@@ -0,0 +1,20 @@
+#ifndef COLORMODEDISPLAYVIEWMODEL_H
+#define COLORMODEDISPLAYVIEWMODEL_H
+
+#include "viewModel/BaseViewModel.h"
+#include "viewModel/utils/UsListOfImagesWithTextAndSatate.h"
+
+
+class ColorModeDisplayViewModel : public BaseViewModel
+{
+    Q_OBJECT
+    US_VIEW_MODEL(ColorModeDisplayViewModel)
+    SINGLETON(ColorModeDisplayViewModel)
+
+
+    US_PROPERTY_VIEW_ONLY(bool, colorModeEnable, true)
+
+
+};
+
+#endif // COLORMODEDISPLAYVIEWMODEL_H

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

@@ -0,0 +1,58 @@
+#ifndef COLORMODESETTINGVIEWMODEL_H
+#define COLORMODESETTINGVIEWMODEL_H
+
+#include "viewModel/BaseViewModel.h"
+#include "viewModel/utils/UsListOfImagesWithTextAndSatate.h"
+
+class ColorModeSettingViewModel : public BaseViewModel
+{
+    Q_OBJECT
+    US_VIEW_MODEL(ColorModeSettingViewModel)
+    SINGLETON(ColorModeSettingViewModel)
+
+    private:
+    US_SWITCH_BUTTON(colorOff, "Color Off", "", true, true, false)
+    US_SPIN_BOX(frequency, "Frequency", (QList<QString>({"1", "2", "3", "4", "9"})),
+                  "", "", true, true, 1)
+
+    US_SPIN_BOX(ensemble, "Ensemble", (QList<QString>({"1", "2", "3", "4", "5", "6"})),
+                    "", "", true, true, 1)
+    US_SPIN_BOX(flowRes, "Flow Res.", (QList<QString>({"1", "2", "3", "4", "5", "6"})),
+                    "", "", true, true, 1)
+    US_SPIN_BOX(lineDense, "Line Dense.", (QList<QString>({"1", "2", "3", "4", "5", "6"})),
+                  "", "", true, true, 1)
+    US_SPIN_BOX(smoothRaise, "Smooth", (QList<QString>({"1", "2", "3", "4", "9"})),
+                "", "", true, true, 1)
+    US_SPIN_BOX(smoothFall, "Smooth", (QList<QString>({"1", "2", "3", "4", "5", "6"})),
+                    "", "", true, true, 1)
+    US_MULTI_BUTTON(lineFilter, "Line Filter", (QList<QString>({"Low", "High"})), "", "", true, true, 0, false)
+
+    US_SWITCH_BUTTON_CUSTOM_SETTER(bQuality, "B Quality", "", true, true, false)
+    US_SWITCH_BUTTON_CUSTOM_SETTER(artefact, "Artefact", "", true, true, false)
+
+    //JoySticks
+    US_SWITCH_BUTTON(maxAngle, "Max Angle", "", true, true, true)
+    US_JOYSTICK_NUMBER(angle, "Angle", "", "°", true, true, 0)
+    US_SWITCH_BUTTON(virtualConvex, "Virtual Convex", "", true, true, false)
+    US_SPIN_BOX(threshold, "Threshold", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(quality, "Quality", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(wmf, "WMF", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(baseline, "Baseline", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(balance, "Balance", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(prf, "PRF", {""}, "", "", true, true, 0)
+    US_SPIN_BOX(ao, "AO", {""}, "", "", true, true, 0)
+
+    //display
+    US_LIST_OF_IMAGES_WITH_TEXT_AND_STATE(cfmMap)
+    US_SPIN_BOX(scale, "Scale", (QList<QString>({"kHz", "cm/s", "m/s"})),
+                    "", "", true, true, 1)
+    US_SPIN_BOX(parameter, "Parameter", (QList<QString>({"V", "V-T", "V-Pow", "Pow-T", "T"})),
+                    "", "", true, true, 1)
+
+    US_SWITCH_BUTTON_CUSTOM_SETTER(flow, "Flow", "", true, true, false)
+
+
+
+};
+
+#endif // COLORMODESETTINGVIEWMODEL_H

logic/include/viewModel/MainViewModel.h

@@ -15,6 +15,9 @@
 #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/cine/display/CineDisplayViewModel.h"
 #include "viewModel/cine/setting/CineSettingViewModel.h"
 
@@ -64,6 +67,12 @@ private:
     US_PROPERTY_VIEW_ONLY(MModeSettingViewModel*, mModeSettingViewModel,
                           MModeSettingViewModel::getInstance())
 
+    US_PROPERTY_VIEW_ONLY(ColorModeDisplayViewModel*, colorModeDisplayViewModel,
+                          ColorModeDisplayViewModel::getInstance())
+    US_PROPERTY_VIEW_ONLY(ColorModeSettingViewModel*, colorModeSettingViewModel,
+                          ColorModeSettingViewModel::getInstance())
+
+
 	US_PROPERTY_VIEW_ONLY(CineDisplayViewModel*, cineDisplayViewModel,
 						  CineDisplayViewModel::getInstance())
 

logic/include/viewModel/image/BImageContainer.h

@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QPoint>
-
 #include "viewModel/utils/UsImage.h"
 
 class BImageContainer : public QObject

logic/include/viewModel/utils/UsList.h

@@ -8,12 +8,7 @@
 public: \
 	QList<TYPE> NAME() const { return _ ## NAME; } \
 	void NAME(QList<TYPE> value) { \
-		if(_ ## NAME == value){ return; } \
-		_ ## NAME.clear();  \
-		for(int i = 0; i < value.length(); i++) \
-		{   \
-			_ ## NAME.append(value[i]); \
-		}   \
+        _ ## NAME = value; \
 		emit NAME ## Changed(value); \
 		NAME ## Handle(); \
 	} \

logic/include/viewModel/utils/UsListOfImagesWithTextAndSatate.h

@@ -0,0 +1,15 @@
+#ifndef USLISTOFIMAGESWITHTEXTANDSATATE_H
+#define USLISTOFIMAGESWITHTEXTANDSATATE_H
+
+#include "UsList.h"
+#include "AutoProperty.h"
+
+#include <QList>
+#include <QString>
+
+#define US_LIST_OF_IMAGES_WITH_TEXT_AND_STATE(NAME) \
+    US_LIST(QString, NAME ## ImageList) \
+    US_LIST(QString, NAME ## Names) \
+    US_PROPERTY(int, NAME ## CurrentSelected, 0)
+
+#endif // USLISTOFIMAGESWITHTEXTANDSATATE_H

logic/logic.pro

@@ -12,6 +12,7 @@ DEFINES += QT_DEPRECATED_WARNINGS \
 SOURCES += $$files(src/*.cpp, true) \
 
 HEADERS += $$files(include/*.h, true)
+
 RESOURCES += \
                 logic.qrc
 

logic/src/viewModel/MainViewModel.cpp

@@ -41,6 +41,8 @@ MainViewModel::MainViewModel(QObject* parent) :
 	_vms.push_back(_dialogViewModel);
 
 	_vms.push_back(_measureViewModel);
+
+    init();
 }
 
 void MainViewModel::close()
@@ -98,6 +100,9 @@ void MainViewModel::init()
 	_dialogViewModel->init();
 
 	_measureViewModel->init();
+
+    _colorModeSettingViewModel->init();
+    _colorModeDisplayViewModel->init();
 }
 
 /*************************************************************************************************/

logic/src/viewModel/colorMode/ColorModeDisplayViewModel.cpp

@@ -0,0 +1,38 @@
+#include "viewModel/ColorMode/display/ColorModeDisplayViewModel.h"
+
+SINGLETON_DEF(ColorModeDisplayViewModel)
+
+ColorModeDisplayViewModel::ColorModeDisplayViewModel()
+{
+
+}
+void ColorModeDisplayViewModel::init()
+{
+
+}
+
+/*************************************************************************************************/
+void ColorModeDisplayViewModel::setInitialValue()
+{
+}
+
+/*************************************************************************************************/
+void ColorModeDisplayViewModel::sendData(bool sync)
+{
+}
+
+/*************************************************************************************************/
+void ColorModeDisplayViewModel::prepareData()
+{
+}
+/*************************************************************************************************/
+void ColorModeDisplayViewModel::turnOnMinimalMode()
+{
+}
+
+/*************************************************************************************************/
+void ColorModeDisplayViewModel::turnOffMinimalMode()
+{
+}
+
+

logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp

@@ -0,0 +1,54 @@
+#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h"
+
+SINGLETON_DEF(ColorModeSettingViewModel)
+
+#include <QDebug>
+#include <QTimer>
+
+ColorModeSettingViewModel::ColorModeSettingViewModel()
+{ 
+}
+
+void ColorModeSettingViewModel::setInitialValue()
+{
+}
+void ColorModeSettingViewModel::prepareData()
+{
+}
+void ColorModeSettingViewModel::init()
+{
+    qDebug() << "color init";
+
+    QTimer::singleShot(5000,[=](){
+        cfmMapNames({"1","2","3","4","5"});
+        cfmMapImageList({"11","22","33","44","55"});
+    });
+
+}
+void ColorModeSettingViewModel::turnOnMinimalMode()
+{
+}
+void ColorModeSettingViewModel::turnOffMinimalMode()
+{
+}
+void ColorModeSettingViewModel::sendData(bool sync)
+{
+}
+void ColorModeSettingViewModel::bQualityHandle(){
+    
+}
+void ColorModeSettingViewModel::artefactHandle() {
+    
+}
+void ColorModeSettingViewModel::cfmMapImageListHandle()
+{
+
+}
+void ColorModeSettingViewModel::cfmMapNamesHandle()
+{
+
+}
+void ColorModeSettingViewModel::flowHandle()
+{
+
+}

logic/src/viewModel/mMode/setting/MModeSettingViewModel.cpp

@@ -13,7 +13,6 @@ SINGLETON_DEF(MModeSettingViewModel)
 /*************************************************************************************************/
 MModeSettingViewModel::MModeSettingViewModel()
 {
-
 }
 
 /*************************************************************************************************/

ui

@@ -1 +1 @@
-Subproject commit 43200868bb970a82b0c4fe2143df7947db5588f8
+Subproject commit 8f04d999366ec1d722742feb9a1ce1a7e8826456