.

2 years ago · 2bfc32174a
3 changed files with 13 additions and 6 deletions
--- 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)
--- 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)


 };
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e8cfdf3d93166852f5120da2e1099ed03d377b75
+Subproject commit b4dd5c5455ba904fb45b6a210abcb6b623794d28