Mercurial > hg > orthanc-stone
annotate UnitTestsSources/UnitTestsMain.cpp @ 71:30c768873d47 wasm
OrthancSliceLoader::ScheduleLoadInstance
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 24 May 2017 10:27:18 +0200 |
| parents | f73aed014bde |
| children | c1cc3bdba18c |
| rev | line source |
|---|---|
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Stone of Orthanc |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
40
7207a407bcd8
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
| 47 | 8 * modify it under the terms of the GNU Affero General Public License |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, but |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * WITHOUT ANY WARRANTY; without even the implied warranty of |
| 47 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 **/ |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 #include "gtest/gtest.h" |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
24 #include "../Framework/Toolbox/OrthancAsynchronousWebService.h" |
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 #include "../Resources/Orthanc/Core/Logging.h" |
|
69
1553b67b24e5
OrthancSynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
26 #include "../Framework/Toolbox/OrthancSynchronousWebService.h" |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
27 #include "../Framework/Layers/OrthancFrameLayerSource.h" |
| 66 | 28 #include "../Framework/Widgets/LayerWidget.h" |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
29 |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
30 |
| 68 | 31 #include "../Resources/Orthanc/Core/Images/PngReader.h" |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
32 #include "../Framework/Toolbox/MessagingToolbox.h" |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
33 #include "../Framework/Toolbox/DicomFrameConverter.h" |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
34 |
| 68 | 35 #include <boost/lexical_cast.hpp> |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
36 #include <boost/date_time/posix_time/posix_time.hpp> |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
37 #include <boost/thread/thread.hpp> |
| 68 | 38 |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
39 namespace OrthancStone |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
40 { |
| 68 | 41 class Slice |
| 42 { | |
| 43 private: | |
| 44 enum Type | |
| 45 { | |
| 46 Type_Invalid, | |
| 47 Type_OrthancInstance | |
| 48 // TODO A slice could come from some DICOM file (URL) | |
| 49 }; | |
| 50 | |
| 51 Type type_; | |
| 52 std::string orthancInstanceId_; | |
| 53 unsigned int frame_; | |
| 54 SliceGeometry geometry_; | |
| 55 double pixelSpacingX_; | |
| 56 double pixelSpacingY_; | |
| 57 double thickness_; | |
| 58 unsigned int width_; | |
| 59 unsigned int height_; | |
| 60 DicomFrameConverter converter_; | |
| 61 | |
| 62 public: | |
| 63 Slice() : type_(Type_Invalid) | |
| 64 { | |
| 65 } | |
| 66 | |
| 67 bool ParseOrthancFrame(const OrthancPlugins::IDicomDataset& dataset, | |
| 68 const std::string& instanceId, | |
| 69 unsigned int frame) | |
| 70 { | |
| 71 OrthancPlugins::DicomDatasetReader reader(dataset); | |
| 72 | |
| 73 unsigned int frameCount; | |
| 74 if (!reader.GetUnsignedIntegerValue(frameCount, OrthancPlugins::DICOM_TAG_NUMBER_OF_FRAMES)) | |
| 75 { | |
| 76 frameCount = 1; // Assume instance with one frame | |
| 77 } | |
| 78 | |
| 79 if (frame >= frameCount) | |
| 80 { | |
| 81 return false; | |
| 82 } | |
| 83 | |
| 84 if (!reader.GetDoubleValue(thickness_, OrthancPlugins::DICOM_TAG_SLICE_THICKNESS)) | |
| 85 { | |
| 86 thickness_ = 100.0 * std::numeric_limits<double>::epsilon(); | |
| 87 } | |
| 88 | |
| 89 GeometryToolbox::GetPixelSpacing(pixelSpacingX_, pixelSpacingY_, dataset); | |
| 90 | |
| 91 std::string position, orientation; | |
| 92 if (dataset.GetStringValue(position, OrthancPlugins::DICOM_TAG_IMAGE_POSITION_PATIENT) && | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
93 dataset.GetStringValue(orientation, OrthancPlugins::DICOM_TAG_IMAGE_ORIENTATION_PATIENT)) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
94 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
95 geometry_ = SliceGeometry(position, orientation); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
96 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
97 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
98 if (reader.GetUnsignedIntegerValue(width_, OrthancPlugins::DICOM_TAG_COLUMNS) && |
| 68 | 99 reader.GetUnsignedIntegerValue(height_, OrthancPlugins::DICOM_TAG_ROWS)) |
| 100 { | |
| 101 orthancInstanceId_ = instanceId; | |
| 102 frame_ = frame; | |
| 103 converter_.ReadParameters(dataset); | |
| 104 | |
| 105 type_ = Type_OrthancInstance; | |
| 106 return true; | |
| 107 } | |
| 108 else | |
| 109 { | |
| 110 return false; | |
| 111 } | |
| 112 } | |
| 113 | |
| 114 bool IsOrthancInstance() const | |
| 115 { | |
| 116 return type_ == Type_OrthancInstance; | |
| 117 } | |
| 118 | |
| 119 const std::string GetOrthancInstanceId() const | |
| 120 { | |
| 121 if (type_ != Type_OrthancInstance) | |
| 122 { | |
| 123 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 124 } | |
| 125 | |
| 126 return orthancInstanceId_; | |
| 127 } | |
| 128 | |
| 129 unsigned int GetFrame() const | |
| 130 { | |
| 131 if (type_ == Type_Invalid) | |
| 132 { | |
| 133 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 134 } | |
| 135 | |
| 136 return frame_; | |
| 137 } | |
| 138 | |
| 139 const SliceGeometry& GetGeometry() const | |
| 140 { | |
| 141 if (type_ == Type_Invalid) | |
| 142 { | |
| 143 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 144 } | |
| 145 | |
| 146 return geometry_; | |
| 147 } | |
| 148 | |
| 149 double GetThickness() const | |
| 150 { | |
| 151 if (type_ == Type_Invalid) | |
| 152 { | |
| 153 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 154 } | |
| 155 | |
| 156 return thickness_; | |
| 157 } | |
| 158 | |
| 159 double GetPixelSpacingX() const | |
| 160 { | |
| 161 if (type_ == Type_Invalid) | |
| 162 { | |
| 163 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 164 } | |
| 165 | |
| 166 return pixelSpacingX_; | |
| 167 } | |
| 168 | |
| 169 double GetPixelSpacingY() const | |
| 170 { | |
| 171 if (type_ == Type_Invalid) | |
| 172 { | |
| 173 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 174 } | |
| 175 | |
| 176 return pixelSpacingY_; | |
| 177 } | |
| 178 | |
| 179 unsigned int GetWidth() const | |
| 180 { | |
| 181 if (type_ == Type_Invalid) | |
| 182 { | |
| 183 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 184 } | |
| 185 | |
| 186 return width_; | |
| 187 } | |
| 188 | |
| 189 unsigned int GetHeight() const | |
| 190 { | |
| 191 if (type_ == Type_Invalid) | |
| 192 { | |
| 193 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 194 } | |
| 195 | |
| 196 return height_; | |
| 197 } | |
| 198 | |
| 199 const DicomFrameConverter& GetConverter() const | |
| 200 { | |
| 201 if (type_ == Type_Invalid) | |
| 202 { | |
| 203 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 204 } | |
| 205 | |
| 206 return converter_; | |
| 207 } | |
| 208 }; | |
| 209 | |
| 210 | |
| 211 class SliceSorter : public boost::noncopyable | |
| 212 { | |
| 213 private: | |
| 214 class SliceWithDepth : public boost::noncopyable | |
| 215 { | |
| 216 private: | |
| 217 Slice slice_; | |
| 218 double depth_; | |
| 219 | |
| 220 public: | |
| 221 SliceWithDepth(const Slice& slice) : | |
| 222 slice_(slice), | |
| 223 depth_(0) | |
| 224 { | |
| 225 } | |
| 226 | |
| 227 void SetNormal(const Vector& normal) | |
| 228 { | |
| 229 depth_ = boost::numeric::ublas::inner_prod | |
| 230 (slice_.GetGeometry().GetOrigin(), normal); | |
| 231 } | |
| 232 | |
| 233 double GetDepth() const | |
| 234 { | |
| 235 return depth_; | |
| 236 } | |
| 237 | |
| 238 const Slice& GetSlice() const | |
| 239 { | |
| 240 return slice_; | |
| 241 } | |
| 242 }; | |
| 243 | |
| 244 struct Comparator | |
| 245 { | |
| 246 bool operator() (const SliceWithDepth* const& a, | |
| 247 const SliceWithDepth* const& b) const | |
| 248 { | |
| 249 return a->GetDepth() < b->GetDepth(); | |
| 250 } | |
| 251 }; | |
| 252 | |
| 253 typedef std::vector<SliceWithDepth*> Slices; | |
| 254 | |
| 255 Slices slices_; | |
| 256 bool hasNormal_; | |
| 257 | |
| 258 public: | |
| 259 SliceSorter() : hasNormal_(false) | |
| 260 { | |
| 261 } | |
| 262 | |
| 263 ~SliceSorter() | |
| 264 { | |
| 265 for (size_t i = 0; i < slices_.size(); i++) | |
| 266 { | |
| 267 assert(slices_[i] != NULL); | |
| 268 delete slices_[i]; | |
| 269 } | |
| 270 } | |
| 271 | |
| 272 void Reserve(size_t count) | |
| 273 { | |
| 274 slices_.reserve(count); | |
| 275 } | |
| 276 | |
| 277 void AddSlice(const Slice& slice) | |
| 278 { | |
| 279 slices_.push_back(new SliceWithDepth(slice)); | |
| 280 } | |
| 281 | |
| 282 size_t GetSliceCount() const | |
| 283 { | |
| 284 return slices_.size(); | |
| 285 } | |
| 286 | |
| 287 const Slice& GetSlice(size_t i) const | |
| 288 { | |
| 289 if (i >= slices_.size()) | |
| 290 { | |
| 291 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 292 } | |
| 293 | |
| 294 assert(slices_[i] != NULL); | |
| 295 return slices_[i]->GetSlice(); | |
| 296 } | |
| 297 | |
| 298 void SetNormal(const Vector& normal) | |
| 299 { | |
| 300 for (size_t i = 0; i < slices_.size(); i++) | |
| 301 { | |
| 302 slices_[i]->SetNormal(normal); | |
| 303 } | |
| 304 | |
| 305 hasNormal_ = true; | |
| 306 } | |
| 307 | |
| 308 void Sort() | |
| 309 { | |
| 310 if (!hasNormal_) | |
| 311 { | |
| 312 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 313 } | |
| 314 | |
| 315 Comparator comparator; | |
| 316 std::sort(slices_.begin(), slices_.end(), comparator); | |
| 317 } | |
| 318 | |
| 319 void FilterNormal(const Vector& normal) | |
| 320 { | |
| 321 size_t pos = 0; | |
| 322 | |
| 323 for (size_t i = 0; i < slices_.size(); i++) | |
| 324 { | |
| 325 if (GeometryToolbox::IsParallel(normal, slices_[i]->GetSlice().GetGeometry().GetNormal())) | |
| 326 { | |
| 327 // This slice is compatible with the selected normal | |
| 328 slices_[pos] = slices_[i]; | |
| 329 pos += 1; | |
| 330 } | |
| 331 else | |
| 332 { | |
| 333 delete slices_[i]; | |
| 334 slices_[i] = NULL; | |
| 335 } | |
| 336 } | |
| 337 | |
| 338 slices_.resize(pos); | |
| 339 } | |
| 340 | |
| 341 bool SelectNormal(Vector& normal) const | |
| 342 { | |
| 343 std::vector<Vector> normalCandidates; | |
| 344 std::vector<unsigned int> normalCount; | |
| 345 | |
| 346 bool found = false; | |
| 347 | |
| 348 for (size_t i = 0; !found && i < GetSliceCount(); i++) | |
| 349 { | |
| 350 const Vector& normal = GetSlice(i).GetGeometry().GetNormal(); | |
| 351 | |
| 352 bool add = true; | |
| 353 for (size_t j = 0; add && j < normalCandidates.size(); j++) // (*) | |
| 354 { | |
| 355 if (GeometryToolbox::IsParallel(normal, normalCandidates[j])) | |
| 356 { | |
| 357 normalCount[j] += 1; | |
| 358 add = false; | |
| 359 } | |
| 360 } | |
| 361 | |
| 362 if (add) | |
| 363 { | |
| 364 if (normalCount.size() > 2) | |
| 365 { | |
| 366 // To get linear-time complexity in (*). This heuristics | |
| 367 // allows the series to have one single frame that is | |
| 368 // not parallel to the others (such a frame could be a | |
| 369 // generated preview) | |
| 370 found = false; | |
| 371 } | |
| 372 else | |
| 373 { | |
| 374 normalCandidates.push_back(normal); | |
| 375 normalCount.push_back(1); | |
| 376 } | |
| 377 } | |
| 378 } | |
| 379 | |
| 380 for (size_t i = 0; !found && i < normalCandidates.size(); i++) | |
| 381 { | |
| 382 unsigned int count = normalCount[i]; | |
| 383 if (count == GetSliceCount() || | |
| 384 count + 1 == GetSliceCount()) | |
| 385 { | |
| 386 normal = normalCandidates[i]; | |
| 387 found = true; | |
| 388 } | |
| 389 } | |
| 390 | |
| 391 return found; | |
| 392 } | |
| 393 }; | |
| 394 | |
| 395 | |
| 396 | |
| 397 class OrthancSliceLoader : | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
398 public IWebService::ICallback // TODO move to PImpl |
| 66 | 399 { |
| 400 public: | |
| 401 class ICallback : public boost::noncopyable | |
| 402 { | |
| 403 public: | |
| 404 virtual ~ICallback() | |
| 405 { | |
| 406 } | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
407 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
408 virtual void NotifyGeometryReady(OrthancSliceLoader& loader) = 0; |
| 68 | 409 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
410 virtual void NotifyGeometryError(OrthancSliceLoader& loader) = 0; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
411 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
412 virtual void NotifySliceImageReady(OrthancSliceLoader& loader, |
| 68 | 413 unsigned int sliceIndex, |
| 414 const Slice& slice, | |
| 415 Orthanc::ImageAccessor* image) = 0; | |
| 416 | |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
417 virtual void NotifySliceImageError(OrthancSliceLoader& loader, |
| 68 | 418 unsigned int sliceIndex, |
| 419 const Slice& slice) = 0; | |
| 66 | 420 }; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
421 |
| 66 | 422 private: |
| 68 | 423 enum State |
| 66 | 424 { |
| 68 | 425 State_Error, |
| 426 State_Initialization, | |
| 427 State_LoadingGeometry, | |
| 428 State_GeometryReady | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
429 }; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
430 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
431 enum Mode |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
432 { |
| 68 | 433 Mode_SeriesGeometry, |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
434 Mode_InstanceGeometry, |
| 68 | 435 Mode_LoadImage |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
436 }; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
437 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
438 class Operation : public Orthanc::IDynamicObject |
| 66 | 439 { |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
440 private: |
| 68 | 441 Mode mode_; |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
442 unsigned int frame_; |
| 68 | 443 unsigned int sliceIndex_; |
| 444 const Slice* slice_; | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
445 std::string instanceId_; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
446 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
447 Operation(Mode mode) : |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
448 mode_(mode) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
449 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
450 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
451 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
452 public: |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
453 Mode GetMode() const |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
454 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
455 return mode_; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
456 } |
| 68 | 457 |
| 458 unsigned int GetSliceIndex() const | |
| 459 { | |
| 460 assert(mode_ == Mode_LoadImage); | |
| 461 return sliceIndex_; | |
| 462 } | |
| 463 | |
| 464 const Slice& GetSlice() const | |
| 465 { | |
| 466 assert(mode_ == Mode_LoadImage && slice_ != NULL); | |
| 467 return *slice_; | |
| 468 } | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
469 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
470 unsigned int GetFrame() const |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
471 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
472 assert(mode_ == Mode_InstanceGeometry); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
473 return frame_; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
474 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
475 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
476 const std::string& GetInstanceId() const |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
477 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
478 assert(mode_ == Mode_InstanceGeometry); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
479 return instanceId_; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
480 } |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
481 |
| 68 | 482 static Operation* DownloadSeriesGeometry() |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
483 { |
| 68 | 484 return new Operation(Mode_SeriesGeometry); |
| 485 } | |
| 486 | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
487 static Operation* DownloadInstanceGeometry(const std::string& instanceId, |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
488 unsigned int frame) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
489 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
490 std::auto_ptr<Operation> operation(new Operation(Mode_InstanceGeometry)); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
491 operation->instanceId_ = instanceId; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
492 operation->frame_ = frame; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
493 return operation.release(); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
494 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
495 |
| 68 | 496 static Operation* DownloadSliceImage(unsigned int sliceIndex, |
| 497 const Slice& slice) | |
| 498 { | |
| 499 std::auto_ptr<Operation> tmp(new Operation(Mode_LoadImage)); | |
| 500 tmp->sliceIndex_ = sliceIndex; | |
| 501 tmp->slice_ = &slice; | |
| 502 return tmp.release(); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
503 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
504 }; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
505 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
506 ICallback& callback_; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
507 IWebService& orthanc_; |
| 68 | 508 State state_; |
| 509 SliceSorter slices_; | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
510 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
511 |
| 68 | 512 void ParseSeriesGeometry(const void* answer, |
| 513 size_t size) | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
514 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
515 Json::Value series; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
516 if (!MessagingToolbox::ParseJson(series, answer, size) || |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
517 series.type() != Json::objectValue) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
518 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
519 callback_.NotifyGeometryError(*this); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
520 return; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
521 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
522 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
523 Json::Value::Members instances = series.getMemberNames(); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
524 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
525 slices_.Reserve(instances.size()); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
526 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
527 for (size_t i = 0; i < instances.size(); i++) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
528 { |
| 68 | 529 OrthancPlugins::FullOrthancDataset dataset(series[instances[i]]); |
| 530 | |
| 531 Slice slice; | |
| 532 if (slice.ParseOrthancFrame(dataset, instances[i], 0 /* todo */)) | |
| 533 { | |
| 534 slices_.AddSlice(slice); | |
| 535 } | |
| 536 else | |
| 537 { | |
| 538 LOG(WARNING) << "Skipping invalid instance " << instances[i]; | |
| 539 } | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
540 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
541 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
542 bool ok = false; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
543 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
544 if (slices_.GetSliceCount() > 0) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
545 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
546 Vector normal; |
| 68 | 547 if (slices_.SelectNormal(normal)) |
| 548 { | |
| 549 slices_.FilterNormal(normal); | |
| 550 slices_.SetNormal(normal); | |
| 551 slices_.Sort(); | |
| 552 ok = true; | |
| 553 } | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
554 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
555 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
556 state_ = State_GeometryReady; |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
557 |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
558 if (ok) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
559 { |
| 68 | 560 LOG(INFO) << "Loaded a series with " << slices_.GetSliceCount() << " slice(s)"; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
561 callback_.NotifyGeometryReady(*this); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
562 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
563 else |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
564 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
565 LOG(ERROR) << "This series is empty"; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
566 callback_.NotifyGeometryError(*this); |
| 68 | 567 } |
| 568 } | |
| 569 | |
| 570 | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
571 void ParseInstanceGeometry(const std::string& instanceId, |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
572 unsigned int frame, |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
573 const void* answer, |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
574 size_t size) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
575 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
576 Json::Value tags; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
577 if (!MessagingToolbox::ParseJson(tags, answer, size) || |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
578 tags.type() != Json::objectValue) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
579 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
580 callback_.NotifyGeometryError(*this); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
581 return; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
582 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
583 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
584 OrthancPlugins::FullOrthancDataset dataset(tags); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
585 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
586 state_ = State_GeometryReady; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
587 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
588 Slice slice; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
589 if (slice.ParseOrthancFrame(dataset, instanceId, frame)) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
590 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
591 LOG(INFO) << "Loaded instance " << instanceId; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
592 slices_.AddSlice(slice); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
593 callback_.NotifyGeometryReady(*this); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
594 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
595 else |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
596 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
597 LOG(WARNING) << "Skipping invalid instance " << instanceId; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
598 callback_.NotifyGeometryError(*this); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
599 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
600 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
601 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
602 |
| 68 | 603 void ParseSliceImage(const Operation& operation, |
| 604 const void* answer, | |
| 605 size_t size) | |
| 606 { | |
| 607 std::auto_ptr<Orthanc::PngReader> image(new Orthanc::PngReader); | |
| 608 image->ReadFromMemory(answer, size); | |
| 609 | |
| 610 bool ok = (image->GetWidth() == operation.GetSlice().GetWidth() || | |
| 611 image->GetHeight() == operation.GetSlice().GetHeight()); | |
| 612 | |
| 613 if (ok && | |
| 614 operation.GetSlice().GetConverter().GetExpectedPixelFormat() == | |
| 615 Orthanc::PixelFormat_SignedGrayscale16) | |
| 616 { | |
| 617 if (image->GetFormat() == Orthanc::PixelFormat_Grayscale16) | |
| 618 { | |
| 619 image->SetFormat(Orthanc::PixelFormat_SignedGrayscale16); | |
| 620 } | |
| 621 else | |
| 622 { | |
| 623 ok = false; | |
| 624 } | |
| 625 } | |
| 626 | |
| 627 if (ok) | |
| 628 { | |
| 629 callback_.NotifySliceImageReady(*this, operation.GetSliceIndex(), | |
| 630 operation.GetSlice(), image.release()); | |
| 631 } | |
| 632 else | |
| 633 { | |
| 634 callback_.NotifySliceImageError(*this, operation.GetSliceIndex(), | |
| 635 operation.GetSlice()); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
636 } |
| 66 | 637 } |
| 638 | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
639 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
640 public: |
| 68 | 641 OrthancSliceLoader(ICallback& callback, |
| 642 IWebService& orthanc) : | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
643 callback_(callback), |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
644 orthanc_(orthanc), |
| 68 | 645 state_(State_Initialization) |
| 646 { | |
| 647 } | |
| 648 | |
| 649 void ScheduleLoadSeries(const std::string& seriesId) | |
| 66 | 650 { |
| 68 | 651 if (state_ != State_Initialization) |
| 652 { | |
| 653 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 654 } | |
| 655 else | |
| 656 { | |
| 657 state_ = State_LoadingGeometry; | |
| 658 std::string uri = "/series/" + seriesId + "/instances-tags"; | |
| 659 orthanc_.ScheduleGetRequest(*this, uri, Operation::DownloadSeriesGeometry()); | |
| 660 } | |
| 661 } | |
| 662 | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
663 void ScheduleLoadInstance(const std::string& instanceId, |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
664 unsigned int frame) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
665 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
666 if (state_ != State_Initialization) |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
667 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
668 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
669 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
670 else |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
671 { |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
672 state_ = State_LoadingGeometry; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
673 std::string uri = "/instances/" + instanceId + "/tags"; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
674 orthanc_.ScheduleGetRequest |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
675 (*this, uri, Operation::DownloadInstanceGeometry(instanceId, frame)); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
676 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
677 } |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
678 |
| 68 | 679 size_t GetSliceCount() const |
| 680 { | |
| 681 if (state_ != State_GeometryReady) | |
| 682 { | |
| 683 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 684 } | |
| 685 | |
| 686 return slices_.GetSliceCount(); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
687 } |
| 66 | 688 |
| 68 | 689 const Slice& GetSlice(size_t index) const |
| 690 { | |
| 691 if (state_ != State_GeometryReady) | |
| 692 { | |
| 693 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 694 } | |
| 695 | |
| 696 return slices_.GetSlice(index); | |
| 697 } | |
| 698 | |
| 699 void ScheduleLoadSliceImage(size_t index) | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
700 { |
| 68 | 701 if (state_ != State_GeometryReady) |
| 702 { | |
| 703 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 704 } | |
| 705 else | |
| 706 { | |
| 707 const Slice& slice = GetSlice(index); | |
| 708 | |
| 709 std::string uri = ("/instances/" + slice.GetOrthancInstanceId() + "/frames/" + | |
| 710 boost::lexical_cast<std::string>(slice.GetFrame())); | |
| 711 | |
| 712 switch (slice.GetConverter().GetExpectedPixelFormat()) | |
| 713 { | |
| 714 case Orthanc::PixelFormat_RGB24: | |
| 715 uri += "/preview"; | |
| 716 break; | |
| 717 | |
| 718 case Orthanc::PixelFormat_Grayscale16: | |
| 719 uri += "/image-uint16"; | |
| 720 break; | |
| 721 | |
| 722 case Orthanc::PixelFormat_SignedGrayscale16: | |
| 723 uri += "/image-int16"; | |
| 724 break; | |
| 725 | |
| 726 default: | |
| 727 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 728 } | |
| 729 | |
| 730 orthanc_.ScheduleGetRequest(*this, uri, Operation::DownloadSliceImage(index, slice)); | |
| 731 } | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
732 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
733 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
734 virtual void NotifySuccess(const std::string& uri, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
735 const void* answer, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
736 size_t answerSize, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
737 Orthanc::IDynamicObject* payload) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
738 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
739 std::auto_ptr<Operation> operation(dynamic_cast<Operation*>(payload)); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
740 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
741 switch (operation->GetMode()) |
| 66 | 742 { |
| 68 | 743 case Mode_SeriesGeometry: |
| 744 ParseSeriesGeometry(answer, answerSize); | |
| 745 break; | |
| 746 | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
747 case Mode_InstanceGeometry: |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
748 ParseInstanceGeometry(operation->GetInstanceId(), operation->GetFrame(), answer, answerSize); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
749 break; |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
750 |
| 68 | 751 case Mode_LoadImage: |
| 752 ParseSliceImage(*operation, answer, answerSize); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
753 break; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
754 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
755 default: |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
756 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
| 66 | 757 } |
| 758 } | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
759 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
760 virtual void NotifyError(const std::string& uri, |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
761 Orthanc::IDynamicObject* payload) |
| 66 | 762 { |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
763 std::auto_ptr<Operation> operation(dynamic_cast<Operation*>(payload)); |
| 66 | 764 LOG(ERROR) << "Cannot download " << uri; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
765 |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
766 switch (operation->GetMode()) |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
767 { |
| 68 | 768 case Mode_SeriesGeometry: |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
769 callback_.NotifyGeometryError(*this); |
| 68 | 770 state_ = State_Error; |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
771 break; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
772 |
| 68 | 773 case Mode_LoadImage: |
| 774 callback_.NotifySliceImageError(*this, operation->GetSliceIndex(), operation->GetSlice()); | |
| 775 break; | |
| 776 | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
777 default: |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
778 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
779 } |
| 66 | 780 } |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
781 }; |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
782 |
| 66 | 783 |
| 68 | 784 class Tata : public OrthancSliceLoader::ICallback |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
785 { |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
786 public: |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
787 virtual void NotifyGeometryReady(OrthancSliceLoader& loader) |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
788 { |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
789 printf(">> %d\n", loader.GetSliceCount()); |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
790 |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
791 for (size_t i = 0; i < loader.GetSliceCount(); i++) |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
792 { |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
793 loader.ScheduleLoadSliceImage(i); |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
794 } |
| 68 | 795 } |
| 796 | |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
797 virtual void NotifyGeometryError(OrthancSliceLoader& loader) |
| 68 | 798 { |
| 799 printf("Error\n"); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
800 } |
| 66 | 801 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
802 virtual void NotifySliceImageReady(OrthancSliceLoader& loader, |
| 68 | 803 unsigned int sliceIndex, |
| 804 const Slice& slice, | |
| 805 Orthanc::ImageAccessor* image) | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
806 { |
| 68 | 807 std::auto_ptr<Orthanc::ImageAccessor> tmp(image); |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
808 printf("Slice OK %dx%d\n", tmp->GetWidth(), tmp->GetHeight()); |
| 68 | 809 } |
| 810 | |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
811 virtual void NotifySliceImageError(OrthancSliceLoader& loader, |
| 68 | 812 unsigned int sliceIndex, |
| 813 const Slice& slice) | |
| 814 { | |
| 815 printf("ERROR 2\n"); | |
|
67
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
816 } |
|
acb60cbb8301
refactoring SeriesLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
817 }; |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
818 } |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
819 |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
820 |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
821 TEST(Toto, Tutu) |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
822 { |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
823 Orthanc::WebServiceParameters web; |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
824 OrthancStone::OrthancAsynchronousWebService orthanc(web, 4); |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
825 orthanc.Start(); |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
826 |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
827 OrthancStone::Tata tata; |
| 68 | 828 OrthancStone::OrthancSliceLoader loader(tata, orthanc); |
| 829 //loader.ScheduleLoadSeries("c1c4cb95-05e3bd11-8da9f5bb-87278f71-0b2b43f5"); | |
|
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
830 //loader.ScheduleLoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
831 |
|
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
832 loader.ScheduleLoadInstance("19816330-cb02e1cf-df3a8fe8-bf510623-ccefe9f5", 0); |
| 68 | 833 |
|
70
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
834 /*printf(">> %d\n", loader.GetSliceCount()); |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
835 loader.ScheduleLoadSliceImage(31);*/ |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
836 |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
837 boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
838 |
|
f73aed014bde
OrthancAsynchronousWebService
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
839 orthanc.Stop(); |
|
65
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
840 } |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
841 |
|
885932a893de
OrthancFrameLayerSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
842 |
|
20
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
843 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
844 int main(int argc, char **argv) |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
845 { |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
846 Orthanc::Logging::Initialize(); |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
847 Orthanc::Logging::EnableInfoLevel(true); |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
848 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
849 ::testing::InitGoogleTest(&argc, argv); |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
850 int result = RUN_ALL_TESTS(); |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
851 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
852 Orthanc::Logging::Finalize(); |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
853 |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
854 return result; |
|
946377d1c992
skeleton for unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
855 } |