From 2bfc32174abf0f4845a1d3f8f7f66bdc93978fd4 Mon Sep 17 00:00:00 2001 From: pouya Date: Tue, 30 Aug 2022 13:26:17 +0430 Subject: [PATCH] . --- logic/include/viewModel/image/ImageViewModel.h | 8 ++++---- logic/include/viewModel/markerMode/MarkerModeViewModel.h | 9 ++++++++- ui | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h index 9ab3a36..eae1f7a 100644 --- a/logic/include/viewModel/image/ImageViewModel.h +++ b/logic/include/viewModel/image/ImageViewModel.h @@ -88,10 +88,10 @@ public: // make new class that has inherited from QQuickImageProvider instead // of imageProvider, send images regard to the name ColorImageProvider* imageProvider; - US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage) - US_MOUSE (mouse) - US_NOTIF(mousePressed) - US_NOTIF(mouseRealeased) +// US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage) +// US_MOUSE (mouse) +// US_NOTIF(mousePressed) +// US_NOTIF(mouseRealeased) US_PROPERTY (int, widthOfScene, 100) diff --git a/logic/include/viewModel/markerMode/MarkerModeViewModel.h b/logic/include/viewModel/markerMode/MarkerModeViewModel.h index fea30da..4a6048a 100644 --- a/logic/include/viewModel/markerMode/MarkerModeViewModel.h +++ b/logic/include/viewModel/markerMode/MarkerModeViewModel.h @@ -31,8 +31,15 @@ class MarkerModeViewModel : public BaseViewModel - US_JSON(BodyMark,"a","") + US_JSON(BodyMark,"","") US_JSON(BodyPart,"","") + US_PROPERTY (int,PointerState,0) + US_PROPERTY (int,PointerStyle,0) + US_PROPERTY (bool,Close,false) + US_PROPERTY (bool,CloseAndSave,false) + US_PROPERTY (bool,AorB,false) + US_PROPERTY (bool,Layers,false) + US_PROPERTY (bool,Visible,false) }; diff --git a/ui b/ui index e8cfdf3..b4dd5c5 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit e8cfdf3d93166852f5120da2e1099ed03d377b75 +Subproject commit b4dd5c5455ba904fb45b6a210abcb6b623794d28