# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1557478641 -7200
# Node ID e706188d6078e65b14fad38709e14bb207d54481
# Parent  d1f4521b9bbb7b0fe0317bab42a1b1ea0c8c8fd0
reorganization

diff -r d1f4521b9bbb -r e706188d6078 Samples/Sdl/Loader.cpp
--- a/Samples/Sdl/Loader.cpp	Fri May 10 10:35:46 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Fri May 10 10:57:21 2019 +0200
@@ -398,6 +398,61 @@
     {
       return timeout_;
     }
+
+    void ProcessHttpAnswer(IMessageEmitter& emitter,
+                           const OrthancStone::IObserver& receiver,
+                           const std::string& answer,
+                           const HttpHeaders& answerHeaders) const
+    {
+      Orthanc::MimeType contentType = Orthanc::MimeType_Binary;
+
+      for (HttpHeaders::const_iterator it = answerHeaders.begin(); 
+           it != answerHeaders.end(); ++it)
+      {
+        std::string s;
+        Orthanc::Toolbox::ToLowerCase(s, it->first);
+
+        if (s == "content-type")
+        {
+          contentType = Orthanc::StringToMimeType(it->second);
+          break;
+        }
+      }
+
+      std::auto_ptr<Orthanc::ImageAccessor> image;
+
+      switch (contentType)
+      {
+        case Orthanc::MimeType_Png:
+        {
+          image.reset(new Orthanc::PngReader);
+          dynamic_cast<Orthanc::PngReader&>(*image).ReadFromMemory(answer);
+          break;
+        }
+
+        case Orthanc::MimeType_Pam:
+        {
+          image.reset(new Orthanc::PamReader);
+          dynamic_cast<Orthanc::PamReader&>(*image).ReadFromMemory(answer);
+          break;
+        }
+
+        case Orthanc::MimeType_Jpeg:
+        {
+          image.reset(new Orthanc::JpegReader);
+          dynamic_cast<Orthanc::JpegReader&>(*image).ReadFromMemory(answer);
+          break;
+        }
+
+        default:
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
+                                          "Unsupported HTTP Content-Type for an image: " + 
+                                          std::string(Orthanc::EnumerationToString(contentType)));
+      }
+
+      DecodeOrthancImageCommand::SuccessMessage message(*this, image.release(), contentType);
+      emitter.EmitMessage(receiver, message);
+    }
   };
 
 
@@ -516,6 +571,21 @@
       return ("/web-viewer/instances/jpeg" + boost::lexical_cast<std::string>(quality_) +
               "-" + instanceId_ + "_" + boost::lexical_cast<std::string>(frame_));
     }
+
+    void ProcessHttpAnswer(IMessageEmitter& emitter,
+                           const OrthancStone::IObserver& receiver,
+                           const std::string& answer) const
+    {
+      Json::Value value;
+      Json::Reader reader;
+      if (!reader.parse(answer, value))
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
+      }
+
+      //DecodeOrthancWebViewerJpegCommand::SuccessMessage message(command, image.release(), contentType);
+      //emitter.EmitMessage(receiver, message);
+    }
   };
 
 
@@ -661,54 +731,7 @@
 
       DecodeAnswer(answer, answerHeaders);
 
-      Orthanc::MimeType contentType = Orthanc::MimeType_Binary;
-
-      for (HttpHeaders::const_iterator it = answerHeaders.begin(); 
-           it != answerHeaders.end(); ++it)
-      {
-        std::string s;
-        Orthanc::Toolbox::ToLowerCase(s, it->first);
-
-        if (s == "content-type")
-        {
-          contentType = Orthanc::StringToMimeType(it->second);
-          break;
-        }
-      }
-
-      std::auto_ptr<Orthanc::ImageAccessor> image;
-
-      switch (contentType)
-      {
-        case Orthanc::MimeType_Png:
-        {
-          image.reset(new Orthanc::PngReader);
-          dynamic_cast<Orthanc::PngReader&>(*image).ReadFromMemory(answer);
-          break;
-        }
-
-        case Orthanc::MimeType_Pam:
-        {
-          image.reset(new Orthanc::PamReader);
-          dynamic_cast<Orthanc::PamReader&>(*image).ReadFromMemory(answer);
-          break;
-        }
-
-        case Orthanc::MimeType_Jpeg:
-        {
-          image.reset(new Orthanc::JpegReader);
-          dynamic_cast<Orthanc::JpegReader&>(*image).ReadFromMemory(answer);
-          break;
-        }
-
-        default:
-          throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
-                                          "Unsupported HTTP Content-Type for an image: " + 
-                                          std::string(Orthanc::EnumerationToString(contentType)));
-      }
-
-      DecodeOrthancImageCommand::SuccessMessage message(command, image.release(), contentType);
-      emitter_.EmitMessage(receiver, message);
+      command.ProcessHttpAnswer(emitter_, receiver, answer, answerHeaders);
     }
 
 
@@ -726,15 +749,7 @@
 
       DecodeAnswer(answer, answerHeaders);
 
-      Json::Value value;
-      Json::Reader reader;
-      if (reader.parse(answer, value))
-      {
-        std::cout << value.toStyledString() << std::endl;
-      }
-
-      //DecodeOrthancWebViewerJpegCommand::SuccessMessage message(command, image.release(), contentType);
-      //emitter_.EmitMessage(receiver, message);
+      command.ProcessHttpAnswer(emitter_, receiver, answer);
     }