diff Framework/Layers/OrthancFrameLayerSource.cpp @ 85:bd48431ac285 wasm

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 26 May 2017 12:20:26 +0200
parents f5f54ed8d307
children 02c3a7a4938f
line wrap: on
line diff
--- a/Framework/Layers/OrthancFrameLayerSource.cpp	Wed May 24 23:25:36 2017 +0200
+++ b/Framework/Layers/OrthancFrameLayerSource.cpp	Fri May 26 12:20:26 2017 +0200
@@ -48,6 +48,8 @@
       }
     }
 
+    LayerSourceBase::NotifyGeometryReady();
+
     if (observer2_ != NULL)
     {
       ParallelSlices slices;
@@ -59,8 +61,6 @@
 
       observer2_->NotifySlicesAvailable(slices);
     }
-      
-    LayerSourceBase::NotifyGeometryReady();
   }
 
   void OrthancFrameLayerSource::NotifyGeometryError(const OrthancSlicesLoader& loader)
@@ -123,12 +123,11 @@
                                           double& y1,
                                           double& x2,
                                           double& y2,
-                                          const SliceGeometry& viewportSlice /* ignored */)
+                                          const SliceGeometry& viewportSlice)
   {
     bool ok = false;
 
-    if (IsStarted() &&
-        loader_.IsGeometryReady())
+    if (loader_.IsGeometryReady())
     {
       double tx1, ty1, tx2, ty2;
 
@@ -164,12 +163,8 @@
   {
     size_t index;
 
-    if (!IsStarted() ||
-        !loader_.IsGeometryReady())
-    {
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-    }
-    else if (loader_.LookupSlice(index, viewportSlice))
+    if (loader_.IsGeometryReady() &&
+        loader_.LookupSlice(index, viewportSlice))
     {
       loader_.ScheduleLoadSliceImage(index);
     }