diff Applications/Samples/SingleFrameEditorApplication.h @ 329:b10dfdb96866 am-2

removing WorldSceneWidget::IWorldObserver
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 17 Oct 2018 12:30:32 +0200
parents 8716176ff7f0
children 7a364e44fbb4
line wrap: on
line diff
--- a/Applications/Samples/SingleFrameEditorApplication.h	Wed Oct 17 10:26:33 2018 +0200
+++ b/Applications/Samples/SingleFrameEditorApplication.h	Wed Oct 17 12:30:32 2018 +0200
@@ -72,9 +72,11 @@
                                                             IStatusBar* statusBar)
         {
           switch (application_.currentTool_) {
-          case Tools_Crop:
+          case Tools_Zoom:
+            printf("ZOOM\n");
+
+            case Tools_Crop:
           case Tools_Windowing:
-          case Tools_Zoom:
           case Tools_Pan:
             // TODO return the right mouse tracker
             return NULL;
@@ -97,7 +99,7 @@
             char buf[64];
             sprintf(buf, "X = %.02f Y = %.02f Z = %.02f (in cm)",
                     p[0] / 10.0, p[1] / 10.0, p[2] / 10.0);
-            statusBar->SetMessage(buf);
+            //statusBar->SetMessage(buf);
           }
         }
 
@@ -149,8 +151,9 @@
         }
       };
 
-      void OnMainWidgetGeometryReady(const ILayerSource::GeometryReadyMessage& message)
+      void OnGeometryChanged(const LayerWidget::GeometryChangedMessage& message)
       {
+        mainWidget_->SetSlice(source_->GetSlice(slice_).GetGeometry());
         mainWidget_->SetDefaultView();
       }
       
@@ -208,7 +211,7 @@
         std::auto_ptr<OrthancFrameLayerSource> layer(new OrthancFrameLayerSource(broker_, *orthancApiClient_));
         source_ = layer.get();
         layer->LoadFrame(instance, frame);
-        layer->RegisterObserverCallback(new Callable<SingleFrameEditorApplication, ILayerSource::GeometryReadyMessage>(*this, &SingleFrameEditorApplication::OnMainWidgetGeometryReady));
+        mainWidget_->RegisterObserverCallback(new Callable<SingleFrameEditorApplication, LayerWidget::GeometryChangedMessage>(*this, &SingleFrameEditorApplication::OnGeometryChanged));
         mainWidget_->AddLayer(layer.release());
 
         mainWidget_->SetTransmitMouseOver(true);