Mercurial > hg > orthanc-wsi
annotate Applications/Dicomizer.cpp @ 168:d3aea0af03e1
attempt to fix issue #139
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 12 Jul 2019 12:51:17 +0200 |
parents | 605247fc8758 |
children | de783db2a7c3 |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
157 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
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. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
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 | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "../Framework/Algorithms/ReconstructPyramidCommand.h" | |
23 #include "../Framework/Algorithms/TranscodeTileCommand.h" | |
24 #include "../Framework/DicomToolbox.h" | |
25 #include "../Framework/DicomizerParameters.h" | |
26 #include "../Framework/ImagedVolumeParameters.h" | |
27 #include "../Framework/Inputs/HierarchicalTiff.h" | |
28 #include "../Framework/Inputs/OpenSlidePyramid.h" | |
29 #include "../Framework/Inputs/TiledJpegImage.h" | |
30 #include "../Framework/Inputs/TiledPngImage.h" | |
31 #include "../Framework/Inputs/TiledPyramidStatistics.h" | |
151 | 32 #include "../Framework/MultiThreading/BagOfTasksProcessor.h" |
0 | 33 #include "../Framework/Outputs/DicomPyramidWriter.h" |
34 #include "../Framework/Outputs/TruncatedPyramidWriter.h" | |
35 | |
140
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
36 #include <Core/DicomParsing/FromDcmtkBridge.h> |
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
37 #include <Core/Logging.h> |
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
38 #include <Core/OrthancException.h> |
a0f9a3df1110
resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
39 #include <Core/SystemToolbox.h> |
59
7a3853d51c45
Move "Framework/Orthanc/" as "Resources/Orthanc/"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
57
diff
changeset
|
40 |
0 | 41 #include "ApplicationToolbox.h" |
42 | |
43 #include <EmbeddedResources.h> | |
44 | |
45 #include <dcmtk/dcmdata/dcdeftag.h> | |
46 #include <dcmtk/dcmdata/dcuid.h> | |
47 #include <dcmtk/dcmdata/dcvrobow.h> | |
48 #include <dcmtk/dcmdata/dcvrat.h> | |
49 | |
50 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
51 static const char* OPTION_COLOR = "color"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
52 static const char* OPTION_COMPRESSION = "compression"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
53 static const char* OPTION_DATASET = "dataset"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
54 static const char* OPTION_FOLDER = "folder"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
55 static const char* OPTION_FOLDER_PATTERN = "folder-pattern"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
56 static const char* OPTION_HELP = "help"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
57 static const char* OPTION_ICC_PROFILE = "icc-profile"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
58 static const char* OPTION_IMAGED_DEPTH = "imaged-depth"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
59 static const char* OPTION_IMAGED_HEIGHT = "imaged-height"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
60 static const char* OPTION_IMAGED_WIDTH = "imaged-width"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
61 static const char* OPTION_INPUT = "input"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
62 static const char* OPTION_JPEG_QUALITY = "jpeg-quality"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
63 static const char* OPTION_LEVELS = "levels"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
64 static const char* OPTION_LOWER_LEVELS = "lower-levels"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
65 static const char* OPTION_MAX_SIZE = "max-size"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
66 static const char* OPTION_OFFSET_X = "offset-x"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
67 static const char* OPTION_OFFSET_Y = "offset-y"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
68 static const char* OPTION_OPENSLIDE = "openslide"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
69 static const char* OPTION_OPTICAL_PATH = "optical-path"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
70 static const char* OPTION_PYRAMID = "pyramid"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
71 static const char* OPTION_REENCODE = "reencode"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
72 static const char* OPTION_REPAINT = "repaint"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
73 static const char* OPTION_SAFETY = "safety"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
74 static const char* OPTION_SAMPLE_DATASET = "sample-dataset"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
75 static const char* OPTION_SMOOTH = "smooth"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
76 static const char* OPTION_THREADS = "threads"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
77 static const char* OPTION_TILE_HEIGHT = "tile-height"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
78 static const char* OPTION_TILE_WIDTH = "tile-width"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
79 static const char* OPTION_VERBOSE = "verbose"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
80 static const char* OPTION_VERSION = "version"; |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
81 |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
82 |
0 | 83 static void TranscodePyramid(OrthancWSI::PyramidWriterBase& target, |
84 OrthancWSI::ITiledPyramid& source, | |
85 const OrthancWSI::DicomizerParameters& parameters) | |
86 { | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
87 LOG(WARNING) << "Transcoding the source pyramid (not re-encoding)"; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
88 |
0 | 89 Orthanc::BagOfTasks tasks; |
90 | |
91 for (unsigned int i = 0; i < source.GetLevelCount(); i++) | |
92 { | |
93 LOG(WARNING) << "Creating level " << i << " of size " | |
94 << source.GetLevelWidth(i) << "x" << source.GetLevelHeight(i); | |
95 target.AddLevel(source.GetLevelWidth(i), source.GetLevelHeight(i)); | |
96 } | |
97 | |
98 OrthancWSI::TranscodeTileCommand::PrepareBagOfTasks(tasks, target, source, parameters); | |
99 OrthancWSI::ApplicationToolbox::Execute(tasks, parameters.GetThreadsCount()); | |
100 } | |
101 | |
102 | |
103 static void ReconstructPyramid(OrthancWSI::PyramidWriterBase& target, | |
104 OrthancWSI::ITiledPyramid& source, | |
105 const OrthancWSI::DicomizerParameters& parameters) | |
106 { | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
107 LOG(WARNING) << "Re-encoding the source pyramid (not transcoding, slower process)"; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
108 |
0 | 109 Orthanc::BagOfTasks tasks; |
110 | |
111 unsigned int levelsCount = parameters.GetPyramidLevelsCount(target, source); | |
112 LOG(WARNING) << "The target pyramid will have " << levelsCount << " levels"; | |
113 assert(levelsCount >= 1); | |
114 | |
115 for (unsigned int i = 0; i < levelsCount; i++) | |
116 { | |
117 unsigned int width = OrthancWSI::CeilingDivision(source.GetLevelWidth(0), 1 << i); | |
118 unsigned int height = OrthancWSI::CeilingDivision(source.GetLevelHeight(0), 1 << i); | |
119 | |
120 LOG(WARNING) << "Creating level " << i << " of size " << width << "x" << height; | |
121 target.AddLevel(width, height); | |
122 } | |
123 | |
124 unsigned int lowerLevelsCount = parameters.GetPyramidLowerLevelsCount(target, source); | |
125 if (lowerLevelsCount > levelsCount) | |
126 { | |
127 LOG(WARNING) << "The number of lower levels (" << lowerLevelsCount | |
128 << ") exceeds the number of levels (" << levelsCount | |
129 << "), cropping it"; | |
130 lowerLevelsCount = levelsCount; | |
131 } | |
132 | |
133 assert(lowerLevelsCount <= levelsCount); | |
134 if (lowerLevelsCount != levelsCount) | |
135 { | |
136 LOG(WARNING) << "Constructing the " << lowerLevelsCount << " lower levels of the pyramid"; | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
137 OrthancWSI::TruncatedPyramidWriter truncated(target, lowerLevelsCount, source.GetPhotometricInterpretation()); |
0 | 138 OrthancWSI::ReconstructPyramidCommand::PrepareBagOfTasks |
139 (tasks, truncated, source, lowerLevelsCount + 1, 0, parameters); | |
140 OrthancWSI::ApplicationToolbox::Execute(tasks, parameters.GetThreadsCount()); | |
141 | |
142 assert(tasks.GetSize() == 0); | |
143 | |
144 const unsigned int upperLevelsCount = levelsCount - lowerLevelsCount; | |
145 LOG(WARNING) << "Constructing the " << upperLevelsCount << " upper levels of the pyramid"; | |
146 OrthancWSI::ReconstructPyramidCommand::PrepareBagOfTasks | |
147 (tasks, target, truncated.GetUpperLevel(), | |
148 upperLevelsCount, lowerLevelsCount, parameters); | |
149 OrthancWSI::ApplicationToolbox::Execute(tasks, parameters.GetThreadsCount()); | |
150 } | |
151 else | |
152 { | |
153 LOG(WARNING) << "Constructing the pyramid"; | |
154 OrthancWSI::ReconstructPyramidCommand::PrepareBagOfTasks | |
155 (tasks, target, source, levelsCount, 0, parameters); | |
156 OrthancWSI::ApplicationToolbox::Execute(tasks, parameters.GetThreadsCount()); | |
157 } | |
158 } | |
159 | |
160 | |
161 static void Recompress(OrthancWSI::IFileTarget& output, | |
162 OrthancWSI::ITiledPyramid& source, | |
163 const DcmDataset& dataset, | |
164 const OrthancWSI::DicomizerParameters& parameters, | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
165 const OrthancWSI::ImagedVolumeParameters& volume, |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
166 OrthancWSI::ImageCompression sourceCompression) |
0 | 167 { |
168 OrthancWSI::TiledPyramidStatistics stats(source); | |
169 | |
170 LOG(WARNING) << "Size of source tiles: " << stats.GetTileWidth() << "x" << stats.GetTileHeight(); | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
171 LOG(WARNING) << "Pixel format: " << Orthanc::EnumerationToString(source.GetPixelFormat()); |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
172 LOG(WARNING) << "Source photometric interpretation: " << Orthanc::EnumerationToString(source.GetPhotometricInterpretation()); |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
173 LOG(WARNING) << "Source compression: " << EnumerationToString(sourceCompression); |
0 | 174 LOG(WARNING) << "Smoothing is " << (parameters.IsSmoothEnabled() ? "enabled" : "disabled"); |
175 | |
176 if (parameters.IsRepaintBackground()) | |
177 { | |
178 LOG(WARNING) << "Repainting the background with color: (" | |
179 << static_cast<int>(parameters.GetBackgroundColorRed()) << "," | |
180 << static_cast<int>(parameters.GetBackgroundColorGreen()) << "," | |
181 << static_cast<int>(parameters.GetBackgroundColorBlue()) << ")"; | |
182 } | |
183 else | |
184 { | |
185 LOG(WARNING) << "No repainting of the background"; | |
186 } | |
187 | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
188 Orthanc::PhotometricInterpretation targetPhotometric; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
189 bool transcoding; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
190 |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
191 if (parameters.IsForceReencode() || |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
192 parameters.IsReconstructPyramid() || |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
193 sourceCompression != parameters.GetTargetCompression()) |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
194 { |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
195 // The tiles of the source image will be re-encoded |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
196 transcoding = false; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
197 |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
198 switch (parameters.GetTargetCompression()) |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
199 { |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
200 case OrthancWSI::ImageCompression_Jpeg: |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
201 case OrthancWSI::ImageCompression_Jpeg2000: |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
202 targetPhotometric = Orthanc::PhotometricInterpretation_YBRFull422; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
203 break; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
204 |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
205 case OrthancWSI::ImageCompression_None: |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
206 targetPhotometric = Orthanc::PhotometricInterpretation_RGB; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
207 break; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
208 |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
209 default: |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
210 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
211 } |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
212 } |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
213 else |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
214 { |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
215 // Transcoding: The tiles are copied (no re-encoding) |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
216 transcoding = true; |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
217 targetPhotometric = source.GetPhotometricInterpretation(); |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
218 } |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
219 |
0 | 220 OrthancWSI::DicomPyramidWriter target(output, dataset, |
221 source.GetPixelFormat(), | |
222 parameters.GetTargetCompression(), | |
223 parameters.GetTargetTileWidth(source), | |
224 parameters.GetTargetTileHeight(source), | |
225 parameters.GetDicomMaxFileSize(), | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
226 volume, targetPhotometric); |
29 | 227 target.SetJpegQuality(parameters.GetJpegQuality()); |
0 | 228 |
229 LOG(WARNING) << "Size of target tiles: " << target.GetTileWidth() << "x" << target.GetTileHeight(); | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
230 LOG(WARNING) << "Target photometric interpretation: " << Orthanc::EnumerationToString(targetPhotometric); |
0 | 231 |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
232 if (!transcoding && |
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
233 target.GetImageCompression() == OrthancWSI::ImageCompression_Jpeg) |
0 | 234 { |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
235 LOG(WARNING) << "Target compression: Jpeg with quality " |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
236 << static_cast<int>(target.GetJpegQuality()); |
0 | 237 target.SetJpegQuality(target.GetJpegQuality()); |
238 } | |
239 else | |
240 { | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
241 LOG(WARNING) << "Target compression: " |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
242 << OrthancWSI::EnumerationToString(target.GetImageCompression()); |
0 | 243 } |
244 | |
245 if (stats.GetTileWidth() % target.GetTileWidth() != 0 || | |
246 stats.GetTileHeight() % target.GetTileHeight() != 0) | |
247 { | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
248 LOG(ERROR) << "When resampling the tile size, " |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
249 << "it must be a integer divisor of the original tile size"; |
0 | 250 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); |
251 } | |
252 | |
253 if (target.GetTileWidth() <= 16 || | |
254 target.GetTileHeight() <= 16) | |
255 { | |
256 LOG(ERROR) << "Tiles are too small (16 pixels minimum): " | |
257 << target.GetTileWidth() << "x" << target.GetTileHeight(); | |
258 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize); | |
259 } | |
260 | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
261 if (transcoding) |
0 | 262 { |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
263 TranscodePyramid(target, stats, parameters); |
0 | 264 } |
265 else | |
266 { | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
267 ReconstructPyramid(target, stats, parameters); |
0 | 268 } |
269 | |
270 target.Flush(); | |
271 } | |
272 | |
273 | |
274 | |
275 static DcmDataset* ParseDataset(const std::string& path) | |
276 { | |
277 Json::Value json; | |
278 | |
279 if (path.empty()) | |
280 { | |
281 json = Json::objectValue; // Empty dataset => TODO EMBED | |
282 } | |
283 else | |
284 { | |
285 std::string content; | |
43 | 286 Orthanc::SystemToolbox::ReadFile(content, path); |
0 | 287 |
288 Json::Reader reader; | |
289 if (!reader.parse(content, json, false)) | |
290 { | |
291 LOG(ERROR) << "Cannot parse the JSON file in: " << path; | |
292 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
293 } | |
294 } | |
295 | |
296 std::auto_ptr<DcmDataset> dataset(Orthanc::FromDcmtkBridge::FromJson(json, true, true, Orthanc::Encoding_Latin1)); | |
297 if (dataset.get() == NULL) | |
298 { | |
299 LOG(ERROR) << "Cannot convert to JSON file to a DICOM dataset: " << path; | |
300 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
301 } | |
302 | |
303 // VL Whole Slide Microscopy Image IOD | |
304 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.77.1.6"); | |
305 | |
306 // Slide Microscopy | |
307 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_Modality, "SM"); | |
308 | |
309 // Patient orientation makes no sense in whole-slide images | |
310 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_PatientOrientation, ""); | |
311 | |
312 // Some basic coordinate information | |
313 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_VolumetricProperties, "VOLUME"); | |
314 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ImageOrientationSlide, "0\\-1\\0\\-1\\0\\0"); | |
315 | |
316 std::string date, time; | |
130 | 317 Orthanc::SystemToolbox::GetNowDicom(date, time, true /* use UTC time (not local time) */); |
0 | 318 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyDate, date); |
319 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyTime, time); | |
320 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesDate, date); | |
321 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesTime, time); | |
322 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ContentDate, date); | |
323 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ContentTime, time); | |
324 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_AcquisitionDateTime, date + time); | |
325 | |
326 return dataset.release(); | |
327 } | |
328 | |
329 | |
330 | |
331 static void SetupDimension(DcmDataset& dataset, | |
332 const std::string& opticalPathId, | |
333 const OrthancWSI::ITiledPyramid& source, | |
334 const OrthancWSI::ImagedVolumeParameters& volume) | |
335 { | |
83 | 336 // Extract the identifier of the Dimension Organization, if provided |
337 std::string organization; | |
0 | 338 DcmItem* previous = OrthancWSI::DicomToolbox::ExtractSingleSequenceItem(dataset, DCM_DimensionOrganizationSequence); |
339 | |
83 | 340 if (previous != NULL && |
341 previous->tagExists(DCM_DimensionOrganizationUID)) | |
342 { | |
343 organization = OrthancWSI::DicomToolbox::GetStringTag(*previous, DCM_DimensionOrganizationUID); | |
344 } | |
345 else | |
0 | 346 { |
83 | 347 // No Dimension Organization provided: Generate an unique identifier |
348 organization = Orthanc::FromDcmtkBridge::GenerateUniqueIdentifier(Orthanc::ResourceType_Instance); | |
349 } | |
350 | |
351 | |
352 { | |
353 // Construct tag "Dimension Organization Sequence" (0020,9221) | |
354 std::auto_ptr<DcmItem> item(new DcmItem); | |
355 OrthancWSI::DicomToolbox::SetStringTag(*item, DCM_DimensionOrganizationUID, organization); | |
356 | |
357 std::auto_ptr<DcmSequenceOfItems> sequence(new DcmSequenceOfItems(DCM_DimensionOrganizationSequence)); | |
358 | |
359 if (!sequence->insert(item.release(), false, false).good() || | |
360 !dataset.insert(sequence.release(), true /* replace */, false).good()) | |
0 | 361 { |
83 | 362 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
0 | 363 } |
364 } | |
365 | |
83 | 366 |
0 | 367 { |
83 | 368 // Construct tag "Dimension Index Sequence" (0020,9222) |
369 std::auto_ptr<DcmItem> item(new DcmItem); | |
370 OrthancWSI::DicomToolbox::SetStringTag(*item, DCM_DimensionOrganizationUID, organization); | |
84
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
371 OrthancWSI::DicomToolbox::SetAttributeTag(*item, DCM_FunctionalGroupPointer, DCM_PlanePositionSlideSequence); |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
372 OrthancWSI::DicomToolbox::SetAttributeTag(*item, DCM_DimensionIndexPointer, DCM_ColumnPositionInTotalImagePixelMatrix); |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
373 |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
374 std::auto_ptr<DcmItem> item2(new DcmItem); |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
375 OrthancWSI::DicomToolbox::SetStringTag(*item2, DCM_DimensionOrganizationUID, organization); |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
376 OrthancWSI::DicomToolbox::SetAttributeTag(*item2, DCM_FunctionalGroupPointer, DCM_PlanePositionSlideSequence); |
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
377 OrthancWSI::DicomToolbox::SetAttributeTag(*item2, DCM_DimensionIndexPointer, DCM_RowPositionInTotalImagePixelMatrix); |
0 | 378 |
83 | 379 std::auto_ptr<DcmSequenceOfItems> sequence(new DcmSequenceOfItems(DCM_DimensionIndexSequence)); |
0 | 380 |
83 | 381 if (!sequence->insert(item.release(), false, false).good() || |
84
727670c5c125
fix generation of "Dimension Index Sequence" and "Dimension Index Values"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
382 !sequence->insert(item2.release(), false, false).good() || |
83 | 383 !dataset.insert(sequence.release(), true /* replace */, false).good()) |
384 { | |
385 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
386 } | |
0 | 387 } |
388 | |
389 | |
83 | 390 { |
391 // Construct tag "Shared Functional Groups Sequence" (5200,9229) | |
0 | 392 |
168
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
393 #if 1 |
83 | 394 // In the 2 lines below, remember to switch X/Y when going from physical to pixel coordinates! |
395 float spacingX = volume.GetWidth() / static_cast<float>(source.GetLevelHeight(0)); | |
396 float spacingY = volume.GetHeight() / static_cast<float>(source.GetLevelWidth(0)); | |
397 | |
398 std::string spacing = (boost::lexical_cast<std::string>(spacingX) + '\\' + | |
399 boost::lexical_cast<std::string>(spacingY)); | |
400 | |
401 std::auto_ptr<DcmItem> item(new DcmItem); | |
0 | 402 |
83 | 403 std::auto_ptr<DcmItem> item2(new DcmItem); |
404 OrthancWSI::DicomToolbox::SetStringTag(*item2, DCM_SliceThickness, | |
405 boost::lexical_cast<std::string>(volume.GetDepth())); | |
406 OrthancWSI::DicomToolbox::SetStringTag(*item2, DCM_PixelSpacing, spacing); | |
0 | 407 |
83 | 408 std::auto_ptr<DcmItem> item3(new DcmItem); |
409 OrthancWSI::DicomToolbox::SetStringTag(*item3, DCM_OpticalPathIdentifier, opticalPathId); | |
0 | 410 |
83 | 411 std::auto_ptr<DcmSequenceOfItems> sequence(new DcmSequenceOfItems(DCM_SharedFunctionalGroupsSequence)); |
412 std::auto_ptr<DcmSequenceOfItems> sequence2(new DcmSequenceOfItems(DCM_PixelMeasuresSequence)); | |
413 std::auto_ptr<DcmSequenceOfItems> sequence3(new DcmSequenceOfItems(DCM_OpticalPathIdentificationSequence)); | |
0 | 414 |
83 | 415 if (!sequence2->insert(item2.release(), false, false).good() || |
416 !sequence3->insert(item3.release(), false, false).good() || | |
417 !item->insert(sequence2.release(), false, false).good() || | |
418 !item->insert(sequence3.release(), false, false).good() || | |
419 !sequence->insert(item.release(), false, false).good() || | |
420 !dataset.insert(sequence.release(), true /* replace */, false).good()) | |
421 { | |
422 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
423 } | |
168
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
424 #else |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
425 std::auto_ptr<DcmItem> item(new DcmItem); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
426 |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
427 std::auto_ptr<DcmItem> item3(new DcmItem); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
428 OrthancWSI::DicomToolbox::SetStringTag(*item3, DCM_OpticalPathIdentifier, opticalPathId); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
429 |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
430 std::auto_ptr<DcmSequenceOfItems> sequence(new DcmSequenceOfItems(DCM_SharedFunctionalGroupsSequence)); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
431 std::auto_ptr<DcmSequenceOfItems> sequence3(new DcmSequenceOfItems(DCM_OpticalPathIdentificationSequence)); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
432 |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
433 if (!sequence3->insert(item3.release(), false, false).good() || |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
434 !item->insert(sequence3.release(), false, false).good() || |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
435 !sequence->insert(item.release(), false, false).good() || |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
436 !dataset.insert(sequence.release(), true /* replace */, false).good()) |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
437 { |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
438 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
439 } |
d3aea0af03e1
attempt to fix issue 139
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
167
diff
changeset
|
440 #endif |
0 | 441 } |
442 } | |
443 | |
444 | |
445 static void EnrichDataset(DcmDataset& dataset, | |
446 const OrthancWSI::ITiledPyramid& source, | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
447 OrthancWSI::ImageCompression sourceCompression, |
0 | 448 const OrthancWSI::DicomizerParameters& parameters, |
449 const OrthancWSI::ImagedVolumeParameters& volume) | |
450 { | |
451 Orthanc::Encoding encoding = Orthanc::FromDcmtkBridge::DetectEncoding(dataset, Orthanc::Encoding_Latin1); | |
452 | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
453 if (sourceCompression == OrthancWSI::ImageCompression_Jpeg || |
0 | 454 parameters.GetTargetCompression() == OrthancWSI::ImageCompression_Jpeg) |
455 { | |
456 // Takes as estimation a 1:10 compression ratio | |
457 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_LossyImageCompression, "01"); | |
458 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_LossyImageCompressionRatio, "10"); | |
459 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_LossyImageCompressionMethod, "ISO_10918_1"); // JPEG Lossy Compression | |
460 } | |
461 else | |
462 { | |
463 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_LossyImageCompression, "00"); | |
464 } | |
465 | |
466 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_ImagedVolumeWidth, boost::lexical_cast<std::string>(volume.GetWidth())); | |
467 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_ImagedVolumeHeight, boost::lexical_cast<std::string>(volume.GetHeight())); | |
468 OrthancWSI::DicomToolbox::SetStringTag(dataset, DCM_ImagedVolumeDepth, boost::lexical_cast<std::string>(volume.GetDepth())); | |
469 | |
470 std::auto_ptr<DcmItem> origin(new DcmItem); | |
471 OrthancWSI::DicomToolbox::SetStringTag(*origin, DCM_XOffsetInSlideCoordinateSystem, | |
472 boost::lexical_cast<std::string>(volume.GetOffsetX())); | |
473 OrthancWSI::DicomToolbox::SetStringTag(*origin, DCM_YOffsetInSlideCoordinateSystem, | |
474 boost::lexical_cast<std::string>(volume.GetOffsetY())); | |
475 | |
476 std::auto_ptr<DcmSequenceOfItems> sequenceOrigin(new DcmSequenceOfItems(DCM_TotalPixelMatrixOriginSequence)); | |
477 if (!sequenceOrigin->insert(origin.release(), false, false).good() || | |
478 !dataset.insert(sequenceOrigin.release(), false, false).good()) | |
479 { | |
480 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
481 } | |
482 | |
483 | |
484 if (parameters.GetOpticalPath() == OrthancWSI::OpticalPath_Brightfield) | |
485 { | |
486 if (dataset.tagExists(DCM_OpticalPathSequence)) | |
487 { | |
488 LOG(ERROR) << "The user DICOM dataset already contains an optical path sequence, giving up"; | |
489 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
490 } | |
491 | |
492 std::string brightfield; | |
493 Orthanc::EmbeddedResources::GetFileResource(brightfield, Orthanc::EmbeddedResources::BRIGHTFIELD_OPTICAL_PATH); | |
494 | |
495 Json::Value json; | |
496 Json::Reader reader; | |
497 if (!reader.parse(brightfield, json, false)) | |
498 { | |
499 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
500 } | |
501 | |
502 std::auto_ptr<DcmElement> element(Orthanc::FromDcmtkBridge::FromJson( | |
503 Orthanc::DicomTag(DCM_OpticalPathSequence.getGroup(), | |
504 DCM_OpticalPathSequence.getElement()), | |
505 json, false, encoding)); | |
506 if (!dataset.insert(element.release()).good()) | |
507 { | |
508 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
509 } | |
510 } | |
511 | |
512 | |
513 std::string profile; | |
514 if (parameters.GetIccProfilePath().empty()) | |
515 { | |
516 Orthanc::EmbeddedResources::GetFileResource(profile, Orthanc::EmbeddedResources::SRGB_ICC_PROFILE); | |
517 } | |
518 else | |
519 { | |
43 | 520 Orthanc::SystemToolbox::ReadFile(profile, parameters.GetIccProfilePath()); |
0 | 521 } |
522 | |
523 | |
524 DcmItem* opticalPath = OrthancWSI::DicomToolbox::ExtractSingleSequenceItem(dataset, DCM_OpticalPathSequence); | |
525 if (opticalPath == NULL) | |
526 { | |
527 LOG(ERROR) << "No optical path specified"; | |
528 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
529 } | |
530 | |
531 if (!opticalPath->tagExists(DCM_ICCProfile)) | |
532 { | |
533 std::auto_ptr<DcmOtherByteOtherWord> icc(new DcmOtherByteOtherWord(DCM_ICCProfile)); | |
534 | |
535 if (!icc->putUint8Array(reinterpret_cast<const Uint8*>(profile.c_str()), profile.size()).good() || | |
536 !opticalPath->insert(icc.release()).good()) | |
537 { | |
538 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
539 } | |
540 } | |
541 | |
542 const char* opticalPathId = NULL; | |
543 if (!opticalPath->findAndGetString(DCM_OpticalPathIdentifier, opticalPathId).good() || | |
544 opticalPathId == NULL) | |
545 { | |
546 LOG(ERROR) << "No identifier in the optical path"; | |
547 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
548 } | |
549 | |
550 SetupDimension(dataset, opticalPathId, source, volume); | |
551 } | |
552 | |
553 | |
554 static bool ParseParameters(int& exitStatus, | |
555 OrthancWSI::DicomizerParameters& parameters, | |
556 OrthancWSI::ImagedVolumeParameters& volume, | |
557 int argc, | |
558 char* argv[]) | |
559 { | |
560 // Declare the supported parameters | |
561 boost::program_options::options_description generic("Generic options"); | |
562 generic.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
563 (OPTION_HELP, "Display this help and exit") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
564 (OPTION_VERSION, "Output version information and exit") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
565 (OPTION_VERBOSE, "Be verbose in logs") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
566 (OPTION_THREADS, |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
567 boost::program_options::value<int>()->default_value(parameters.GetThreadsCount()), |
0 | 568 "Number of processing threads to be used") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
569 (OPTION_OPENSLIDE, boost::program_options::value<std::string>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
570 "Path to the shared library of OpenSlide " |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
571 "(not necessary if converting from standard hierarchical TIFF)") |
0 | 572 ; |
573 | |
574 boost::program_options::options_description source("Options for the source image"); | |
575 source.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
576 (OPTION_DATASET, boost::program_options::value<std::string>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
577 "Path to a JSON file containing the DICOM dataset") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
578 (OPTION_SAMPLE_DATASET, |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
579 "Display a minimalistic sample DICOM dataset in JSON format, then exit") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
580 (OPTION_REENCODE, boost::program_options::value<bool>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
581 "Whether to re-encode each tile (no transcoding, much slower) (Boolean)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
582 (OPTION_REPAINT, boost::program_options::value<bool>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
583 "Whether to repaint the background of the image (Boolean)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
584 (OPTION_COLOR, boost::program_options::value<std::string>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
585 "Color of the background (e.g. \"255,0,0\")") |
0 | 586 ; |
587 | |
588 boost::program_options::options_description pyramid("Options to construct the pyramid"); | |
589 pyramid.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
590 (OPTION_PYRAMID, boost::program_options::value<bool>()->default_value(false), |
0 | 591 "Reconstruct the full pyramid (slow) (Boolean)") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
592 (OPTION_SMOOTH, boost::program_options::value<bool>()->default_value(false), |
0 | 593 "Apply smoothing when reconstructing the pyramid " |
594 "(slower, but higher quality) (Boolean)") | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
595 (OPTION_LEVELS, boost::program_options::value<int>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
596 "Number of levels in the target pyramid") |
0 | 597 ; |
598 | |
599 boost::program_options::options_description target("Options for the target image"); | |
600 target.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
601 (OPTION_TILE_WIDTH, boost::program_options::value<int>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
602 "Width of the tiles in the target image") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
603 (OPTION_TILE_HEIGHT, boost::program_options::value<int>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
604 "Height of the tiles in the target image") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
605 (OPTION_COMPRESSION, boost::program_options::value<std::string>(), |
0 | 606 "Compression of the target image (\"none\", \"jpeg\" or \"jpeg2000\")") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
607 (OPTION_JPEG_QUALITY, boost::program_options::value<int>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
608 "Set quality level for JPEG (0..100)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
609 (OPTION_MAX_SIZE, boost::program_options::value<int>()->default_value(10), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
610 "Maximum size per DICOM instance (in MB), 0 means no limit on the file size") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
611 (OPTION_FOLDER, boost::program_options::value<std::string>(), |
0 | 612 "Folder where to store the output DICOM instances") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
613 (OPTION_FOLDER_PATTERN, |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
614 boost::program_options::value<std::string>()->default_value("wsi-%06d.dcm"), |
0 | 615 "Pattern for the files in the output folder") |
616 ("orthanc", boost::program_options::value<std::string>()->default_value("http://localhost:8042/"), | |
617 "URL to the REST API of the target Orthanc server") | |
618 ; | |
619 | |
620 boost::program_options::options_description volumeOptions("Description of the imaged volume"); | |
621 volumeOptions.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
622 (OPTION_IMAGED_WIDTH, boost::program_options::value<float>()->default_value(15), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
623 "Width of the specimen (in mm)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
624 (OPTION_IMAGED_HEIGHT, boost::program_options::value<float>()->default_value(15), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
625 "Height of the specimen (in mm)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
626 (OPTION_IMAGED_DEPTH, boost::program_options::value<float>()->default_value(1), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
627 "Depth of the specimen (in mm)") |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
628 (OPTION_OFFSET_X, boost::program_options::value<float>()->default_value(20), |
0 | 629 "X offset the specimen, wrt. slide coordinates origin (in mm)") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
630 (OPTION_OFFSET_Y, boost::program_options::value<float>()->default_value(40), |
0 | 631 "Y offset the specimen, wrt. slide coordinates origin (in mm)") |
632 ; | |
633 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
634 boost::program_options::options_description restOptions |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
635 ("HTTP/HTTPS client configuration to access the Orthanc REST API"); |
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
636 OrthancWSI::ApplicationToolbox::AddRestApiOptions(restOptions); |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
637 |
0 | 638 boost::program_options::options_description advancedOptions("Advanced options"); |
639 advancedOptions.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
640 (OPTION_OPTICAL_PATH, boost::program_options::value<std::string>()->default_value("brightfield"), |
0 | 641 "Optical path to be automatically added to the DICOM dataset (\"none\" or \"brightfield\")") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
642 (OPTION_ICC_PROFILE, boost::program_options::value<std::string>(), |
0 | 643 "Path to the ICC profile to be included. If empty, a default sRGB profile will be added.") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
644 (OPTION_SAFETY, boost::program_options::value<bool>()->default_value(true), |
0 | 645 "Whether to do additional checks to verify the source image is supported (might slow down) (Boolean)") |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
646 (OPTION_LOWER_LEVELS, boost::program_options::value<int>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
647 "Number of pyramid levels up to which multithreading " |
0 | 648 "should be applied (only for performance/memory tuning)") |
649 ; | |
650 | |
651 boost::program_options::options_description hidden; | |
652 hidden.add_options() | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
653 (OPTION_INPUT, boost::program_options::value<std::string>(), |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
654 "Input file"); |
0 | 655 ; |
656 | |
657 boost::program_options::options_description allWithoutHidden; | |
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
658 allWithoutHidden |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
659 .add(generic) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
660 .add(source) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
661 .add(pyramid) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
662 .add(target) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
663 .add(volumeOptions) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
664 .add(restOptions) |
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
665 .add(advancedOptions); |
0 | 666 |
667 boost::program_options::options_description all = allWithoutHidden; | |
668 all.add(hidden); | |
669 | |
670 boost::program_options::positional_options_description positional; | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
671 positional.add(OPTION_INPUT, 1); |
0 | 672 |
673 boost::program_options::variables_map options; | |
674 bool error = false; | |
675 | |
676 try | |
677 { | |
678 boost::program_options::store(boost::program_options::command_line_parser(argc, argv). | |
679 options(all).positional(positional).run(), options); | |
680 boost::program_options::notify(options); | |
681 } | |
682 catch (boost::program_options::error& e) | |
683 { | |
684 LOG(ERROR) << "Error while parsing the command-line arguments: " << e.what(); | |
685 error = true; | |
686 } | |
687 | |
688 if (!error && | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
689 options.count(OPTION_SAMPLE_DATASET)) |
0 | 690 { |
691 std::string sample; | |
692 Orthanc::EmbeddedResources::GetFileResource(sample, Orthanc::EmbeddedResources::SAMPLE_DATASET); | |
693 | |
694 std::cout << std::endl << sample << std::endl; | |
695 | |
696 return false; | |
697 } | |
698 | |
699 if (!error && | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
700 options.count(OPTION_HELP) == 0 && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
701 options.count(OPTION_VERSION) == 0 && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
702 options.count(OPTION_INPUT) != 1) |
0 | 703 { |
704 LOG(ERROR) << "No input file was specified"; | |
705 error = true; | |
706 } | |
707 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
708 if (error || options.count(OPTION_HELP)) |
0 | 709 { |
710 std::cout << std::endl | |
711 << "Usage: " << argv[0] << " [OPTION]... [INPUT]" | |
712 << std::endl | |
713 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." | |
714 << std::endl << std::endl | |
715 << "Create a DICOM file from a digital pathology image." | |
716 << std::endl; | |
717 | |
718 std::cout << allWithoutHidden << "\n"; | |
719 | |
720 if (error) | |
721 { | |
722 exitStatus = -1; | |
723 } | |
724 | |
725 return false; | |
726 } | |
727 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
728 if (options.count(OPTION_VERSION)) |
8
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
729 { |
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
730 OrthancWSI::ApplicationToolbox::PrintVersion(argv[0]); |
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
731 return false; |
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
732 } |
62adabb8c122
Provide "--version" in command-line tools
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
733 |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
734 if (options.count(OPTION_VERBOSE)) |
0 | 735 { |
736 Orthanc::Logging::EnableInfoLevel(true); | |
737 } | |
738 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
739 if (options.count(OPTION_OPENSLIDE)) |
0 | 740 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
741 OrthancWSI::OpenSlideLibrary::Initialize(options[OPTION_OPENSLIDE].as<std::string>()); |
0 | 742 } |
743 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
744 if (options.count(OPTION_PYRAMID) && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
745 options[OPTION_PYRAMID].as<bool>()) |
0 | 746 { |
747 parameters.SetReconstructPyramid(true); | |
748 } | |
749 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
750 if (options.count(OPTION_SMOOTH) && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
751 options[OPTION_SMOOTH].as<bool>()) |
0 | 752 { |
753 parameters.SetSmoothEnabled(true); | |
754 } | |
755 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
756 if (options.count(OPTION_SAFETY) && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
757 options[OPTION_SAFETY].as<bool>()) |
0 | 758 { |
759 parameters.SetSafetyCheck(true); | |
760 } | |
761 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
762 if (options.count(OPTION_REENCODE) && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
763 options[OPTION_REENCODE].as<bool>()) |
0 | 764 { |
765 parameters.SetForceReencode(true); | |
766 } | |
767 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
768 if (options.count(OPTION_REPAINT) && |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
769 options[OPTION_REPAINT].as<bool>()) |
0 | 770 { |
771 parameters.SetRepaintBackground(true); | |
772 } | |
773 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
774 if (options.count(OPTION_TILE_WIDTH) || |
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
775 options.count(OPTION_TILE_HEIGHT)) |
0 | 776 { |
777 int w = 0; | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
778 if (options.count(OPTION_TILE_WIDTH)) |
0 | 779 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
780 w = options[OPTION_TILE_WIDTH].as<int>(); |
0 | 781 } |
782 | |
145 | 783 int h = 0; |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
784 if (options.count(OPTION_TILE_HEIGHT)) |
0 | 785 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
786 h = options[OPTION_TILE_HEIGHT].as<int>(); |
0 | 787 } |
788 | |
789 if (w < 0 || h < 0) | |
790 { | |
791 LOG(ERROR) << "Negative target tile size specified: " << w << "x" << h; | |
792 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
793 } | |
794 | |
795 parameters.SetTargetTileSize(w, h); | |
796 } | |
797 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
798 parameters.SetInputFile(options[OPTION_INPUT].as<std::string>()); |
0 | 799 |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
800 if (options.count(OPTION_COLOR)) |
0 | 801 { |
802 uint8_t r, g, b; | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
803 OrthancWSI::ApplicationToolbox::ParseColor(r, g, b, options[OPTION_COLOR].as<std::string>()); |
0 | 804 parameters.SetBackgroundColor(r, g, b); |
805 } | |
806 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
807 if (options.count(OPTION_COMPRESSION)) |
0 | 808 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
809 std::string s = options[OPTION_COMPRESSION].as<std::string>(); |
0 | 810 if (s == "none") |
811 { | |
812 parameters.SetTargetCompression(OrthancWSI::ImageCompression_None); | |
813 } | |
814 else if (s == "jpeg") | |
815 { | |
816 parameters.SetTargetCompression(OrthancWSI::ImageCompression_Jpeg); | |
817 } | |
818 else if (s == "jpeg2000") | |
819 { | |
820 parameters.SetTargetCompression(OrthancWSI::ImageCompression_Jpeg2000); | |
821 } | |
822 else | |
823 { | |
824 LOG(ERROR) << "Unknown image compression for the target image: " << s; | |
825 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
826 } | |
827 } | |
828 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
829 if (options.count(OPTION_JPEG_QUALITY)) |
0 | 830 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
831 parameters.SetJpegQuality(options[OPTION_JPEG_QUALITY].as<int>()); |
0 | 832 } |
833 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
834 if (options.count(OPTION_LEVELS)) |
0 | 835 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
836 parameters.SetPyramidLevelsCount(options[OPTION_LEVELS].as<int>()); |
0 | 837 } |
838 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
839 if (options.count(OPTION_LOWER_LEVELS)) |
0 | 840 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
841 parameters.SetPyramidLowerLevelsCount(options[OPTION_LOWER_LEVELS].as<int>()); |
0 | 842 } |
843 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
844 if (options.count(OPTION_THREADS)) |
0 | 845 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
846 parameters.SetThreadsCount(options[OPTION_THREADS].as<int>()); |
0 | 847 } |
848 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
849 if (options.count(OPTION_MAX_SIZE)) |
0 | 850 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
851 parameters.SetDicomMaxFileSize(options[OPTION_MAX_SIZE].as<int>() * 1024 * 1024); |
0 | 852 } |
853 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
854 if (options.count(OPTION_FOLDER)) |
0 | 855 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
856 parameters.SetTargetFolder(options[OPTION_FOLDER].as<std::string>()); |
0 | 857 } |
858 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
859 if (options.count(OPTION_FOLDER_PATTERN)) |
0 | 860 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
861 parameters.SetTargetFolderPattern(options[OPTION_FOLDER_PATTERN].as<std::string>()); |
0 | 862 } |
863 | |
125
7a3f4d580625
SSL is enabled by default for HTTPS transfers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
123
diff
changeset
|
864 OrthancWSI::ApplicationToolbox::SetupRestApi(parameters.GetOrthancParameters(), options); |
0 | 865 |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
866 if (options.count(OPTION_DATASET)) |
0 | 867 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
868 parameters.SetDatasetPath(options[OPTION_DATASET].as<std::string>()); |
0 | 869 } |
870 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
871 if (options.count(OPTION_IMAGED_WIDTH)) |
0 | 872 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
873 volume.SetWidth(options[OPTION_IMAGED_WIDTH].as<float>()); |
0 | 874 } |
875 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
876 if (options.count(OPTION_IMAGED_HEIGHT)) |
0 | 877 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
878 volume.SetHeight(options[OPTION_IMAGED_HEIGHT].as<float>()); |
0 | 879 } |
880 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
881 if (options.count(OPTION_IMAGED_DEPTH)) |
0 | 882 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
883 volume.SetDepth(options[OPTION_IMAGED_DEPTH].as<float>()); |
0 | 884 } |
885 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
886 if (options.count(OPTION_OFFSET_X)) |
0 | 887 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
888 volume.SetOffsetX(options[OPTION_OFFSET_X].as<float>()); |
0 | 889 } |
890 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
891 if (options.count(OPTION_OFFSET_Y)) |
0 | 892 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
893 volume.SetOffsetY(options[OPTION_OFFSET_Y].as<float>()); |
0 | 894 } |
895 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
896 if (options.count(OPTION_OPTICAL_PATH)) |
0 | 897 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
898 std::string s = options[OPTION_OPTICAL_PATH].as<std::string>(); |
0 | 899 if (s == "none") |
900 { | |
901 parameters.SetOpticalPath(OrthancWSI::OpticalPath_None); | |
902 } | |
903 else if (s == "brightfield") | |
904 { | |
905 parameters.SetOpticalPath(OrthancWSI::OpticalPath_Brightfield); | |
906 } | |
907 else | |
908 { | |
909 LOG(ERROR) << "Unknown optical path definition: " << s; | |
910 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
911 } | |
912 } | |
913 | |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
914 if (options.count(OPTION_ICC_PROFILE)) |
0 | 915 { |
129
806d1bb56918
cleaning up options in Dicomizer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
125
diff
changeset
|
916 parameters.SetIccProfilePath(options[OPTION_ICC_PROFILE].as<std::string>()); |
0 | 917 } |
918 | |
919 return true; | |
920 } | |
921 | |
922 | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
923 |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
924 OrthancWSI::ITiledPyramid* OpenInputPyramid(OrthancWSI::ImageCompression& sourceCompression, |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
925 const std::string& path, |
0 | 926 const OrthancWSI::DicomizerParameters& parameters) |
927 { | |
928 LOG(WARNING) << "The input image is: " << path; | |
929 | |
930 OrthancWSI::ImageCompression format = OrthancWSI::DetectFormatFromFile(path); | |
931 LOG(WARNING) << "File format of the input image: " << EnumerationToString(format); | |
932 | |
933 switch (format) | |
934 { | |
935 case OrthancWSI::ImageCompression_Png: | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
936 { |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
937 sourceCompression = OrthancWSI::ImageCompression_Unknown; |
0 | 938 return new OrthancWSI::TiledPngImage(path, |
939 parameters.GetTargetTileWidth(512), | |
940 parameters.GetTargetTileHeight(512)); | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
941 } |
0 | 942 |
943 case OrthancWSI::ImageCompression_Jpeg: | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
944 { |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
945 sourceCompression = OrthancWSI::ImageCompression_Unknown; |
0 | 946 return new OrthancWSI::TiledJpegImage(path, |
947 parameters.GetTargetTileWidth(512), | |
948 parameters.GetTargetTileHeight(512)); | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
949 } |
0 | 950 |
951 case OrthancWSI::ImageCompression_Tiff: | |
952 { | |
953 try | |
954 { | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
955 std::auto_ptr<OrthancWSI::HierarchicalTiff> tiff(new OrthancWSI::HierarchicalTiff(path)); |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
956 sourceCompression = tiff->GetImageCompression(); |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
957 return tiff.release(); |
0 | 958 } |
959 catch (Orthanc::OrthancException&) | |
960 { | |
961 LOG(WARNING) << "This is not a standard hierarchical TIFF file"; | |
962 } | |
963 } | |
964 | |
965 default: | |
966 break; | |
967 } | |
968 | |
969 try | |
970 { | |
971 LOG(WARNING) << "Trying to open the input pyramid with OpenSlide"; | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
972 sourceCompression = OrthancWSI::ImageCompression_Unknown; |
0 | 973 return new OrthancWSI::OpenSlidePyramid(path, |
974 parameters.GetTargetTileWidth(512), | |
975 parameters.GetTargetTileHeight(512)); | |
976 } | |
977 catch (Orthanc::OrthancException&) | |
978 { | |
979 LOG(ERROR) << "This file is not supported by OpenSlide"; | |
980 return NULL; | |
981 } | |
982 } | |
983 | |
984 | |
985 int main(int argc, char* argv[]) | |
986 { | |
987 OrthancWSI::ApplicationToolbox::GlobalInitialize(); | |
93
14146ecd1688
Display version of the framework in the logs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
84
diff
changeset
|
988 OrthancWSI::ApplicationToolbox::ShowVersionInLog(argv[0]); |
0 | 989 |
990 int exitStatus = 0; | |
991 | |
992 try | |
993 { | |
994 OrthancWSI::DicomizerParameters parameters; | |
995 OrthancWSI::ImagedVolumeParameters volume; | |
996 | |
997 if (ParseParameters(exitStatus, parameters, volume, argc, argv)) | |
998 { | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
999 OrthancWSI::ImageCompression sourceCompression; |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1000 std::auto_ptr<OrthancWSI::ITiledPyramid> source; |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1001 |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1002 source.reset(OpenInputPyramid(sourceCompression, parameters.GetInputFile(), parameters)); |
0 | 1003 if (source.get() == NULL) |
1004 { | |
1005 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
1006 } | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1007 |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1008 LOG(WARNING) << "Compression of the individual source tiles: " << OrthancWSI::EnumerationToString(sourceCompression); |
0 | 1009 |
1010 // Create the shared DICOM tags | |
1011 std::auto_ptr<DcmDataset> dataset(ParseDataset(parameters.GetDatasetPath())); | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1012 EnrichDataset(*dataset, *source, sourceCompression, parameters, volume); |
0 | 1013 |
1014 std::auto_ptr<OrthancWSI::IFileTarget> output(parameters.CreateTarget()); | |
167
605247fc8758
Fix issue #144 (OrthancWSIDicomizer PhotometricInterpretation)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
1015 Recompress(*output, *source, *dataset, parameters, volume, sourceCompression); |
0 | 1016 } |
1017 } | |
1018 catch (Orthanc::OrthancException& e) | |
1019 { | |
1020 LOG(ERROR) << "Terminating on exception: " << e.What(); | |
1021 exitStatus = -1; | |
1022 } | |
1023 | |
1024 OrthancWSI::ApplicationToolbox::GlobalFinalize(); | |
1025 | |
1026 return exitStatus; | |
1027 } |