Mercurial > hg > orthanc
comparison Core/DicomNetworking/DicomUserConnection.cpp @ 3561:bdafff1ce443
C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 07 Nov 2019 10:38:46 +0100 |
parents | cf31b5bacce3 |
children | 05872838ebf3 94f4a18a79cc |
comparison
equal
deleted
inserted
replaced
3560:28ab86c6730e | 3561:bdafff1ce443 |
---|---|
701 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES"); | 701 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES"); |
702 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel; | 702 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel; |
703 break; | 703 break; |
704 | 704 |
705 case ResourceType_Instance: | 705 case ResourceType_Instance: |
706 clevel = "INSTANCE"; | 706 clevel = "IMAGE"; |
707 if (manufacturer_ == ModalityManufacturer_ClearCanvas || | 707 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE"); |
708 manufacturer_ == ModalityManufacturer_Dcm4Chee || | |
709 manufacturer_ == ModalityManufacturer_GE) | |
710 { | |
711 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>. | |
712 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J | |
713 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx | |
714 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE"); | |
715 clevel = "IMAGE"; | |
716 } | |
717 else | |
718 { | |
719 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "INSTANCE"); | |
720 } | |
721 | |
722 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel; | 708 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel; |
723 break; | 709 break; |
724 | 710 |
725 default: | 711 default: |
726 throw OrthancException(ErrorCode_ParameterOutOfRange); | 712 throw OrthancException(ErrorCode_ParameterOutOfRange); |
806 case ResourceType_Series: | 792 case ResourceType_Series: |
807 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES"); | 793 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES"); |
808 break; | 794 break; |
809 | 795 |
810 case ResourceType_Instance: | 796 case ResourceType_Instance: |
811 if (manufacturer_ == ModalityManufacturer_ClearCanvas || | 797 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE"); |
812 manufacturer_ == ModalityManufacturer_Dcm4Chee || | |
813 manufacturer_ == ModalityManufacturer_GE) | |
814 { | |
815 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>. | |
816 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J | |
817 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx | |
818 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE"); | |
819 } | |
820 else | |
821 { | |
822 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "INSTANCE"); | |
823 } | |
824 break; | 798 break; |
825 | 799 |
826 default: | 800 default: |
827 throw OrthancException(ErrorCode_ParameterOutOfRange); | 801 throw OrthancException(ErrorCode_ParameterOutOfRange); |
828 } | 802 } |