Mercurial > hg > orthanc-wsi

comparison Framework/Outputs/DicomPyramidWriter.cpp @ 167:605247fc8758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2019 12:00:31 +0200
parents 6b8ccfc02051
children d3aea0af03e1
comparison
equal deleted inserted replaced
166:f0dac1e8f736 167:605247fc8758
138 138
139 if (writer == NULL) 139 if (writer == NULL)
140 { 140 {
141 writer = new MultiframeDicomWriter 141 writer = new MultiframeDicomWriter
142 (dataset_, GetImageCompression(), GetPixelFormat(), level.width_, level.height_, 142 (dataset_, GetImageCompression(), GetPixelFormat(), level.width_, level.height_,
143 GetTileWidth(), GetTileHeight()); 143 GetTileWidth(), GetTileHeight(), photometric_);
144 writers_[z] = writer; 144 writers_[z] = writer;
145 } 145 }
146 146
147 std::auto_ptr<DcmItem> functionalGroup(CreateFunctionalGroup(writer->GetFramesCount() + 1, 147 std::auto_ptr<DcmItem> functionalGroup(CreateFunctionalGroup(writer->GetFramesCount() + 1,
148 x * GetTileWidth(), 148 x * GetTileWidth(),
164 Orthanc::PixelFormat pixelFormat, 164 Orthanc::PixelFormat pixelFormat,
165 ImageCompression compression, 165 ImageCompression compression,
166 unsigned int tileWidth, 166 unsigned int tileWidth,
167 unsigned int tileHeight, 167 unsigned int tileHeight,
168 size_t maxSize, // If "0", no automatic flushing 168 size_t maxSize, // If "0", no automatic flushing
169 const ImagedVolumeParameters& volume) : 169 const ImagedVolumeParameters& volume,
170 Orthanc::PhotometricInterpretation photometric) :
170 PyramidWriterBase(pixelFormat, compression, tileWidth, tileHeight), 171 PyramidWriterBase(pixelFormat, compression, tileWidth, tileHeight),
171 target_(target), 172 target_(target),
172 dataset_(dataset), 173 dataset_(dataset),
173 maxSize_(maxSize), 174 maxSize_(maxSize),
174 countTiles_(0), 175 countTiles_(0),
175 countInstances_(0), 176 countInstances_(0),
176 volume_(volume) 177 volume_(volume),
178 photometric_(photometric)
177 { 179 {
178 } 180 }
179 181
180 182
181 DicomPyramidWriter::~DicomPyramidWriter() 183 DicomPyramidWriter::~DicomPyramidWriter()