Mercurial > hg > orthanc

comparison OrthancServer/SliceOrdering.h @ 3538:23219b9da4d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix ordered-slices route to be closer to 1.5.7 behaviour
author Alain Mazy <alain@mazy.be>
date Tue, 15 Oct 2019 09:53:33 +0200
parents ac72032d69a2
children 94f4a18a79cc
comparison
equal deleted inserted replaced
3537:9cc09f4c0fa9 3538:23219b9da4d1
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_; 54 std::vector<Instance*> instances_; // this vector owns the instances
55 std::vector<Instance*> sortedInstances_; // this vectore references the instances of instances_
55 bool isVolume_; 56 bool isVolume_;
56 57
57 static bool ComputeNormal(Vector& normal, 58 static bool ComputeNormal(Vector& normal,
58 const DicomMap& dicom); 59 const DicomMap& dicom);
59 60
75 SliceOrdering(ServerIndex& index, 76 SliceOrdering(ServerIndex& index,
76 const std::string& seriesId); 77 const std::string& seriesId);
77 78
78 ~SliceOrdering(); 79 ~SliceOrdering();
79 80
80 size_t GetInstancesCount() const 81 size_t GetSortedInstancesCount() const
81 { 82 {
82 return instances_.size(); 83 return sortedInstances_.size();
83 } 84 }
84 85
85 const std::string& GetInstanceId(size_t index) const; 86 const std::string& GetSortedInstanceId(size_t index) const;
86 87
87 unsigned int GetFramesCount(size_t index) const; 88 unsigned int GetSortedInstanceFramesCount(size_t index) const;
88 89
89 void Format(Json::Value& result) const; 90 void Format(Json::Value& result) const;
90 }; 91 };
91 } 92 }