Mercurial > hg > orthanc

changeset 1003:1d35281d967c lua-scripting

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomInstanceToStore
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 04 Jul 2014 16:51:33 +0200
parents b067017a8a5b
children a226e0959d8b
files CMakeLists.txt OrthancServer/DicomInstanceToStore.cpp OrthancServer/DicomInstanceToStore.h OrthancServer/ServerContext.h
diffstat 4 files changed, 203 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Jul 04 16:31:14 2014 +0200
+++ b/CMakeLists.txt	Fri Jul 04 16:51:33 2014 +0200
@@ -154,6 +154,7 @@
   OrthancServer/OrthancMoveRequestHandler.cpp
 
   # From "lua-scripting" branch
+  OrthancServer/DicomInstanceToStore.cpp
   OrthancServer/Scheduler/DeleteInstanceCommand.cpp
   OrthancServer/Scheduler/ServerCommandInstance.cpp
   OrthancServer/Scheduler/ServerJob.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/DicomInstanceToStore.cpp	Fri Jul 04 16:51:33 2014 +0200
@@ -0,0 +1,99 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "DicomInstanceToStore.h"
+
+namespace Orthanc
+{
+  DicomInstanceToStore::DicomInstanceToStore() :
+    hasBuffer_(false),
+    parsed_(NULL),
+    summary_(NULL),
+    json_(NULL)
+  {
+  }
+
+  void DicomInstanceToStore::SetBuffer(const std::string& dicom)
+  {
+    hasBuffer_ = true;
+    bufferSize_ = dicom.size();
+
+    if (dicom.size() == 0)
+    {
+      buffer_ = NULL;
+    }
+    else
+    {
+      buffer_ = &dicom[0];
+    }
+  }
+
+
+  void DicomInstanceToStore::SetBuffer(const char* buffer, 
+                                       size_t size)
+  {
+    hasBuffer_ = true;
+    buffer_ = buffer;
+    bufferSize_ = size;
+  }
+
+
+  void DicomInstanceToStore::SetMetadata(ResourceType level,
+                                         MetadataType metadata,
+                                         const std::string& value)
+  {
+    metadata_[std::make_pair(level, metadata)] = value;
+  }
+
+
+  void DicomInstanceToStore::ComputeMissingInformation()
+  {
+    // TODO
+
+    assert(hasBuffer_ && (buffer_ != NULL || bufferSize_ == 0));
+  }
+
+
+
+  const char* DicomInstanceToStore::GetBuffer()
+  {
+    ComputeMissingInformation();
+    return buffer_;
+  }
+
+
+  size_t DicomInstanceToStore::GetBufferSize()
+  {
+    ComputeMissingInformation();
+    return bufferSize_;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/DicomInstanceToStore.h	Fri Jul 04 16:51:33 2014 +0200
@@ -0,0 +1,102 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "ParsedDicomFile.h"
+#include "ServerIndex.h"
+
+namespace Orthanc
+{
+  class DicomInstanceToStore
+  {
+  private:
+    bool hasBuffer_;
+    const char* buffer_;
+    size_t bufferSize_;
+
+    ParsedDicomFile* parsed_;
+    const DicomMap* summary_;
+    const Json::Value*  json_;
+
+    std::string remoteAet_;
+    ServerIndex::MetadataMap metadata_;
+
+    void ComputeMissingInformation();
+
+  public:
+    DicomInstanceToStore();
+
+    void SetBuffer(const std::string& dicom);
+
+    void SetBuffer(const char* buffer, 
+                   size_t size);
+
+    void SetParsedDicomFile(ParsedDicomFile& parsed)
+    {
+      parsed_ = &parsed;
+    }
+
+    void SetSummary(const DicomMap& summary)
+    {
+      summary_ = &summary;
+    }
+
+    void SetJson(const Json::Value& json)
+    {
+      json_ = &json;
+    }
+
+    const std::string GetRemoteAet() const
+    {
+      return remoteAet_;
+    }
+
+    void SetRemoteAet(const std::string& aet)
+    {
+      remoteAet_ = aet;
+    }
+
+    void SetMetadata(ResourceType level,
+                     MetadataType metadata,
+                     const std::string& value);
+
+    const ServerIndex::MetadataMap& GetMetadata() const
+    {
+      return metadata_;
+    }
+
+    const char* GetBuffer();
+
+    size_t GetBufferSize();
+  };
+}
--- a/OrthancServer/ServerContext.h	Fri Jul 04 16:31:14 2014 +0200
+++ b/OrthancServer/ServerContext.h	Fri Jul 04 16:51:33 2014 +0200
@@ -127,6 +127,7 @@
       }
     };
 
+
     ServerContext(const boost::filesystem::path& storagePath,
                   const boost::filesystem::path& indexPath);