Mercurial > hg > orthanc
comparison Plugins/Samples/ModalityWorklists/Plugin.cpp @ 1810:796d0b087fb8 worklists
more consistent naming in worklist primitives
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 23 Nov 2015 17:09:27 +0100 |
parents | 9c2ffc4e938b |
children | 5fc11b79b406 |
comparison
equal
deleted
inserted
replaced
1809:5ed8769b17f9 | 1810:796d0b087fb8 |
---|---|
59 { | 59 { |
60 // Cannot read this file, ignore this error | 60 // Cannot read this file, ignore this error |
61 return OrthancPluginErrorCode_Success; | 61 return OrthancPluginErrorCode_Success; |
62 } | 62 } |
63 | 63 |
64 if (OrthancPluginIsWorklistMatch(context_, query, dicom.c_str(), dicom.size())) | 64 if (OrthancPluginWorklistIsMatch(context_, query, dicom.c_str(), dicom.size())) |
65 { | 65 { |
66 // This DICOM file matches the worklist query, add it to the answers | 66 // This DICOM file matches the worklist query, add it to the answers |
67 return OrthancPluginWorklistAddWorklistAnswer | 67 return OrthancPluginWorklistAddAnswer |
68 (context_, answers, query, dicom.c_str(), dicom.size()); | 68 (context_, answers, query, dicom.c_str(), dicom.size()); |
69 } | 69 } |
70 else | 70 else |
71 { | 71 { |
72 // This DICOM file does not match | 72 // This DICOM file does not match |
96 | 96 |
97 static bool GetQueryDicom(Json::Value& value, | 97 static bool GetQueryDicom(Json::Value& value, |
98 const OrthancPluginWorklistQuery* query) | 98 const OrthancPluginWorklistQuery* query) |
99 { | 99 { |
100 OrthancPluginMemoryBuffer dicom; | 100 OrthancPluginMemoryBuffer dicom; |
101 if (OrthancPluginGetWorklistQueryDicom(context_, &dicom, query)) | 101 if (OrthancPluginWorklistGetDicomQuery(context_, &dicom, query)) |
102 { | 102 { |
103 return false; | 103 return false; |
104 } | 104 } |
105 | 105 |
106 char* json = OrthancPluginDicomBufferToJson(context_, reinterpret_cast<const char*>(dicom.data), | 106 char* json = OrthancPluginDicomBufferToJson(context_, reinterpret_cast<const char*>(dicom.data), |