Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancInitialization.cpp @ 4944:f377d5643538 more-tags
new Warnings configuration + InstanceAvailability tag
author | Alain Mazy <am@osimis.io> |
---|---|
date | Thu, 17 Mar 2022 17:03:59 +0100 |
parents | 94a7b681b340 |
children | 877bc3b96476 |
comparison
equal
deleted
inserted
replaced
4941:96a3e81eba90 | 4944:f377d5643538 |
---|---|
250 | 250 |
251 for (Json::Value::ArrayIndex t = 0; t < content.size(); t++) | 251 for (Json::Value::ArrayIndex t = 0; t < content.size(); t++) |
252 { | 252 { |
253 const std::string& tagName = content[t].asString(); | 253 const std::string& tagName = content[t].asString(); |
254 DicomTag tag(FromDcmtkBridge::ParseTag(tagName)); | 254 DicomTag tag(FromDcmtkBridge::ParseTag(tagName)); |
255 DicomMap::AddMainDicomTag(tag, tagName, level); | 255 |
256 LOG(INFO) << " - " << tagName; | 256 if (DicomMap::IsComputedTag(tag)) |
257 { | |
258 LOG(WARNING) << " - " << tagName << " can not be added in the Extra Main Dicom Tags since the value of this tag is computed when requested"; | |
259 } | |
260 else | |
261 { | |
262 ValueRepresentation vr = FromDcmtkBridge::LookupValueRepresentation(tag); | |
263 if (vr == ValueRepresentation_Sequence) | |
264 { | |
265 LOG(WARNING) << " - " << tagName << " can not be added in the Extra Main Dicom Tags since it is a sequence"; | |
266 } | |
267 else | |
268 { | |
269 DicomMap::AddMainDicomTag(tag, tagName, level); | |
270 LOG(INFO) << " - " << tagName; | |
271 } | |
272 } | |
257 } | 273 } |
258 } | 274 } |
259 } | 275 } |
260 } | 276 } |
261 | 277 |
355 RegisterUserContentType(lock.GetJson()); | 371 RegisterUserContentType(lock.GetJson()); |
356 | 372 |
357 LoadExternalDictionaries(lock.GetJson()); // New in Orthanc 1.9.4 | 373 LoadExternalDictionaries(lock.GetJson()); // New in Orthanc 1.9.4 |
358 LoadCustomDictionary(lock.GetJson()); | 374 LoadCustomDictionary(lock.GetJson()); |
359 | 375 |
376 lock.GetConfiguration().LoadWarnings(); | |
377 | |
360 LoadMainDicomTags(lock.GetJson()); // New in Orthanc 1.11.0 | 378 LoadMainDicomTags(lock.GetJson()); // New in Orthanc 1.11.0 |
361 | 379 |
362 lock.GetConfiguration().RegisterFont(ServerResources::FONT_UBUNTU_MONO_BOLD_16); | 380 lock.GetConfiguration().RegisterFont(ServerResources::FONT_UBUNTU_MONO_BOLD_16); |
363 | 381 |
364 #if HAVE_MALLOPT == 1 | 382 #if HAVE_MALLOPT == 1 |