# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1592488139 -7200
# Node ID 5732edec7cbd6851cf7ac232bdbab184905be757
# Parent  4db187d297317f7ce258c8cb39006f625bda3b1d
sorting frames in 3D

diff -r 4db187d29731 -r 5732edec7cbd Framework/Toolbox/GeometryToolbox.cpp
--- a/Framework/Toolbox/GeometryToolbox.cpp	Wed Jun 17 18:21:26 2020 +0200
+++ b/Framework/Toolbox/GeometryToolbox.cpp	Thu Jun 18 15:48:59 2020 +0200
@@ -534,5 +534,39 @@
            boost::numeric::ublas::prod(k, k) / (1 + cosine));
 #endif
     }
+
+    
+    void ComputeNormalFromCosines(Vector& normal,
+                                  const Vector& cosines)
+    {
+      if (cosines.size() != 6)
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+      }
+      else
+      {
+        normal.resize(3);
+        normal[0] = cosines[1] * cosines[5] - cosines[2] * cosines[4];
+        normal[1] = cosines[2] * cosines[3] - cosines[0] * cosines[5];
+        normal[2] = cosines[0] * cosines[4] - cosines[1] * cosines[3];
+      }
+    }
+
+    
+    bool ComputeNormal(Vector& normal,
+                       const Orthanc::DicomMap& dicom)
+    {
+      Vector cosines;
+      if (LinearAlgebra::ParseVector(cosines, dicom, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT) &&
+          cosines.size() == 6)
+      {
+        ComputeNormalFromCosines(normal, cosines);
+        return true;
+      }
+      else
+      {
+        return false;
+      }
+    }
   }
 }
diff -r 4db187d29731 -r 5732edec7cbd Framework/Toolbox/GeometryToolbox.h
--- a/Framework/Toolbox/GeometryToolbox.h	Wed Jun 17 18:21:26 2020 +0200
+++ b/Framework/Toolbox/GeometryToolbox.h	Thu Jun 18 15:48:59 2020 +0200
@@ -109,6 +109,12 @@
                                   const Vector& a,
                                   const Vector& b);
 
+    void ComputeNormalFromCosines(Vector& normal,
+                                  const Vector& cosines);
+
+    bool ComputeNormal(Vector& normal,
+                       const Orthanc::DicomMap& dicom);
+
     inline float ComputeBilinearInterpolationUnitSquare(float x,
                                                         float y,
                                                         float f00,    // source(0, 0)
diff -r 4db187d29731 -r 5732edec7cbd Framework/Toolbox/LinearAlgebra.cpp
--- a/Framework/Toolbox/LinearAlgebra.cpp	Wed Jun 17 18:21:26 2020 +0200
+++ b/Framework/Toolbox/LinearAlgebra.cpp	Thu Jun 18 15:48:59 2020 +0200
@@ -195,7 +195,7 @@
     double DotProduct(const Vector& u, const Vector& v)
     {
       if (u.size() != 3 ||
-        v.size() != 3)
+          v.size() != 3)
       {
         throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
       }
diff -r 4db187d29731 -r 5732edec7cbd Samples/Sdl/CMakeLists.txt
--- a/Samples/Sdl/CMakeLists.txt	Wed Jun 17 18:21:26 2020 +0200
+++ b/Samples/Sdl/CMakeLists.txt	Thu Jun 18 15:48:59 2020 +0200
@@ -97,6 +97,7 @@
   ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestMessageBroker.cpp
   ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestStrategy.cpp
   ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestStructureSet.cpp
+  ${ORTHANC_STONE_ROOT}/UnitTestsSources/SortedFramesTests.cpp
   ${ORTHANC_STONE_ROOT}/UnitTestsSources/UnitTestsMain.cpp
 )
 
diff -r 4db187d29731 -r 5732edec7cbd UnitTestsSources/SortedFramesCreateTest.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UnitTestsSources/SortedFramesCreateTest.py	Thu Jun 18 15:48:59 2020 +0200
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+
+import pprint
+import requests
+import sys
+
+if len(sys.argv) != 2:
+    print('Usage: %s [Orthanc series ID]' % sys.argv[0])
+    print('Example: %s 4d04593b-953ced51-87e93f11-ae4cf03c-25defdcd | xclip -selection c -t text/plain' % sys.argv[0])
+    exit(-1)
+
+SERIES = sys.argv[1]
+
+r = requests.get('http://localhost:8042/series/%s/study' % SERIES)
+r.raise_for_status()
+print('  // From patient %s' % r.json() ['PatientMainDicomTags']['PatientName'])
+
+r = requests.get('http://localhost:8042/series/%s' % SERIES)
+r.raise_for_status()
+
+first = True
+
+for instance in r.json() ['Instances']:
+    tags = requests.get('http://localhost:8042/instances/%s/tags?short' % instance)
+    tags.raise_for_status()
+
+    if first:
+        print('''
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "%s", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "%s", false);    
+  OrthancStone::SortedFrames f;
+''' % (tags.json() ['0020,000d'], tags.json() ['0020,000e']))
+        first = False
+   
+    print('  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "%s", false);' % instance)
+    
+    if '0020,0032' in tags.json():
+        print('  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "%s", false);' %
+              tags.json() ['0020,0032'].replace('\\', '\\\\'))
+    
+    if '0020,0037' in tags.json():
+        print('  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "%s", false);' %
+              tags.json() ['0020,0037'].replace('\\', '\\\\'))
+
+    if '0020,0013' in tags.json():
+        print('  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "%s", false);' %
+              tags.json() ['0020,0013'].replace('\\', '\\\\'))
+
+    if '0054,1330' in tags.json():
+        print('  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_INDEX, "%s", false);' %
+              tags.json() ['0054,1330'].replace('\\', '\\\\'))
+
+    print('  f.AddInstance(tags);')
+    
+print('  f.Sort();')
+
+r = requests.get('http://localhost:8042/series/%s/ordered-slices' % SERIES)
+r.raise_for_status()
+slices = r.json() ['SlicesShort']
+
+print('  ASSERT_EQ(%du, f.GetFramesCount());' % len(slices))
+
+for i in range(len(slices)):
+    print('  ASSERT_EQ(f.GetFrameSopInstanceUid(%d), "%s");' % (i, slices[i][0]))
+
diff -r 4db187d29731 -r 5732edec7cbd UnitTestsSources/SortedFramesTests.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UnitTestsSources/SortedFramesTests.cpp	Thu Jun 18 15:48:59 2020 +0200
@@ -0,0 +1,953 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * 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
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include <gtest/gtest.h>
+
+#include <OrthancException.h>
+#include <DicomFormat/DicomMap.h>
+
+#include "../Framework/Toolbox/GeometryToolbox.h"
+
+namespace OrthancStone
+{
+  class SortedFrames : public boost::noncopyable
+  {
+  private:
+    class Instance : public boost::noncopyable
+    {
+    private:
+      bool               hasPosition_;
+      Orthanc::DicomMap  tags_;
+      std::string        sopInstanceUid_;
+      unsigned int       numberOfFrames_;
+      Vector             normal_;
+      Vector             position_;
+
+    public:
+      Instance(const Orthanc::DicomMap& tags)
+      {
+        tags_.Assign(tags);
+
+        if (!tags.LookupStringValue(sopInstanceUid_, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
+        }
+
+        uint32_t tmp;
+        if (tags.ParseUnsignedInteger32(tmp, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
+        {
+          numberOfFrames_ = tmp;
+        }
+        else
+        {
+          numberOfFrames_ = 1;
+        }
+
+        hasPosition_ = (
+          LinearAlgebra::ParseVector(position_, tags, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT) &&
+          position_.size() == 3 &&
+          GeometryToolbox::ComputeNormal(normal_, tags));
+      }
+
+      const Orthanc::DicomMap& GetTags() const
+      {
+        return tags_;
+      }
+
+      const std::string& GetSopInstanceUid() const
+      {
+        return sopInstanceUid_;
+      }
+
+      unsigned int GetNumberOfFrames() const
+      {
+        return numberOfFrames_;
+      }
+
+      bool HasPosition() const
+      {
+        return hasPosition_;
+      }
+
+      const Vector& GetNormal() const
+      {
+        if (hasPosition_)
+        {
+          return normal_;
+        }
+        else
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+        }
+      }
+
+      const Vector& GetPosition() const
+      {
+        if (hasPosition_)
+        {
+          return position_;
+        }
+        else
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+        }
+      }
+    };
+
+    struct Frame
+    {
+    private:
+      const Instance&  instance_;
+      unsigned int     frameIndex_;
+
+    public:
+      Frame(const Instance& instance,
+            unsigned int frameIndex) :
+        instance_(instance),
+        frameIndex_(frameIndex)
+      {
+        if (frameIndex >= instance.GetNumberOfFrames())
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+        }
+      }
+
+      const Instance& GetInstance() const
+      {
+        return instance_;
+      }
+
+      unsigned int GetFrameIndex() const
+      {
+        return frameIndex_;
+      }
+    };
+
+    std::string             studyInstanceUid_;
+    std::string             seriesInstanceUid_;
+    std::vector<Instance*>  instances_;
+    std::vector<Frame>      frames_;
+    bool                    sorted_;
+
+    const Instance& GetInstance(size_t index) const
+    {
+      if (index >= instances_.size())
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+      }
+      else
+      {
+        assert(instances_[index] != NULL);
+        return *instances_[index];
+      }
+    }
+
+    const Frame& GetFrame(size_t index) const
+    {
+      if (!sorted_)
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
+                                        "Sort() has not been called");
+      }
+      if (index >= frames_.size())
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+      }
+      else
+      {
+        return frames_[index];
+      }    
+    }
+
+  public:
+    SortedFrames() :
+      sorted_(true)
+    {
+    }
+  
+    ~SortedFrames()
+    {
+      for (size_t i = 0; i < instances_.size(); i++)
+      {
+        assert(instances_[i] != NULL);
+        delete instances_[i];
+      }
+    }
+
+    const std::string& GetStudyInstanceUid() const
+    {
+      return studyInstanceUid_;
+    }
+
+    const std::string& GetSeriesInstanceUid() const
+    {
+      return seriesInstanceUid_;
+    }
+
+    void AddInstance(const Orthanc::DicomMap& tags)
+    {
+      std::unique_ptr<Instance> instance(new Instance(tags));
+
+      std::string studyInstanceUid, seriesInstanceUid;
+      if (!tags.LookupStringValue(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) ||
+          !tags.LookupStringValue(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false))
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
+      }
+    
+      if (instances_.empty())
+      {
+        studyInstanceUid_ = studyInstanceUid;
+        seriesInstanceUid_ = seriesInstanceUid;
+      }
+      else
+      {
+        if (studyInstanceUid_ != studyInstanceUid ||
+            seriesInstanceUid_ != seriesInstanceUid)
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
+                                          "Mixing instances from different series");
+        }
+      }
+
+      instances_.push_back(instance.release());
+      sorted_ = false;
+      frames_.clear();
+    }
+
+    size_t GetInstancesCount() const
+    {
+      return instances_.size();
+    }
+
+    const Orthanc::DicomMap& GetInstanceTags(size_t index) const
+    {
+      return GetInstance(index).GetTags();
+    }
+
+    const std::string& GetSopInstanceUid(size_t index) const
+    {
+      return GetInstance(index).GetSopInstanceUid();
+    }
+
+    bool IsSorted() const
+    {
+      return sorted_;
+    }
+
+    size_t GetFramesCount() const
+    {
+      if (sorted_)
+      {
+        return frames_.size();
+      }
+      else
+      {
+        throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
+                                        "Sort() has not been called");
+      }
+    }
+
+    const Orthanc::DicomMap& GetFrameTags(size_t index) const
+    {
+      return GetFrame(index).GetInstance().GetTags();
+    }
+
+    const std::string& GetFrameSopInstanceUid(size_t index) const
+    {
+      return GetFrame(index).GetInstance().GetSopInstanceUid();
+    }
+
+    const unsigned int GetFrameSiblingsCount(size_t index) const
+    {
+      return GetFrame(index).GetInstance().GetNumberOfFrames();
+    }
+
+    const unsigned int GetFrameIndex(size_t index) const
+    {
+      return GetFrame(index).GetFrameIndex();
+    }
+
+
+    void Sort()
+    {
+      if (!sorted_)
+      {
+        size_t totalFrames = 0;
+        std::set<size_t> remainingInstances;
+      
+        for (size_t i = 0; i < instances_.size(); i++)
+        {
+          assert(instances_[i] != NULL);
+          totalFrames += instances_[i]->GetNumberOfFrames();
+        
+          remainingInstances.insert(i);
+        }
+
+        frames_.clear();
+        frames_.reserve(totalFrames);
+
+        SortUsingIntegerTag(remainingInstances, Orthanc::DICOM_TAG_INSTANCE_NUMBER);  // VR is "IS"
+        SortUsingIntegerTag(remainingInstances, Orthanc::DICOM_TAG_IMAGE_INDEX);  // VR is "US"
+        SortUsing3DLocation(remainingInstances);
+        SortUsingSopInstanceUid(remainingInstances);
+
+        // The following could in theory happen if several instances
+        // have the same SOPInstanceUID, no ordering is available
+        for (std::set<size_t>::const_iterator it = remainingInstances.begin();
+             it != remainingInstances.end(); it++)
+        {
+          AddFramesOfInstance(remainingInstances, *it);
+        }
+
+        if (frames_.size() != totalFrames ||
+            !remainingInstances.empty())
+        {
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
+        }
+      
+        sorted_ = true;
+      }
+    }
+
+
+  private:
+    void AddFramesOfInstance(std::set<size_t>& remainingInstances,
+                             size_t index)
+    {
+      assert(instances_[index] != NULL);
+      const Instance& instance = *instances_[index];
+    
+      for (unsigned int i = 0; i < instance.GetNumberOfFrames(); i++)
+      {
+        frames_.push_back(Frame(instance, i));
+      }
+
+      assert(remainingInstances.find(index) != remainingInstances.end());
+      remainingInstances.erase(index);
+    }
+
+
+    template<typename T>
+    class SortableItem
+    {
+    private:
+      T            value_;
+      size_t       instance_;
+      std::string  sopInstanceUid_;
+
+    public:
+      SortableItem(const T& value,
+                   size_t instance,
+                   const std::string& sopInstanceUid) :
+        value_(value),
+        instance_(instance),
+        sopInstanceUid_(sopInstanceUid)
+      {
+      }
+
+      size_t GetInstanceIndex() const
+      {
+        return instance_;
+      }
+
+      bool operator< (const SortableItem& other) const
+      {
+        return (value_ < other.value_ ||
+                (value_ == other.value_ &&
+                 sopInstanceUid_ < other.sopInstanceUid_));
+      }
+    };
+
+
+    void SortUsingIntegerTag(std::set<size_t>& remainingInstances,
+                             const Orthanc::DicomTag& tag)
+    {
+      std::vector< SortableItem<int32_t> > items;
+      items.reserve(remainingInstances.size());
+
+      for (std::set<size_t>::const_iterator it = remainingInstances.begin();
+           it != remainingInstances.end(); ++it)
+      {
+        assert(instances_[*it] != NULL);
+        const Instance& instance = *instances_[*it];
+
+        int32_t value;
+        std::string sopInstanceUid;
+        if (instance.GetTags().ParseInteger32(value, tag) &&
+            instance.GetTags().LookupStringValue(
+              sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
+        {
+          items.push_back(SortableItem<int32_t>(value, *it, sopInstanceUid));
+        }
+      }
+    
+      std::sort(items.begin(), items.end());
+
+      for (size_t i = 0; i < items.size(); i++)
+      {
+        AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
+      }
+    }
+
+
+    void SortUsingSopInstanceUid(std::set<size_t>& remainingInstances)
+    {
+      std::vector<SortableItem<int32_t> > items;
+      items.reserve(remainingInstances.size());
+
+      for (std::set<size_t>::const_iterator it = remainingInstances.begin();
+           it != remainingInstances.end(); ++it)
+      {
+        assert(instances_[*it] != NULL);
+        const Instance& instance = *instances_[*it];
+
+        std::string sopInstanceUid;
+        if (instance.GetTags().LookupStringValue(
+              sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
+        {
+          items.push_back(SortableItem<int32_t>(0 /* arbitrary value */, *it, sopInstanceUid));
+        }
+      }
+    
+      std::sort(items.begin(), items.end());
+
+      for (size_t i = 0; i < items.size(); i++)
+      {
+        AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
+      }
+    }
+
+
+    void SortUsing3DLocation(std::set<size_t>& remainingInstances)
+    {
+      /**
+       * Compute the mean of the normal vectors, using the recursive
+       * formula for arithmetic means for numerical stability.
+       * https://diego.assencio.com/?index=c34d06f4f4de2375658ed41f70177d59
+       **/
+      
+      Vector meanNormal;
+      LinearAlgebra::AssignVector(meanNormal, 0, 0, 0);
+
+      unsigned int n = 0;
+
+      for (std::set<size_t>::const_iterator it = remainingInstances.begin();
+           it != remainingInstances.end(); ++it)
+      {
+        assert(instances_[*it] != NULL);
+        const Instance& instance = *instances_[*it];
+
+        if (instance.HasPosition())
+        {
+          n += 1;
+          meanNormal += (instance.GetNormal() - meanNormal) / static_cast<float>(n);
+        }
+      }
+
+      std::vector<SortableItem<float> > items;
+      items.reserve(n);
+      
+      for (std::set<size_t>::const_iterator it = remainingInstances.begin();
+           it != remainingInstances.end(); ++it)
+      {
+        assert(instances_[*it] != NULL);
+        const Instance& instance = *instances_[*it];
+        
+        std::string sopInstanceUid;
+        if (instance.HasPosition() &&
+            instance.GetTags().LookupStringValue(
+              sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
+        {
+          double p = LinearAlgebra::DotProduct(meanNormal, instance.GetPosition());
+          items.push_back(SortableItem<float>(p, *it, sopInstanceUid));
+        }
+      }
+
+      assert(items.size() <= n);
+    
+      std::sort(items.begin(), items.end());
+      printf(">> %d\n", items.size());
+
+      for (size_t i = 0; i < items.size(); i++)
+      {
+        AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
+      }
+    }
+  };
+}
+
+
+TEST(SortedFrames, Basic)
+{
+  OrthancStone::SortedFrames f;
+  ASSERT_TRUE(f.GetStudyInstanceUid().empty());
+  ASSERT_TRUE(f.GetSeriesInstanceUid().empty());
+  ASSERT_EQ(0u, f.GetInstancesCount());
+  ASSERT_THROW(f.GetInstanceTags(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetSopInstanceUid(0), Orthanc::OrthancException);
+  ASSERT_TRUE(f.IsSorted());
+  ASSERT_EQ(0u, f.GetFramesCount());
+  ASSERT_THROW(f.GetFrameTags(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameSopInstanceUid(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameSiblingsCount(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameIndex(0), Orthanc::OrthancException);
+
+  Orthanc::DicomMap tags;
+  ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
+  ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
+  ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop", false);
+  f.AddInstance(tags);
+
+  ASSERT_EQ("study", f.GetStudyInstanceUid());
+  ASSERT_EQ("series", f.GetSeriesInstanceUid());
+  ASSERT_EQ(1u, f.GetInstancesCount());
+  std::string s;
+  ASSERT_TRUE(f.GetInstanceTags(0).LookupStringValue(s, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false));
+  ASSERT_EQ("sop", s);
+  ASSERT_EQ("sop", f.GetSopInstanceUid(0));
+  ASSERT_FALSE(f.IsSorted());
+  ASSERT_THROW(f.GetFramesCount(), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameTags(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameSopInstanceUid(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameSiblingsCount(0), Orthanc::OrthancException);
+  ASSERT_THROW(f.GetFrameIndex(0), Orthanc::OrthancException);
+
+  f.Sort();
+  ASSERT_TRUE(f.IsSorted());
+  ASSERT_EQ(1u, f.GetFramesCount());
+  ASSERT_TRUE(f.GetFrameTags(0).LookupStringValue(s, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false));
+  ASSERT_EQ("sop", s);
+  ASSERT_EQ("sop", f.GetFrameSopInstanceUid(0));
+  ASSERT_EQ(1u, f.GetFrameSiblingsCount(0));
+  ASSERT_EQ(0u, f.GetFrameIndex(0));
+  ASSERT_THROW(f.GetFrameTags(1), Orthanc::OrthancException);
+}
+
+
+TEST(SortedFrames, SortSopInstanceUid)
+{
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
+    
+  OrthancStone::SortedFrames f;
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
+  tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "1", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "3", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
+  tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "2", false);
+  f.AddInstance(tags);
+    
+  f.Sort();
+  ASSERT_EQ(3u, f.GetInstancesCount());
+  ASSERT_EQ("sop3", f.GetSopInstanceUid(0));
+  ASSERT_EQ("sop1", f.GetSopInstanceUid(1));
+  ASSERT_EQ("sop2", f.GetSopInstanceUid(2));
+  ASSERT_EQ(6u, f.GetFramesCount());
+  ASSERT_EQ("sop1", f.GetFrameSopInstanceUid(0));  ASSERT_EQ(0u, f.GetFrameIndex(0));
+  ASSERT_EQ("sop1", f.GetFrameSopInstanceUid(1));  ASSERT_EQ(1u, f.GetFrameIndex(1));
+  ASSERT_EQ("sop1", f.GetFrameSopInstanceUid(2));  ASSERT_EQ(2u, f.GetFrameIndex(2));
+  ASSERT_EQ("sop2", f.GetFrameSopInstanceUid(3));  ASSERT_EQ(0u, f.GetFrameIndex(3));
+  ASSERT_EQ("sop2", f.GetFrameSopInstanceUid(4));  ASSERT_EQ(1u, f.GetFrameIndex(4));
+  ASSERT_EQ("sop3", f.GetFrameSopInstanceUid(5));  ASSERT_EQ(0u, f.GetFrameIndex(5));
+}
+
+
+TEST(SortedFrames, SortInstanceNumber)
+{
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
+    
+  OrthancStone::SortedFrames f;
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "-20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2a", false);
+  tags.Remove(Orthanc::DICOM_TAG_INSTANCE_NUMBER);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop4", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop5", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
+  f.AddInstance(tags);
+    
+  f.Sort();
+  ASSERT_EQ(6u, f.GetInstancesCount());
+  ASSERT_EQ("sop1", f.GetSopInstanceUid(0));
+  ASSERT_EQ("sop2", f.GetSopInstanceUid(1));
+  ASSERT_EQ("sop2a", f.GetSopInstanceUid(2));
+  ASSERT_EQ("sop4", f.GetSopInstanceUid(3));
+  ASSERT_EQ("sop3", f.GetSopInstanceUid(4));
+  ASSERT_EQ("sop5", f.GetSopInstanceUid(5));
+  ASSERT_EQ(6u, f.GetFramesCount());
+  ASSERT_EQ("sop2", f.GetFrameSopInstanceUid(0));  ASSERT_EQ(0u, f.GetFrameIndex(0));
+  ASSERT_EQ("sop3", f.GetFrameSopInstanceUid(1));  ASSERT_EQ(0u, f.GetFrameIndex(1));
+  ASSERT_EQ("sop4", f.GetFrameSopInstanceUid(2));  ASSERT_EQ(0u, f.GetFrameIndex(2));
+  ASSERT_EQ("sop5", f.GetFrameSopInstanceUid(3));  ASSERT_EQ(0u, f.GetFrameIndex(3));
+  ASSERT_EQ("sop1", f.GetFrameSopInstanceUid(4));  ASSERT_EQ(0u, f.GetFrameIndex(4));
+  ASSERT_EQ("sop2a", f.GetFrameSopInstanceUid(5));  ASSERT_EQ(0u, f.GetFrameIndex(5));
+}
+
+
+TEST(SortedFrames, SortInstanceNumberAndImageIndex)
+{
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
+    
+  OrthancStone::SortedFrames f;
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
+  tags.Remove(Orthanc::DICOM_TAG_INSTANCE_NUMBER);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_INDEX, "20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_INDEX, "30", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop4", false);
+  tags.Remove(Orthanc::DICOM_TAG_IMAGE_INDEX);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "30", false);
+  f.AddInstance(tags);
+    
+  f.Sort();
+  ASSERT_EQ(4u, f.GetInstancesCount());
+  ASSERT_EQ("sop1", f.GetSopInstanceUid(0));
+  ASSERT_EQ("sop2", f.GetSopInstanceUid(1));
+  ASSERT_EQ("sop3", f.GetSopInstanceUid(2));
+  ASSERT_EQ("sop4", f.GetSopInstanceUid(3));
+  ASSERT_EQ(4u, f.GetFramesCount());
+  // First instance number, then image index
+  ASSERT_EQ("sop1", f.GetFrameSopInstanceUid(0));  ASSERT_EQ(0u, f.GetFrameIndex(0));
+  ASSERT_EQ("sop4", f.GetFrameSopInstanceUid(1));  ASSERT_EQ(0u, f.GetFrameIndex(1));
+  ASSERT_EQ("sop2", f.GetFrameSopInstanceUid(2));  ASSERT_EQ(0u, f.GetFrameIndex(2));
+  ASSERT_EQ("sop3", f.GetFrameSopInstanceUid(3));  ASSERT_EQ(0u, f.GetFrameIndex(3));
+}
+
+
+TEST(SortedFrames, Knix)  // Created using "SortedFramesCreateTest.py"
+{
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "1.2.840.113619.2.176.2025.1499492.7391.1171285944.390", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "1.2.840.113619.2.176.2025.1499492.7391.1171285944.392", false);    
+  OrthancStone::SortedFrames f;
+
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "67b44a5e-8997f88d-6e527bd6-df342483-dab1674c", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-60.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a8ee83f9-1cc26ad9-ebba3043-8afc47c2-bd784610", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-42.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "6", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "5a2acb03-063f5063-cac452d1-a55992f9-769900fb", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-114.729\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "22", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "23d12f39-e9a4fc21-8da338c4-97feff30-48e95534", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-83.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "15", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "16606f69-83b48518-ab34304a-c8871b7f-a9298d74", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-78.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "14", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "63d595f3-327a306d-1709bb8b-2a72e11c-4f7221fe", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-96.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "18", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8bdecadd-e3477e28-bbbf0297-22b0b680-37b13a7c", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-65.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "11", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b590cc95-55789755-ebd10b76-911e855e-f24e4fe7", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-74.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "13", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "eaa49a94-b9042041-7f45150b-e414f800-d7232874", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-38.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "5", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "6824db93-ed4e2740-07be953f-6d0a8fb3-af0a3a0b", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-105.729\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "e0d82343-9cef01e9-e21df50a-11886a94-1d0216ea", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-51.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "8", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "dc1576ee-25b0b1ef-e038df76-d296fcad-a1456169", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-110.229\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "21", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b9cf5158-06f8e713-7d5111aa-411fd75b-7be2c51e", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-20.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "5faf886f-bd5517cf-1a6ba06e-ac0e6ddb-47bdd8b2", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-101.229\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "19", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "3e8f8ec1-b603f874-825552f1-6fcac7fa-72ca1aa5", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-24.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "2", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "7a7c0120-37f6dd58-c46312e6-2559975d-5af4616f", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-87.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "16", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a0ca6802-56c697c3-0205bab8-42217cfc-84ff0de6", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-33.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "4", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "efce9ff4-3fe07d83-745846f8-fefe5d64-bfea65e6", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-56.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "9", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "fa56f961-d1ae8f6a-989c04f4-7a588e9e-b41b1a13", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-92.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "17", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "f5e889ac-c5afdc37-c5b62074-a8bdeef3-c58d9889", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-69.7285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "12", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "c19fb4b6-ad1224f2-2c3a2b28-0ea233be-38eea0de", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-47.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "7", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "348efc0a-71ee4758-56bd51fa-9703cbff-9b51d4c9", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-29.2285\\-105.586\\73.7768", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "3", false);
+  f.AddInstance(tags);
+  f.Sort();
+  ASSERT_EQ(22u, f.GetFramesCount());
+  ASSERT_EQ(f.GetFrameSopInstanceUid(0), "b9cf5158-06f8e713-7d5111aa-411fd75b-7be2c51e");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(1), "3e8f8ec1-b603f874-825552f1-6fcac7fa-72ca1aa5");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(2), "348efc0a-71ee4758-56bd51fa-9703cbff-9b51d4c9");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(3), "a0ca6802-56c697c3-0205bab8-42217cfc-84ff0de6");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(4), "eaa49a94-b9042041-7f45150b-e414f800-d7232874");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(5), "a8ee83f9-1cc26ad9-ebba3043-8afc47c2-bd784610");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(6), "c19fb4b6-ad1224f2-2c3a2b28-0ea233be-38eea0de");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(7), "e0d82343-9cef01e9-e21df50a-11886a94-1d0216ea");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(8), "efce9ff4-3fe07d83-745846f8-fefe5d64-bfea65e6");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(9), "67b44a5e-8997f88d-6e527bd6-df342483-dab1674c");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(10), "8bdecadd-e3477e28-bbbf0297-22b0b680-37b13a7c");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(11), "f5e889ac-c5afdc37-c5b62074-a8bdeef3-c58d9889");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(12), "b590cc95-55789755-ebd10b76-911e855e-f24e4fe7");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(13), "16606f69-83b48518-ab34304a-c8871b7f-a9298d74");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(14), "23d12f39-e9a4fc21-8da338c4-97feff30-48e95534");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(15), "7a7c0120-37f6dd58-c46312e6-2559975d-5af4616f");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(16), "fa56f961-d1ae8f6a-989c04f4-7a588e9e-b41b1a13");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(17), "63d595f3-327a306d-1709bb8b-2a72e11c-4f7221fe");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(18), "5faf886f-bd5517cf-1a6ba06e-ac0e6ddb-47bdd8b2");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(19), "6824db93-ed4e2740-07be953f-6d0a8fb3-af0a3a0b");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(20), "dc1576ee-25b0b1ef-e038df76-d296fcad-a1456169");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(21), "5a2acb03-063f5063-cac452d1-a55992f9-769900fb");
+}
+
+
+TEST(SortedFrames, Cardiac)  // Created using "SortedFramesCreateTest.py"
+{
+  Orthanc::DicomMap tags;
+  tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "1.3.51.0.1.1.192.168.29.133.1681753.1681732", false);
+  tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "1.3.12.2.1107.5.2.33.37097.2012041612474981424569674.0.0.0", false);    
+  OrthancStone::SortedFrames f;
+
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a468da62-a8a6e0b9-f66b86b0-b15fa30b-93077161", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "14", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "1cf40ac9-e823e677-cbd5db4b-9e48b451-cccbf950", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "21", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "d52d5f21-54f1ad99-4015a995-108f7210-ee157944", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "15", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b348f629-11d59f98-fb22710b-4964b90a-f44436ff", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "12", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "aac4f2ba-e863f124-6af96709-053258a7-3d39db26", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "13", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8fefe14c-c4c34152-2c3d3514-04e75747-eb7f01f0", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "20b42f52-6d5f784b-cdbc0fbe-4bfc6b0c-5a199c75", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "17", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "931d0c36-8fbb4101-70e6d756-edb15431-aaa9a31b", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "19", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "9e3b97ec-25b86a67-2cbb8f77-94e73268-4509d383", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "caa62568-fdf894fe-08f830a2-5a468967-681d954b", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "18", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "e734c170-96b0a397-95e3b43e-d7a5ed74-025843c8", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "22", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "efc9f411-9f4294e0-66d292a1-b8b6b421-897f1d80", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "11", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8346a1db-0b08a22b-9045aaad-57098aac-5b2e9159", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "16", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8c7d1e4d-7936f799-c4b8b56b-32d0d9a6-2b492e98", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "3", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "faec09f9-ca7fe0f0-2b25c370-bb1bfaef-8ccfa560", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "4", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "99c20bcc-115ae447-84d616f2-cb6c5576-9f67aa7a", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "23", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "7906b806-47190031-72c5043c-d42704c1-688a3b23", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "9", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "c9dfc022-7b377063-08bdc5e8-fedcc463-8de22ee6", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "6", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "6570b6c0-7d2f324d-db7cad50-843f62df-d0446352", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "5", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "0be36fe7-6c7a762b-281cf109-fff9d8ea-42e16b7a", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "7", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "ec282396-a8209d00-1c5091f3-f632bf3d-a1bcebba", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "8", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "fda415d4-f1429b07-5d1cd9f0-675059ff-c0ce9e67", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false);
+  f.AddInstance(tags);
+  tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "f555ef96-6b01a90c-bdc2585a-dd17bb3a-75e89920", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
+  tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
+  tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "2", false);
+  f.AddInstance(tags);
+  f.Sort();
+  ASSERT_EQ(23u, f.GetFramesCount());
+  ASSERT_EQ(f.GetFrameSopInstanceUid(0), "fda415d4-f1429b07-5d1cd9f0-675059ff-c0ce9e67");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(1), "f555ef96-6b01a90c-bdc2585a-dd17bb3a-75e89920");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(2), "8c7d1e4d-7936f799-c4b8b56b-32d0d9a6-2b492e98");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(3), "faec09f9-ca7fe0f0-2b25c370-bb1bfaef-8ccfa560");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(4), "6570b6c0-7d2f324d-db7cad50-843f62df-d0446352");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(5), "c9dfc022-7b377063-08bdc5e8-fedcc463-8de22ee6");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(6), "0be36fe7-6c7a762b-281cf109-fff9d8ea-42e16b7a");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(7), "ec282396-a8209d00-1c5091f3-f632bf3d-a1bcebba");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(8), "7906b806-47190031-72c5043c-d42704c1-688a3b23");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(9), "9e3b97ec-25b86a67-2cbb8f77-94e73268-4509d383");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(10), "efc9f411-9f4294e0-66d292a1-b8b6b421-897f1d80");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(11), "b348f629-11d59f98-fb22710b-4964b90a-f44436ff");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(12), "aac4f2ba-e863f124-6af96709-053258a7-3d39db26");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(13), "a468da62-a8a6e0b9-f66b86b0-b15fa30b-93077161");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(14), "d52d5f21-54f1ad99-4015a995-108f7210-ee157944");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(15), "8346a1db-0b08a22b-9045aaad-57098aac-5b2e9159");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(16), "20b42f52-6d5f784b-cdbc0fbe-4bfc6b0c-5a199c75");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(17), "caa62568-fdf894fe-08f830a2-5a468967-681d954b");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(18), "931d0c36-8fbb4101-70e6d756-edb15431-aaa9a31b");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(19), "8fefe14c-c4c34152-2c3d3514-04e75747-eb7f01f0");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(20), "1cf40ac9-e823e677-cbd5db4b-9e48b451-cccbf950");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(21), "e734c170-96b0a397-95e3b43e-d7a5ed74-025843c8");
+  ASSERT_EQ(f.GetFrameSopInstanceUid(22), "99c20bcc-115ae447-84d616f2-cb6c5576-9f67aa7a");
+}
diff -r 4db187d29731 -r 5732edec7cbd UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Wed Jun 17 18:21:26 2020 +0200
+++ b/UnitTestsSources/UnitTestsMain.cpp	Thu Jun 18 15:48:59 2020 +0200
@@ -879,6 +879,7 @@
   }
 }
 
+
 int main(int argc, char **argv)
 {
   Orthanc::Logging::Initialize();