# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1558441672 -7200
# Node ID 717eabfa749addf9b42a30ffbe21544aa240e1ad
# Parent  c35e98d22764617113d88f583609c714bdfde196# Parent  ac4fe43551a1c6321e0f0cff574389a2c13f180e
merge

diff -r c35e98d22764 -r 717eabfa749a Applications/Qt/QCairoWidget.cpp
--- a/Applications/Qt/QCairoWidget.cpp	Tue May 21 14:27:35 2019 +0200
+++ b/Applications/Qt/QCairoWidget.cpp	Tue May 21 14:27:52 2019 +0200
@@ -27,14 +27,14 @@
 
 
 QCairoWidget::StoneObserver::StoneObserver(QCairoWidget& that,
-                                           OrthancStone::IViewport& viewport,
+                                           Deprecated::IViewport& viewport,
                                            OrthancStone::MessageBroker& broker) :
   OrthancStone::IObserver(broker),
   that_(that)
 {
   // get notified each time the content of the central viewport changes
   viewport.RegisterObserverCallback(
-    new OrthancStone::Callable<StoneObserver, OrthancStone::IViewport::ViewportChangedMessage>
+    new OrthancStone::Callable<StoneObserver, Deprecated::IViewport::ViewportChangedMessage>
     (*this, &StoneObserver::OnViewportChanged));
 }
 
@@ -68,7 +68,7 @@
       context_ != NULL)
   {
     OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
-    OrthancStone::IViewport& viewport = locker.GetCentralViewport();
+    Deprecated::IViewport& viewport = locker.GetCentralViewport();
     Orthanc::ImageAccessor a;
     surface_.GetWriteableAccessor(a);
     viewport.Render(a);
@@ -125,7 +125,7 @@
 
   {
     OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
-    locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<OrthancStone::Touch>());
+    locker.GetCentralViewport().MouseDown(button, event->pos().x(), event->pos().y(), stoneModifiers, std::vector<Deprecated::Touch>());
   }
 }
 
@@ -140,7 +140,7 @@
 void QCairoWidget::mouseMoveEvent(QMouseEvent* event)
 {
   OrthancStone::NativeStoneApplicationContext::GlobalMutexLocker locker(*context_);
-  locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<OrthancStone::Touch>());
+  locker.GetCentralViewport().MouseMove(event->pos().x(), event->pos().y(), std::vector<Deprecated::Touch>());
 }
 
 
diff -r c35e98d22764 -r 717eabfa749a Applications/Qt/QCairoWidget.h
--- a/Applications/Qt/QCairoWidget.h	Tue May 21 14:27:35 2019 +0200
+++ b/Applications/Qt/QCairoWidget.h	Tue May 21 14:27:52 2019 +0200
@@ -40,10 +40,10 @@
     
   public:
     StoneObserver(QCairoWidget& that,
-                  OrthancStone::IViewport& viewport,
+                  Deprecated::IViewport& viewport,
                   OrthancStone::MessageBroker& broker);
 
-    void OnViewportChanged(const OrthancStone::IViewport::ViewportChangedMessage& message)
+    void OnViewportChanged(const Deprecated::IViewport::ViewportChangedMessage& message)
     {
       that_.OnViewportChanged();
     }
diff -r c35e98d22764 -r 717eabfa749a Framework/Radiography/RadiographyScene.h
--- a/Framework/Radiography/RadiographyScene.h	Tue May 21 14:27:35 2019 +0200
+++ b/Framework/Radiography/RadiographyScene.h	Tue May 21 14:27:52 2019 +0200
@@ -157,7 +157,7 @@
 
     void OnDicomWebReceived(const Deprecated::IWebService::HttpRequestSuccessMessage& message);
 
-    void OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message);
+    virtual void OnLayerEdited(const RadiographyLayer::LayerEditedMessage& message);
   public:
     RadiographyScene(MessageBroker& broker);
     
@@ -169,8 +169,8 @@
     void GetWindowingWithDefault(float& center,
                                  float& width) const;
 
-    void SetWindowing(float center,
-                      float width);
+    virtual void SetWindowing(float center,
+                              float width);
 
     PhotometricDisplayMode GetPreferredPhotomotricDisplayMode() const;