From 5a1f178c23d9a2a91cd5621724fb5e22ac5a4ff2 Mon Sep 17 00:00:00 2001 From: pouya Date: Sun, 13 Feb 2022 17:25:17 +0330 Subject: [PATCH] color mode is ready --- .../display/colormodedisplayviewmodel.h | 20 +++++++ .../setting/colormodesettingviewmodel.h | 58 +++++++++++++++++++ logic/include/viewModel/MainViewModel.h | 9 +++ .../include/viewModel/image/BImageContainer.h | 1 - logic/include/viewModel/utils/UsList.h | 7 +-- .../utils/UsListOfImagesWithTextAndSatate.h | 15 +++++ logic/logic.pro | 1 + logic/src/viewModel/MainViewModel.cpp | 5 ++ .../colorMode/ColorModeDisplayViewModel.cpp | 38 ++++++++++++ .../colorMode/colormodesettingviewmodel.cpp | 54 +++++++++++++++++ .../mMode/setting/MModeSettingViewModel.cpp | 1 - ui | 2 +- 12 files changed, 202 insertions(+), 9 deletions(-) create mode 100644 logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h create mode 100644 logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h create mode 100644 logic/include/viewModel/utils/UsListOfImagesWithTextAndSatate.h create mode 100644 logic/src/viewModel/colorMode/ColorModeDisplayViewModel.cpp create mode 100644 logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp diff --git a/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h b/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h new file mode 100644 index 0000000..d902716 --- /dev/null +++ b/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 diff --git a/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h b/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h new file mode 100644 index 0000000..0eb8262 --- /dev/null +++ b/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({"1", "2", "3", "4", "9"})), + "", "", true, true, 1) + + US_SPIN_BOX(ensemble, "Ensemble", (QList({"1", "2", "3", "4", "5", "6"})), + "", "", true, true, 1) + US_SPIN_BOX(flowRes, "Flow Res.", (QList({"1", "2", "3", "4", "5", "6"})), + "", "", true, true, 1) + US_SPIN_BOX(lineDense, "Line Dense.", (QList({"1", "2", "3", "4", "5", "6"})), + "", "", true, true, 1) + US_SPIN_BOX(smoothRaise, "Smooth", (QList({"1", "2", "3", "4", "9"})), + "", "", true, true, 1) + US_SPIN_BOX(smoothFall, "Smooth", (QList({"1", "2", "3", "4", "5", "6"})), + "", "", true, true, 1) + US_MULTI_BUTTON(lineFilter, "Line Filter", (QList({"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({"kHz", "cm/s", "m/s"})), + "", "", true, true, 1) + US_SPIN_BOX(parameter, "Parameter", (QList({"V", "V-T", "V-Pow", "Pow-T", "T"})), + "", "", true, true, 1) + + US_SWITCH_BUTTON_CUSTOM_SETTER(flow, "Flow", "", true, true, false) + + + +}; + +#endif // COLORMODESETTINGVIEWMODEL_H diff --git a/logic/include/viewModel/MainViewModel.h b/logic/include/viewModel/MainViewModel.h index 8ae5209..a9abae5 100644 --- a/logic/include/viewModel/MainViewModel.h +++ b/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()) diff --git a/logic/include/viewModel/image/BImageContainer.h b/logic/include/viewModel/image/BImageContainer.h index 60899fa..98e6930 100644 --- a/logic/include/viewModel/image/BImageContainer.h +++ b/logic/include/viewModel/image/BImageContainer.h @@ -3,7 +3,6 @@ #include #include - #include "viewModel/utils/UsImage.h" class BImageContainer : public QObject diff --git a/logic/include/viewModel/utils/UsList.h b/logic/include/viewModel/utils/UsList.h index 2123cf4..6951612 100644 --- a/logic/include/viewModel/utils/UsList.h +++ b/logic/include/viewModel/utils/UsList.h @@ -8,12 +8,7 @@ public: \ QList NAME() const { return _ ## NAME; } \ void NAME(QList 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(); \ } \ diff --git a/logic/include/viewModel/utils/UsListOfImagesWithTextAndSatate.h b/logic/include/viewModel/utils/UsListOfImagesWithTextAndSatate.h new file mode 100644 index 0000000..e0a8e44 --- /dev/null +++ b/logic/include/viewModel/utils/UsListOfImagesWithTextAndSatate.h @@ -0,0 +1,15 @@ +#ifndef USLISTOFIMAGESWITHTEXTANDSATATE_H +#define USLISTOFIMAGESWITHTEXTANDSATATE_H + +#include "UsList.h" +#include "AutoProperty.h" + +#include +#include + +#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 diff --git a/logic/logic.pro b/logic/logic.pro index b55890e..b5cce2c 100644 --- a/logic/logic.pro +++ b/logic/logic.pro @@ -12,6 +12,7 @@ DEFINES += QT_DEPRECATED_WARNINGS \ SOURCES += $$files(src/*.cpp, true) \ HEADERS += $$files(include/*.h, true) + RESOURCES += \ logic.qrc diff --git a/logic/src/viewModel/MainViewModel.cpp b/logic/src/viewModel/MainViewModel.cpp index 07049c6..e2fba2d 100644 --- a/logic/src/viewModel/MainViewModel.cpp +++ b/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(); } /*************************************************************************************************/ diff --git a/logic/src/viewModel/colorMode/ColorModeDisplayViewModel.cpp b/logic/src/viewModel/colorMode/ColorModeDisplayViewModel.cpp new file mode 100644 index 0000000..7765143 --- /dev/null +++ b/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() +{ +} + + diff --git a/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp b/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp new file mode 100644 index 0000000..f570efa --- /dev/null +++ b/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp @@ -0,0 +1,54 @@ +#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h" + +SINGLETON_DEF(ColorModeSettingViewModel) + +#include +#include + +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() +{ + +} diff --git a/logic/src/viewModel/mMode/setting/MModeSettingViewModel.cpp b/logic/src/viewModel/mMode/setting/MModeSettingViewModel.cpp index 3843add..0207366 100644 --- a/logic/src/viewModel/mMode/setting/MModeSettingViewModel.cpp +++ b/logic/src/viewModel/mMode/setting/MModeSettingViewModel.cpp @@ -13,7 +13,6 @@ SINGLETON_DEF(MModeSettingViewModel) /*************************************************************************************************/ MModeSettingViewModel::MModeSettingViewModel() { - } /*************************************************************************************************/ diff --git a/ui b/ui index 4320086..8f04d99 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 43200868bb970a82b0c4fe2143df7947db5588f8 +Subproject commit 8f04d999366ec1d722742feb9a1ce1a7e8826456