changeset 661:970949ff868a

fix warning
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 15 May 2019 09:03:40 +0200
parents cb3b76d16234
children 794278160a3f
files Framework/Toolbox/SlicesSorter.h Samples/Sdl/Loader.cpp Samples/Sdl/TrackerSampleApp.cpp
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Toolbox/SlicesSorter.h	Tue May 14 19:38:51 2019 +0200
+++ b/Framework/Toolbox/SlicesSorter.h	Wed May 15 09:03:40 2019 +0200
@@ -80,6 +80,9 @@
     
     const Orthanc::IDynamicObject& GetSlicePayload(size_t i) const;
 
+    // WARNING - Apply the sorting algorithm can reduce the number of
+    // slices. This is notably the case if all the slices are not
+    // parallel to the reference normal that will be selected.
     bool Sort();
     
     bool LookupClosestSlice(size_t& index,
--- a/Samples/Sdl/Loader.cpp	Tue May 14 19:38:51 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Wed May 15 09:03:40 2019 +0200
@@ -1505,7 +1505,7 @@
                                           "Cannot sort the 3D slices of a DICOM series");          
         }
 
-        printf("series sorted\n");
+        printf("series sorted %d => %d\n", instances.size(), that_.slices_.GetSlicesCount());
       }
     };
 
@@ -1746,9 +1746,12 @@
 
 
   // 2017-11-17-Anonymized
-  loader1->LoadSeries(oracle, "cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618");  // CT
+  //loader1->LoadSeries(oracle, "cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618");  // CT
   loader2->LoadInstance(oracle, "41029085-71718346-811efac4-420e2c15-d39f99b6");  // RT-DOSE
 
+  // Delphine
+  loader1->LoadSeries(oracle, "5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e");  // CT
+
   LOG(WARNING) << "...Waiting for Ctrl-C...";
   Orthanc::SystemToolbox::ServerBarrier();
   //boost::this_thread::sleep(boost::posix_time::seconds(1));
--- a/Samples/Sdl/TrackerSampleApp.cpp	Tue May 14 19:38:51 2019 +0200
+++ b/Samples/Sdl/TrackerSampleApp.cpp	Wed May 15 09:03:40 2019 +0200
@@ -348,8 +348,8 @@
 
 
   TrackerSampleApp::TrackerSampleApp(MessageBroker& broker) : IObserver(broker)
+    , scene_(broker)
     , currentTool_(GuiTool_Rotate)
-    , scene_(broker)
   {
     scene_.RegisterObserverCallback(
       new Callable<TrackerSampleApp, Scene2D::SceneTransformChanged>