comparison Framework/Toolbox/MessagingToolbox.cpp @ 122:e3433dabfb8d wasm

refactoring DicomStructureSet
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Oct 2017 17:25:08 +0200
parents ba83e38cf3ff
children e2fe9352f240
comparison
equal deleted inserted replaced
121:e66b2c757790 122:e3433dabfb8d
181 if (!ParseVersion(version, major, minor, patch, json)) 181 if (!ParseVersion(version, major, minor, patch, json))
182 { 182 {
183 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); 183 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
184 } 184 }
185 185
186 LOG(WARNING) << "Version of the Orthanc core (must be above 1.1.0): " << version; 186 LOG(WARNING) << "Version of the Orthanc core (must be above 1.3.1): " << version;
187 187
188 // Stone is only compatible with Orthanc >= 1.1.0, otherwise deadlocks might occur 188 // Stone is only compatible with Orthanc >= 1.3.1
189 if (major < 1 || 189 if (major < 1 ||
190 (major == 1 && minor < 1)) 190 (major == 1 && minor < 3) ||
191 (major == 1 && minor == 3 && patch < 1))
191 { 192 {
192 return false; 193 return false;
193 } 194 }
194 195
195 try 196 try
435 AddTag(target, source, Orthanc::DICOM_TAG_PLANAR_CONFIGURATION); 436 AddTag(target, source, Orthanc::DICOM_TAG_PLANAR_CONFIGURATION);
436 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_INTERCEPT); 437 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_INTERCEPT);
437 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_SLOPE); 438 AddTag(target, source, Orthanc::DICOM_TAG_RESCALE_SLOPE);
438 AddTag(target, source, Orthanc::DICOM_TAG_ROWS); 439 AddTag(target, source, Orthanc::DICOM_TAG_ROWS);
439 AddTag(target, source, Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL); 440 AddTag(target, source, Orthanc::DICOM_TAG_SAMPLES_PER_PIXEL);
441 AddTag(target, source, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID);
440 AddTag(target, source, Orthanc::DICOM_TAG_SLICE_THICKNESS); 442 AddTag(target, source, Orthanc::DICOM_TAG_SLICE_THICKNESS);
441 AddTag(target, source, Orthanc::DICOM_TAG_SOP_CLASS_UID); 443 AddTag(target, source, Orthanc::DICOM_TAG_SOP_CLASS_UID);
444 AddTag(target, source, Orthanc::DICOM_TAG_SOP_INSTANCE_UID);
442 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_CENTER); 445 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_CENTER);
443 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_WIDTH); 446 AddTag(target, source, Orthanc::DICOM_TAG_WINDOW_WIDTH);
444 } 447 }
445 } 448 }
446 } 449 }