Mercurial > hg > orthanc

comparison OrthancServer/SliceOrdering.h @ 3899:104e27133ebd transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
'/ordered-slices': reverted the change introduced in 1.5.8 and go-back to 1.5.7 behaviour
author Alain Mazy <alain@mazy.be>
date Thu, 07 May 2020 12:23:40 +0200
parents 94f4a18a79cc
children
comparison
equal deleted inserted replaced
3897:a4c0ae644fe5 3899:104e27133ebd
49 49
50 ServerIndex& index_; 50 ServerIndex& index_;
51 std::string seriesId_; 51 std::string seriesId_;
52 bool hasNormal_; 52 bool hasNormal_;
53 Vector normal_; 53 Vector normal_;
54 std::vector<Instance*> instances_; // this vector owns the instances 54 std::vector<Instance*> instances_;
55 std::vector<Instance*> sortedInstances_; // this vectore references the instances of instances_
56 bool isVolume_; 55 bool isVolume_;
57 56
58 static bool ComputeNormal(Vector& normal, 57 static bool ComputeNormal(Vector& normal,
59 const DicomMap& dicom); 58 const DicomMap& dicom);
60 59
76 SliceOrdering(ServerIndex& index, 75 SliceOrdering(ServerIndex& index,
77 const std::string& seriesId); 76 const std::string& seriesId);
78 77
79 ~SliceOrdering(); 78 ~SliceOrdering();
80 79
81 size_t GetSortedInstancesCount() const 80 size_t GetInstancesCount() const
82 { 81 {
83 return sortedInstances_.size(); 82 return instances_.size();
84 } 83 }
85 84
86 const std::string& GetSortedInstanceId(size_t index) const; 85 const std::string& GetInstanceId(size_t index) const;
87 86
88 unsigned int GetSortedInstanceFramesCount(size_t index) const; 87 unsigned int GetFramesCount(size_t index) const;
89 88
90 void Format(Json::Value& result) const; 89 void Format(Json::Value& result) const;
91 }; 90 };
92 } 91 }