Mercurial > hg > orthanc
comparison PalantirServer/FromDcmtkBridge.cpp @ 41:c1097a676eca
better naming for preview images
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 31 Aug 2012 11:45:48 +0200 |
parents | f6d12037f886 |
children | ea48f38afe5f |
comparison
equal
deleted
inserted
replaced
40:a08b085190e1 | 41:c1097a676eca |
---|---|
377 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength); | 377 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength); |
378 } | 378 } |
379 } | 379 } |
380 | 380 |
381 | 381 |
382 void FromDcmtkBridge::ExtractNormalizedImage(std::string& result, | 382 void FromDcmtkBridge::ExtractPreviewImage(std::string& result, |
383 DcmDataset& dataset) | 383 DcmDataset& dataset) |
384 { | 384 { |
385 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data | 385 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data |
386 | 386 |
387 PngWriter w; | 387 PngWriter w; |
388 std::auto_ptr<DicomIntegerPixelAccessor> accessor; | 388 std::auto_ptr<DicomIntegerPixelAccessor> accessor; |
430 accessor->GetWidth(), PixelFormat_Grayscale8, &image[0]); | 430 accessor->GetWidth(), PixelFormat_Grayscale8, &image[0]); |
431 } | 431 } |
432 } | 432 } |
433 | 433 |
434 | 434 |
435 void FromDcmtkBridge::ExtractNormalizedImage(std::string& result, | 435 void FromDcmtkBridge::ExtractPreviewImage(std::string& result, |
436 const std::string& dicomContent) | 436 const std::string& dicomContent) |
437 { | 437 { |
438 DcmInputBufferStream is; | 438 DcmInputBufferStream is; |
439 if (dicomContent.size() > 0) | 439 if (dicomContent.size() > 0) |
440 { | 440 { |
441 is.setBuffer(&dicomContent[0], dicomContent.size()); | 441 is.setBuffer(&dicomContent[0], dicomContent.size()); |
443 is.setEos(); | 443 is.setEos(); |
444 | 444 |
445 DcmFileFormat dicom; | 445 DcmFileFormat dicom; |
446 if (dicom.read(is).good()) | 446 if (dicom.read(is).good()) |
447 { | 447 { |
448 ExtractNormalizedImage(result, *dicom.getDataset()); | 448 ExtractPreviewImage(result, *dicom.getDataset()); |
449 } | 449 } |
450 else | 450 else |
451 { | 451 { |
452 throw PalantirException(ErrorCode_BadFileFormat); | 452 throw PalantirException(ErrorCode_BadFileFormat); |
453 } | 453 } |