Mercurial > hg > orthanc-stone

changeset 779:e72a9fef3d19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 May 2019 10:34:34 +0200
parents 78fcb907caf6
children f81655ed96ab
files Samples/Sdl/Loader.cpp
diffstat 1 files changed, 40 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/Sdl/Loader.cpp	Mon May 27 09:49:44 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Mon May 27 10:34:34 2019 +0200
@@ -768,8 +768,6 @@
         }
 
         volume_.SetGeometry(slices);
-
-        BroadcastMessage(VolumeGeometryReadyMessage(*this, volume_.GetGeometry()));
       }
 
       if (volume_.GetSlicesCount() != 0)
@@ -783,6 +781,8 @@
           ScheduleNextSliceDownload();
         }
       }
+
+      BroadcastMessage(VolumeGeometryReadyMessage(*this, volume_.GetGeometry()));
     }
 
 
@@ -900,7 +900,7 @@
           (new DicomSeriesVolumeImage::ExtractedOrthogonalSlice(volume_, cuttingPlane));
 
         assert(slice.get() != NULL &&
-               strategy_.get() != NULL);            
+               strategy_.get() != NULL);
 
         if (slice->IsValid() &&
             slice->GetProjection() == VolumeProjection_Axial)
@@ -1593,6 +1593,40 @@
   std::auto_ptr<OrthancStone::VolumeSceneLayerSource>  source1_, source2_;
 
 
+  void Refresh()
+  {
+    if (source1_.get() != NULL)
+    {
+      source1_->Update(plane_);
+    }
+      
+    if (source2_.get() != NULL)
+    {
+      source2_->Update(plane_);
+    }
+
+    scene_.FitContent(1024, 768);
+      
+    {
+      OrthancStone::CairoCompositor compositor(scene_, 1024, 768);
+      compositor.Refresh();
+        
+      Orthanc::ImageAccessor accessor;
+      compositor.GetCanvas().GetReadOnlyAccessor(accessor);
+
+      Orthanc::Image tmp(Orthanc::PixelFormat_RGB24, accessor.GetWidth(), accessor.GetHeight(), false);
+      Orthanc::ImageProcessing::Convert(tmp, accessor);
+        
+      static unsigned int count = 0;
+      char buf[64];
+      sprintf(buf, "scene-%06d.png", count++);
+        
+      Orthanc::PngWriter writer;
+      writer.WriteToFile(buf, tmp);
+    }
+  }
+
+  
   void Handle(const OrthancStone::VolumeGeometryReadyMessage& message)
   {
     printf("Geometry ready\n");
@@ -1604,6 +1638,8 @@
       plane_ = message.GetGeometry().GetCoronalGeometry();
       plane_.SetOrigin(message.GetGeometry().GetCoordinates(0.5f, 0.5f, 0.5f));
     }
+
+    Refresh();
   }
   
   
@@ -1617,35 +1653,7 @@
     {
       printf("TIMEOUT\n");
 
-      if (source1_.get() != NULL)
-      {
-        source1_->Update(plane_);
-      }
-      
-      if (source2_.get() != NULL)
-      {
-        source2_->Update(plane_);
-      }
-
-      scene_.FitContent(1024, 768);
-      
-      {
-        OrthancStone::CairoCompositor compositor(scene_, 1024, 768);
-        compositor.Refresh();
-        
-        Orthanc::ImageAccessor accessor;
-        compositor.GetCanvas().GetReadOnlyAccessor(accessor);
-
-        Orthanc::Image tmp(Orthanc::PixelFormat_RGB24, accessor.GetWidth(), accessor.GetHeight(), false);
-        Orthanc::ImageProcessing::Convert(tmp, accessor);
-        
-        static unsigned int count = 0;
-        char buf[64];
-        sprintf(buf, "scene-%06d.png", count++);
-        
-        Orthanc::PngWriter writer;
-        writer.WriteToFile(buf, tmp);
-      }
+      Refresh();
 
       /**
        * The sleep() leads to a crash if the oracle is still running,