comparison Plugins/Engine/OrthancPlugins.cpp @ 1817:9a6de24209cf worklists

integration mainline->worklists
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Nov 2015 13:45:55 +0100
parents 8e5600e699c0 2abfdca9b915
children 580951a33583
comparison
equal deleted inserted replaced
1812:8e5600e699c0 1817:9a6de24209cf
427 sizeof(int32_t) != sizeof(OrthancPluginValueRepresentation) || 427 sizeof(int32_t) != sizeof(OrthancPluginValueRepresentation) ||
428 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFlags) || 428 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFlags) ||
429 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFormat) || 429 sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFormat) ||
430 sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) || 430 sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) ||
431 sizeof(int32_t) != sizeof(OrthancPluginIdentifierConstraint) || 431 sizeof(int32_t) != sizeof(OrthancPluginIdentifierConstraint) ||
432 sizeof(int32_t) != sizeof(OrthancPluginInstanceOrigin) ||
432 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeBinary) != static_cast<int>(DicomToJsonFlags_IncludeBinary) || 433 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeBinary) != static_cast<int>(DicomToJsonFlags_IncludeBinary) ||
433 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePrivateTags) != static_cast<int>(DicomToJsonFlags_IncludePrivateTags) || 434 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePrivateTags) != static_cast<int>(DicomToJsonFlags_IncludePrivateTags) ||
434 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeUnknownTags) != static_cast<int>(DicomToJsonFlags_IncludeUnknownTags) || 435 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludeUnknownTags) != static_cast<int>(DicomToJsonFlags_IncludeUnknownTags) ||
435 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePixelData) != static_cast<int>(DicomToJsonFlags_IncludePixelData) || 436 static_cast<int>(OrthancPluginDicomToJsonFlags_IncludePixelData) != static_cast<int>(DicomToJsonFlags_IncludePixelData) ||
436 static_cast<int>(OrthancPluginDicomToJsonFlags_ConvertBinaryToNull) != static_cast<int>(DicomToJsonFlags_ConvertBinaryToNull) || 437 static_cast<int>(OrthancPluginDicomToJsonFlags_ConvertBinaryToNull) != static_cast<int>(DicomToJsonFlags_ConvertBinaryToNull) ||
1156 1157
1157 *p.resultStringToFree = CopyString(s); 1158 *p.resultStringToFree = CopyString(s);
1158 return; 1159 return;
1159 } 1160 }
1160 1161
1162 case _OrthancPluginService_GetInstanceOrigin: // New in Orthanc 0.9.5
1163 *p.resultOrigin = Plugins::Convert(instance.GetRequestOrigin());
1164 return;
1165
1161 default: 1166 default:
1162 throw OrthancException(ErrorCode_InternalError); 1167 throw OrthancException(ErrorCode_InternalError);
1163 } 1168 }
1164 } 1169 }
1165 1170
1595 case _OrthancPluginService_GetInstanceData: 1600 case _OrthancPluginService_GetInstanceData:
1596 case _OrthancPluginService_GetInstanceJson: 1601 case _OrthancPluginService_GetInstanceJson:
1597 case _OrthancPluginService_GetInstanceSimplifiedJson: 1602 case _OrthancPluginService_GetInstanceSimplifiedJson:
1598 case _OrthancPluginService_HasInstanceMetadata: 1603 case _OrthancPluginService_HasInstanceMetadata:
1599 case _OrthancPluginService_GetInstanceMetadata: 1604 case _OrthancPluginService_GetInstanceMetadata:
1605 case _OrthancPluginService_GetInstanceOrigin:
1600 AccessDicomInstance(service, parameters); 1606 AccessDicomInstance(service, parameters);
1601 return true; 1607 return true;
1602 1608
1603 case _OrthancPluginService_RegisterStorageArea: 1609 case _OrthancPluginService_RegisterStorageArea:
1604 { 1610 {