Browse Source

+

feature/markerMode
pouya 3 years ago
parent
commit
62d3623265
  1. 8
      logic/include/viewModel/image/ImageViewModel.h
  2. 2
      logic/src/viewModel/image/ImageViewModel.cpp
  3. 8
      logic/src/viewModel/markerMode/MarkerModeViewModel.cpp
  4. 2
      ui

8
logic/include/viewModel/image/ImageViewModel.h

@ -77,17 +77,23 @@ private:
US_PROPERTY_VIEW_ONLY(bool, cModeEnable, true) US_PROPERTY_VIEW_ONLY(bool, cModeEnable, true)
public: public:
ColorImageProvider* imageProviderB; ColorImageProvider* imageProviderB;
ColorImageProvider* imageProviderM; ColorImageProvider* imageProviderM;
ColorImageProvider* imageProviderAnnot; ColorImageProvider* imageProviderAnnot;
//for single image to QML ColorImageProvider* imageProviderPictures;
// ##1 we use this for bodyMoark
// make new class that has inherited from QQuickImageProvider instead
// of imageProvider, send images regard to the name
ColorImageProvider* imageProvider; ColorImageProvider* imageProvider;
US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage) US_SONO_IMAGE_MONITOR_RESOLUTION(SonoImage)
US_MOUSE (mouse) US_MOUSE (mouse)
US_NOTIF(mousePressed) US_NOTIF(mousePressed)
US_NOTIF(mouseRealeased) US_NOTIF(mouseRealeased)
US_PROPERTY (int, widthOfScene, 100) US_PROPERTY (int, widthOfScene, 100)
US_PROPERTY (int, heightOfScene, 100) US_PROPERTY (int, heightOfScene, 100)

2
logic/src/viewModel/image/ImageViewModel.cpp

@ -14,11 +14,13 @@ ImageViewModel::ImageViewModel()
imageProviderAnnot = new ColorImageProvider(); imageProviderAnnot = new ColorImageProvider();
imageProvider = new ColorImageProvider(); imageProvider = new ColorImageProvider();
imageProviderPictures = new ColorImageProvider();
//================= for testing imageProviderSingleFromCPP ================ //================= for testing imageProviderSingleFromCPP ================
QPixmap pixMap(200,200); QPixmap pixMap(200,200);
pixMap.fill (Qt::red); pixMap.fill (Qt::red);
imageProvider->setPic (pixMap,100,100); imageProvider->setPic (pixMap,100,100);
imageProviderPictures->setPic (pixMap,100,100);
//========================================================================= //=========================================================================
_activeImageB = _image1; _activeImageB = _image1;

8
logic/src/viewModel/markerMode/MarkerModeViewModel.cpp

@ -31,10 +31,10 @@ void MarkerModeViewModel::init()
BodyPartJson (answer); BodyPartJson (answer);
//================================ //================================
connect (this,&MarkerModeViewModel::BodyMarkChanged,[=](){ // connect (this,&MarkerModeViewModel::BodyMarkChanged,[=](){
qDebug() << this->BodyMark() << "k"; // qDebug() << this->BodyMark() << "k";
}); // });
qDebug() << "Hi"; // qDebug() << "Hi";
} }
void MarkerModeViewModel::setInitialValue() void MarkerModeViewModel::setInitialValue()
{ {

2
ui

@ -1 +1 @@
Subproject commit e065d81a2ef2c17a3879badb16a90108327461be Subproject commit e8cfdf3d93166852f5120da2e1099ed03d377b75
Loading…
Cancel
Save