Mercurial > hg > orthanc-stone

changeset 129:a823122db53d wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of useless class
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 Nov 2017 12:50:22 +0100
parents c993693e9e63
children 1982d6c1d2ff
files Framework/Layers/DicomStructureSetRendererFactory.cpp Framework/Layers/DicomStructureSetRendererFactory.h
diffstat 2 files changed, 6 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Layers/DicomStructureSetRendererFactory.cpp	Tue Nov 14 17:26:10 2017 +0100
+++ b/Framework/Layers/DicomStructureSetRendererFactory.cpp	Thu Nov 16 12:50:22 2017 +0100
@@ -164,7 +164,7 @@
         for (std::set<std::string>::const_iterator it = instances.begin();
              it != instances.end(); ++it)
         {
-          orthanc_.SchedulePostRequest(loader_, "/tools/lookup", *it,
+          orthanc_.SchedulePostRequest(*this, "/tools/lookup", *it,
                                        new Operation(Operation::Type_LookupSopInstanceUid, *it));
         }
         
@@ -189,7 +189,7 @@
           }
 
           const std::string& instance = lookup[0]["ID"].asString();
-          orthanc_.ScheduleGetRequest(loader_, "/instances/" + instance + "/tags",
+          orthanc_.ScheduleGetRequest(*this, "/instances/" + instance + "/tags",
                                       new Operation(Operation::Type_LoadReferencedSlice, instance));
         }
         else
@@ -220,7 +220,6 @@
 
   
   DicomStructureSetRendererFactory::DicomStructureSetRendererFactory(IWebService& orthanc) :
-    loader_(*this),
     orthanc_(orthanc)
   {
   }
@@ -235,7 +234,7 @@
     else
     {
       const std::string uri = "/instances/" + instance + "/tags?ignore-length=3006-0050";
-      orthanc_.ScheduleGetRequest(loader_, uri, new Operation(Operation::Type_LoadStructureSet, instance));
+      orthanc_.ScheduleGetRequest(*this, uri, new Operation(Operation::Type_LoadStructureSet, instance));
     }
   }
   
--- a/Framework/Layers/DicomStructureSetRendererFactory.h	Tue Nov 14 17:26:10 2017 +0100
+++ b/Framework/Layers/DicomStructureSetRendererFactory.h	Thu Nov 16 12:50:22 2017 +0100
@@ -27,38 +27,14 @@
 
 namespace OrthancStone
 {
-  class DicomStructureSetRendererFactory : public LayerSourceBase
+  class DicomStructureSetRendererFactory :
+    public LayerSourceBase,
+    private IWebService::ICallback
   {
   private:
     class Renderer;
     class Operation;
     
-    class Loader : public IWebService::ICallback
-    {
-    private:
-      DicomStructureSetRendererFactory&  that_;
-
-    public:
-      Loader(DicomStructureSetRendererFactory& that) :
-        that_(that)
-      {
-      }
-
-      virtual void NotifyError(const std::string& uri,
-                               Orthanc::IDynamicObject* payload)
-      {
-        that_.NotifyError(uri, payload);
-      }
-
-      virtual void NotifySuccess(const std::string& uri,
-                                 const void* answer,
-                                 size_t answerSize,
-                                 Orthanc::IDynamicObject* payload)
-      {
-        that_.NotifySuccess(uri, answer, answerSize, payload);
-      }
-    };
-
     virtual void NotifyError(const std::string& uri,
                              Orthanc::IDynamicObject* payload);
 
@@ -67,7 +43,6 @@
                                size_t answerSize,
                                Orthanc::IDynamicObject* payload);
 
-    Loader                            loader_;
     IWebService&                      orthanc_;
     std::auto_ptr<DicomStructureSet>  structureSet_;