Mercurial > hg > orthanc-wsi

changeset 55:b6432a00b103

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use of simpler data structures
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Nov 2016 14:44:11 +0100
parents 06847108819c
children 83cd735c885d
files Framework/Inputs/DicomPyramidLevel.cpp Framework/Inputs/DicomPyramidLevel.h
diffstat 2 files changed, 53 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Inputs/DicomPyramidLevel.cpp	Thu Nov 24 12:59:50 2016 +0100
+++ b/Framework/Inputs/DicomPyramidLevel.cpp	Thu Nov 24 14:44:11 2016 +0100
@@ -28,21 +28,36 @@
 
 namespace OrthancWSI
 {
+  DicomPyramidLevel::TileContent& DicomPyramidLevel::GetTileContent(unsigned int tileX,
+                                                                    unsigned int tileY)
+  {
+    if (tileX >= countTilesX_ ||
+        tileY >= countTilesY_)
+    {
+      LOG(ERROR) << "Tile location (" << tileX << "," << tileY << ") is outside the image";
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
+    }
+
+    return tiles_[tileY * countTilesX_ + tileX];
+  }
+
   void DicomPyramidLevel::RegisterFrame(const DicomPyramidInstance& instance,
                                         unsigned int frame)
   {
-    TileLocation location(instance.GetFrameLocationX(frame), 
-                          instance.GetFrameLocationY(frame));
+    unsigned int tileX = instance.GetFrameLocationX(frame);
+    unsigned int tileY = instance.GetFrameLocationY(frame);
+    TileContent& tile = GetTileContent(tileX, tileY);
 
-    if (tiles_.find(location) != tiles_.end())
+    if (tile.instance_ != NULL)
     {
-      LOG(ERROR) << "Tile with location (" << location.first << "," 
-                 << location.second << ") is indexed twice in level of size "
+      LOG(ERROR) << "Tile with location (" << tileX << "," 
+                 << tileY << ") is indexed twice in level of size "
                  << totalWidth_ << "x" << totalHeight_;
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
     }
 
-    tiles_[location] = std::make_pair(&instance, frame);
+    tile.instance_ = &instance;
+    tile.frame_ = frame;
   }
 
 
@@ -50,14 +65,15 @@
                                      unsigned int tileX,
                                      unsigned int tileY) const
   {
-    Tiles::const_iterator found = tiles_.find(std::make_pair(tileX, tileY));
-    if (found == tiles_.end())
+    const TileContent& tmp = const_cast<DicomPyramidLevel&>(*this).GetTileContent(tileX, tileY);
+
+    if (tmp.instance_ == NULL)
     {
       return false;
     }
     else
     {
-      tile = found->second;
+      tile = tmp;
       return true;
     }
   }
@@ -74,6 +90,10 @@
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
+
+    countTilesX_ = CeilingDivision(totalWidth_, tileWidth_);
+    countTilesY_ = CeilingDivision(totalHeight_, tileHeight_);
+    tiles_.resize(countTilesX_ * countTilesY_);
       
     AddInstance(instance);
   }
@@ -89,8 +109,6 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize);
     }
 
-    instances_.push_back(&instance);
-
     for (size_t frame = 0; frame < instance.GetFrameCount(); frame++)
     {
       RegisterFrame(instance, frame);
@@ -108,11 +126,11 @@
     TileContent tile;
     if (LookupTile(tile, tileX, tileY))
     {
-      assert(tile.first != NULL);
-      const DicomPyramidInstance& instance = *tile.first;
+      assert(tile.instance_ != NULL);
+      const DicomPyramidInstance& instance = *tile.instance_;
 
       std::string uri = ("/instances/" + instance.GetInstanceId() + 
-                         "/frames/" + boost::lexical_cast<std::string>(tile.second) + "/raw");
+                         "/frames/" + boost::lexical_cast<std::string>(tile.frame_) + "/raw");
 
       orthanc.RestApiGet(raw, uri);
 
--- a/Framework/Inputs/DicomPyramidLevel.h	Thu Nov 24 12:59:50 2016 +0100
+++ b/Framework/Inputs/DicomPyramidLevel.h	Thu Nov 24 14:44:11 2016 +0100
@@ -29,17 +29,28 @@
   class DicomPyramidLevel : public boost::noncopyable
   {
   private:
-    typedef std::pair<unsigned int, unsigned int>                 TileLocation;
-    typedef std::pair<const DicomPyramidInstance*, unsigned int>  TileContent;
-    typedef std::map<TileLocation, TileContent>                   Tiles;
-    typedef std::list<const DicomPyramidInstance*>                Instances;
+    struct TileContent
+    {
+      const DicomPyramidInstance*  instance_;
+      unsigned int                 frame_;
 
-    unsigned int   totalWidth_;
-    unsigned int   totalHeight_;
-    unsigned int   tileWidth_;
-    unsigned int   tileHeight_;
-    Instances      instances_;
-    Tiles          tiles_;
+      TileContent() : 
+        instance_(NULL),
+        frame_(0)
+      {
+      }
+    };
+
+    unsigned int             totalWidth_;
+    unsigned int             totalHeight_;
+    unsigned int             tileWidth_;
+    unsigned int             tileHeight_;
+    unsigned int             countTilesX_;
+    unsigned int             countTilesY_;
+    std::vector<TileContent> tiles_;
+
+    TileContent& GetTileContent(unsigned int tileX,
+                                unsigned int tileY);
 
     void RegisterFrame(const DicomPyramidInstance& instance,
                        unsigned int frame);