# HG changeset patch # User Sebastien Jodogne # Date 1557903820 -7200 # Node ID 970949ff868a77bac64216877d238126f54ed846 # Parent cb3b76d16234c17d849e97e9a26373e98a7c8c5d fix warning diff -r cb3b76d16234 -r 970949ff868a Framework/Toolbox/SlicesSorter.h --- 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, diff -r cb3b76d16234 -r 970949ff868a Samples/Sdl/Loader.cpp --- 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)); diff -r cb3b76d16234 -r 970949ff868a Samples/Sdl/TrackerSampleApp.cpp --- 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