Mercurial > hg > orthanc-stone

comparison Applications/Qt/QCairoWidget.cpp @ 730:fe938bddb932 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix after namespace rename to Deprecated
author Alain Mazy <alain@mazy.be>
date Tue, 21 May 2019 13:53:11 +0200
parents e77cbe4bb4c8
children 922d2e61aa5d
comparison
equal deleted inserted replaced
728:8190213e2279 730:fe938bddb932
25 25
26 #include <stdexcept> 26 #include <stdexcept>
27 27
28 28
29 QCairoWidget::StoneObserver::StoneObserver(QCairoWidget& that, 29 QCairoWidget::StoneObserver::StoneObserver(QCairoWidget& that,
30 OrthancStone::IViewport& viewport, 30 Deprecated::IViewport& viewport,
31 OrthancStone::MessageBroker& broker) : 31 OrthancStone::MessageBroker& broker) :
32 OrthancStone::IObserver(broker), 32 OrthancStone::IObserver(broker),
33 that_(that) 33 that_(that)
34 { 34 {
35 // get notified each time the content of the central viewport changes 35 // get notified each time the content of the central viewport changes
36 viewport.RegisterObserverCallback( 36 viewport.RegisterObserverCallback(
37 new OrthancStone::Callable<StoneObserver, OrthancStone::IViewport::ViewportChangedMessage> 37 new OrthancStone::Callable<StoneObserver, Deprecated::IViewport::ViewportChangedMessage>
38 (*this, &StoneObserver::OnViewportChanged)); 38 (*this, &StoneObserver::OnViewportChanged));
39 } 39 }
40 40
41 41
42 QCairoWidget::QCairoWidget(QWidget *parent) : 42 QCairoWidget::QCairoWidget(QWidget *parent) :
66 66
67 if (image_.get() != NULL && 67 if (image_.get() != NULL &&
68 context_ != NULL) 68 context_ != NULL)
69 { 69 {
70 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); 70 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
71 OrthancStone::IViewport& viewport = locker.GetCentralViewport(); 71 Deprecated::IViewport& viewport = locker.GetCentralViewport();
72 Orthanc::ImageAccessor a; 72 Orthanc::ImageAccessor a;
73 surface_.GetWriteableAccessor(a); 73 surface_.GetWriteableAccessor(a);
74 viewport.Render(a); 74 viewport.Render(a);
75 painter.drawImage(0, 0, *image_); 75 painter.drawImage(0, 0, *image_);
76 } 76 }
123 return; // Unsupported button 123 return; // Unsupported button
124 } 124 }
125 125
126 { 126 {
127 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); 127 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
128 locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<OrthancStone::Touch>()); 128 locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<Deprecated::Touch>());
129 } 129 }
130 } 130 }
131 131
132 132
133 void QCairoWidget::mouseReleaseEvent(QMouseEvent* /*eventNotUsed*/) 133 void QCairoWidget::mouseReleaseEvent(QMouseEvent* /*eventNotUsed*/)
138 138
139 139
140 void QCairoWidget::mouseMoveEvent(QMouseEvent* event) 140 void QCairoWidget::mouseMoveEvent(QMouseEvent* event)
141 { 141 {
142 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_); 142 OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
143 locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<OrthancStone::Touch>()); 143 locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<Deprecated::Touch>());
144 } 144 }
145 145
146 146
147 void QCairoWidget::wheelEvent(QWheelEvent * event) 147 void QCairoWidget::wheelEvent(QWheelEvent * event)
148 { 148 {