diff --git a/logic/include/viewModel/MainViewModel.h b/logic/include/viewModel/MainViewModel.h index 4eebe66..45d9782 100644 --- a/logic/include/viewModel/MainViewModel.h +++ b/logic/include/viewModel/MainViewModel.h @@ -33,6 +33,9 @@ #include "viewModel/measurement/MeasureViewModel.h" +#include "viewModel/markerMode/MarkerModeViewModel.h" + + class MainViewModel : public QtMvvm::ViewModel { Q_OBJECT @@ -61,6 +64,9 @@ private: US_PROPERTY_VIEW_ONLY(BModeSettingViewModel*, bModeSettingViewModel, BModeSettingViewModel::getInstance()) + US_PROPERTY_VIEW_ONLY(MarkerModeViewModel*, markerModeViewModel, + MarkerModeViewModel::getInstance()) + US_PROPERTY_VIEW_ONLY(MModeDisplayViewModel*, mModeDisplayViewModel, MModeDisplayViewModel::getInstance()) diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h index 76043e7..79197be 100644 --- a/logic/include/viewModel/image/ImageViewModel.h +++ b/logic/include/viewModel/image/ImageViewModel.h @@ -82,7 +82,7 @@ public: ColorImageProvider* imageProviderAnnot; //for single image to QML - ColorImageProvider* imageProviderSingleFromCpp; + ColorImageProvider* imageProvider; US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage) US_MOUSE (mouse) US_NOTIF(mousePressed) diff --git a/logic/include/viewModel/markerMode/MarkerModeViewModel.h b/logic/include/viewModel/markerMode/MarkerModeViewModel.h new file mode 100644 index 0000000..a3c9463 --- /dev/null +++ b/logic/include/viewModel/markerMode/MarkerModeViewModel.h @@ -0,0 +1,17 @@ +#ifndef MARKERMODEVIEWMODEL_H +#define MARKERMODEVIEWMODEL_H + +#include "viewModel/BaseViewModel.h" + +class MarkerModeViewModel : public BaseViewModel +{ + Q_OBJECT + US_VIEW_MODEL(MarkerModeViewModel) + SINGLETON(MarkerModeViewModel) + + + US_PROPERTY_VIEW_ONLY(bool, isMarkerModeActive, true) + +}; + +#endif \ No newline at end of file diff --git a/logic/src/viewModel/MainViewModel.cpp b/logic/src/viewModel/MainViewModel.cpp index 122bf89..7f4a5c1 100644 --- a/logic/src/viewModel/MainViewModel.cpp +++ b/logic/src/viewModel/MainViewModel.cpp @@ -24,6 +24,8 @@ MainViewModel::MainViewModel(QObject* parent) : _vms.push_back(_bModeDisplayViewModel); _vms.push_back(_bModeSettingViewModel); + _vms.push_back(_markerModeViewModel); + _vms.push_back(_mModeDisplayViewModel); _vms.push_back(_mModeSettingViewModel); @@ -86,6 +88,8 @@ void MainViewModel::init() _bModeDisplayViewModel->init(); _bModeSettingViewModel->init(); + _markerModeViewModel->init (); + _mModeDisplayViewModel->init(); _mModeSettingViewModel->init(); @@ -123,6 +127,8 @@ void MainViewModel::start() _bModeDisplayViewModel->start(); _bModeSettingViewModel->start(); + _markerModeViewModel->start (); + _mModeDisplayViewModel->start(); _mModeSettingViewModel->start(); diff --git a/logic/src/viewModel/image/ImageViewModel.cpp b/logic/src/viewModel/image/ImageViewModel.cpp index 78ec3bd..2262fb9 100644 --- a/logic/src/viewModel/image/ImageViewModel.cpp +++ b/logic/src/viewModel/image/ImageViewModel.cpp @@ -13,12 +13,12 @@ ImageViewModel::ImageViewModel() imageProviderM = new ColorImageProvider(); imageProviderAnnot = new ColorImageProvider(); - imageProviderSingleFromCpp = new ColorImageProvider(); + imageProvider = new ColorImageProvider(); //================= for testing imageProviderSingleFromCPP ================ QPixmap pixMap(200,200); pixMap.fill (Qt::red); - imageProviderSingleFromCpp->setPic (pixMap,100,100); + imageProvider->setPic (pixMap,100,100); //========================================================================= _activeImageB = _image1; diff --git a/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp b/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp new file mode 100644 index 0000000..3dc6009 --- /dev/null +++ b/logic/src/viewModel/markerMode/MarkerModeViewModel.cpp @@ -0,0 +1,46 @@ +#include "viewModel/markerMode/MarkerModeViewModel.h" + +#include "viewModel/UsmMimic.h" + + +SINGLETON_DEF(MarkerModeViewModel) + +MarkerModeViewModel::MarkerModeViewModel() +{ +} +void MarkerModeViewModel::init() +{ +} +void MarkerModeViewModel::setInitialValue() +{ + +} + +/*************************************************************************************************/ +/** + * @brief BModeSettingViewModel::sendData + */ +/*************************************************************************************************/ +void MarkerModeViewModel::sendData(bool sync) +{ + +} + +/*************************************************************************************************/ +/** + * @brief BModeSettingViewModel::prepareData + */ +/*************************************************************************************************/ +void MarkerModeViewModel::prepareData() +{ + +} +void MarkerModeViewModel::turnOnMinimalMode() +{ + +} + +/*************************************************************************************************/ +void MarkerModeViewModel::turnOffMinimalMode() +{ +} \ No newline at end of file diff --git a/ui b/ui index e361eca..9bc1a99 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit e361ecad782962e70840bddafe593e0b212a716c +Subproject commit 9bc1a9945ffb929f13c1803b85e641fab1e73def