Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp @ 1222:21c2b0eee53c broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating MessageHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 07 Dec 2019 18:18:07 +0100
parents 04a95ee91327
children 0ca50d275b9a
line wrap: on
line diff
--- a/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp	Fri Dec 06 17:05:57 2019 +0100
+++ b/Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp	Sat Dec 07 18:18:07 2019 +0100
@@ -656,8 +656,8 @@
     {
       state_ = State_LoadingGeometry;
       orthanc_->GetJsonAsync("/series/" + seriesId + "/instances-tags",
-                             new OrthancStone::Callable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseSeriesGeometry),
-                             new OrthancStone::Callable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
+                             new DeprecatedCallable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseSeriesGeometry),
+                             new DeprecatedCallable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
                              NULL);
     }
   }
@@ -675,8 +675,8 @@
       // Tag "3004-000c" is "Grid Frame Offset Vector", which is
       // mandatory to read RT DOSE, but is too long to be returned by default
       orthanc_->GetJsonAsync("/instances/" + instanceId + "/tags?ignore-length=3004-000c",
-                             new OrthancStone::Callable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseInstanceGeometry),
-                             new OrthancStone::Callable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
+                             new DeprecatedCallable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseInstanceGeometry),
+                             new DeprecatedCallable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
                              Operation::DownloadInstanceGeometry(instanceId));
     }
   }
@@ -694,8 +694,8 @@
       state_ = State_LoadingGeometry;
 
       orthanc_->GetJsonAsync("/instances/" + instanceId + "/tags",
-                             new OrthancStone::Callable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseFrameGeometry),
-                             new OrthancStone::Callable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
+                             new DeprecatedCallable<OrthancSlicesLoader, OrthancApiClient::JsonResponseReadyMessage>(GetSharedObserver(), &OrthancSlicesLoader::ParseFrameGeometry),
+                             new DeprecatedCallable<OrthancSlicesLoader, IWebService::HttpRequestErrorMessage>(GetSharedObserver(), &OrthancSlicesLoader::OnGeometryError),
                              Operation::DownloadFrameGeometry(instanceId, frame));
     }
   }
@@ -768,10 +768,10 @@
     }
     
     orthanc_->GetBinaryAsync(uri, "image/png",
-                             new OrthancStone::Callable<OrthancSlicesLoader, 
+                             new DeprecatedCallable<OrthancSlicesLoader, 
                              OrthancApiClient::BinaryResponseReadyMessage>
                              (GetSharedObserver(), &OrthancSlicesLoader::ParseSliceImagePng),
-                             new OrthancStone::Callable<OrthancSlicesLoader, 
+                             new DeprecatedCallable<OrthancSlicesLoader, 
                              IWebService::HttpRequestErrorMessage>
                              (GetSharedObserver(), &OrthancSlicesLoader::OnSliceImageError),
                              Operation::DownloadSliceImage(
@@ -804,10 +804,10 @@
     }
 
     orthanc_->GetBinaryAsync(uri, "image/x-portable-arbitrarymap",
-                             new OrthancStone::Callable<OrthancSlicesLoader, 
+                             new DeprecatedCallable<OrthancSlicesLoader, 
                              OrthancApiClient::BinaryResponseReadyMessage>
                              (GetSharedObserver(), &OrthancSlicesLoader::ParseSliceImagePam),
-                             new OrthancStone::Callable<OrthancSlicesLoader, 
+                             new DeprecatedCallable<OrthancSlicesLoader, 
                              IWebService::HttpRequestErrorMessage>
                              (GetSharedObserver(), &OrthancSlicesLoader::OnSliceImageError),
                              Operation::DownloadSliceImage(static_cast<unsigned int>(index), 
@@ -847,10 +847,10 @@
                        boost::lexical_cast<std::string>(slice.GetFrame()));
 
     orthanc_->GetJsonAsync(uri,
-                           new OrthancStone::Callable<OrthancSlicesLoader, 
+                           new DeprecatedCallable<OrthancSlicesLoader, 
                            OrthancApiClient::JsonResponseReadyMessage>
                            (GetSharedObserver(), &OrthancSlicesLoader::ParseSliceImageJpeg),
-                           new OrthancStone::Callable<OrthancSlicesLoader, 
+                           new DeprecatedCallable<OrthancSlicesLoader, 
                            IWebService::HttpRequestErrorMessage>
                            (GetSharedObserver(), &OrthancSlicesLoader::OnSliceImageError),
                            Operation::DownloadSliceImage(
@@ -888,10 +888,10 @@
       std::string uri = ("/instances/" + slice.GetOrthancInstanceId() + "/frames/" +
                          boost::lexical_cast<std::string>(slice.GetFrame()) + "/raw.gz");
       orthanc_->GetBinaryAsync(uri, IWebService::HttpHeaders(),
-                               new OrthancStone::Callable<OrthancSlicesLoader, 
+                               new DeprecatedCallable<OrthancSlicesLoader, 
                                OrthancApiClient::BinaryResponseReadyMessage>
                                (GetSharedObserver(), &OrthancSlicesLoader::ParseSliceRawImage),
-                               new OrthancStone::Callable<OrthancSlicesLoader,
+                               new DeprecatedCallable<OrthancSlicesLoader,
                                IWebService::HttpRequestErrorMessage>
                                (GetSharedObserver(), &OrthancSlicesLoader::OnSliceImageError),
                                Operation::DownloadSliceRawImage(