Mercurial > hg > orthanc-stone

diff Framework/Volumes/StructureSetLoader.cpp @ 726:4f2416d519b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving layers, widgets and loaders to Deprecated namespace
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 May 2019 11:43:25 +0200
parents 42dadae61fa9
children
line wrap: on
line diff
--- a/Framework/Volumes/StructureSetLoader.cpp	Mon May 20 16:26:34 2019 +0200
+++ b/Framework/Volumes/StructureSetLoader.cpp	Tue May 21 11:43:25 2019 +0200
@@ -25,9 +25,9 @@
 
 #include <Core/OrthancException.h>
 
-namespace OrthancStone
+namespace Deprecated
 {
-  StructureSetLoader::StructureSetLoader(MessageBroker& broker,
+  StructureSetLoader::StructureSetLoader(OrthancStone::MessageBroker& broker,
                                          OrthancApiClient& orthanc) :
     IVolumeLoader(broker),
     IObserver(broker),
@@ -41,7 +41,7 @@
     OrthancPlugins::FullOrthancDataset dataset(message.GetJson());
 
     Orthanc::DicomMap slice;
-    MessagingToolbox::ConvertDataset(slice, dataset);
+    OrthancStone::MessagingToolbox::ConvertDataset(slice, dataset);
     structureSet_->AddReferencedSlice(slice);
 
     BroadcastMessage(ContentChangedMessage(*this));
@@ -51,7 +51,7 @@
   void StructureSetLoader::OnStructureSetLoaded(const OrthancApiClient::JsonResponseReadyMessage& message)
   {
     OrthancPlugins::FullOrthancDataset dataset(message.GetJson());
-    structureSet_.reset(new DicomStructureSet(dataset));
+    structureSet_.reset(new OrthancStone::DicomStructureSet(dataset));
 
     std::set<std::string> instances;
     structureSet_->GetReferencedInstances(instances);
@@ -60,7 +60,7 @@
          it != instances.end(); ++it)
     {
       orthanc_.PostBinaryAsyncExpectJson("/tools/lookup", *it,
-                            new Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnLookupCompleted));
+                                         new OrthancStone::Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnLookupCompleted));
     }
 
     BroadcastMessage(GeometryReadyMessage(*this));
@@ -84,7 +84,7 @@
 
     const std::string& instance = lookup[0]["ID"].asString();
     orthanc_.GetJsonAsync("/instances/" + instance + "/tags",
-                          new Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnReferencedSliceLoaded));
+                          new OrthancStone::Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnReferencedSliceLoaded));
   }
 
   
@@ -97,12 +97,12 @@
     else
     {
       orthanc_.GetJsonAsync("/instances/" + instance + "/tags?ignore-length=3006-0050",
-                            new Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnStructureSetLoaded));
+                            new OrthancStone::Callable<StructureSetLoader, OrthancApiClient::JsonResponseReadyMessage>(*this, &StructureSetLoader::OnStructureSetLoaded));
     }
   }
 
 
-  DicomStructureSet& StructureSetLoader::GetStructureSet()
+  OrthancStone::DicomStructureSet& StructureSetLoader::GetStructureSet()
   {
     if (structureSet_.get() == NULL)
     {