From 7ac1c23a9fad777ac129c4d1ea2bf559a7b4d2da Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 18 Sep 2020 08:48:48 +0000 Subject: [PATCH] Update DetectLungNodule, DetectSpineMRI, DetectKneeXRay, DetectCovid19Cad. --- CHANGELOG | 3 ++ .../model/DetectCovid19CadRequest.h | 9 +++++ .../model/DetectKneeXRayRequest.h | 6 ++++ .../model/DetectLungNoduleRequest.h | 9 +++++ .../model/DetectLungNoduleResult.h | 5 +++ .../model/DetectSpineMRIRequest.h | 9 +++++ .../src/model/DetectCovid19CadRequest.cc | 33 +++++++++++++++++++ .../src/model/DetectKneeXRayRequest.cc | 22 +++++++++++++ .../src/model/DetectLungNoduleRequest.cc | 33 +++++++++++++++++++ .../src/model/DetectLungNoduleResult.cc | 12 +++++++ .../src/model/DetectSpineMRIRequest.cc | 33 +++++++++++++++++++ 11 files changed, 174 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 19a087c41..8d29e14d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-09-18 Version: patch +- Update DetectLungNodule, DetectSpineMRI, DetectKneeXRay, DetectCovid19Cad. + 2020-09-17 Version: patch - Add Api DetectIPCPedestrianOptimized. diff --git a/imageprocess/include/alibabacloud/imageprocess/model/DetectCovid19CadRequest.h b/imageprocess/include/alibabacloud/imageprocess/model/DetectCovid19CadRequest.h index 8cf1063b2..0159a1fa4 100644 --- a/imageprocess/include/alibabacloud/imageprocess/model/DetectCovid19CadRequest.h +++ b/imageprocess/include/alibabacloud/imageprocess/model/DetectCovid19CadRequest.h @@ -40,14 +40,23 @@ namespace AlibabaCloud DetectCovid19CadRequest(); ~DetectCovid19CadRequest(); + std::string getDataFormat()const; + void setDataFormat(const std::string& dataFormat); std::vector getURLList()const; void setURLList(const std::vector& uRLList); + std::string getOrgId()const; + void setOrgId(const std::string& orgId); bool getAsync()const; void setAsync(bool async); + std::string getOrgName()const; + void setOrgName(const std::string& orgName); private: + std::string dataFormat_; std::vector uRLList_; + std::string orgId_; bool async_; + std::string orgName_; }; } diff --git a/imageprocess/include/alibabacloud/imageprocess/model/DetectKneeXRayRequest.h b/imageprocess/include/alibabacloud/imageprocess/model/DetectKneeXRayRequest.h index 8bcfe64d8..9b4c1125d 100644 --- a/imageprocess/include/alibabacloud/imageprocess/model/DetectKneeXRayRequest.h +++ b/imageprocess/include/alibabacloud/imageprocess/model/DetectKneeXRayRequest.h @@ -39,10 +39,16 @@ namespace AlibabaCloud void setDataFormat(const std::string& dataFormat); std::string getUrl()const; void setUrl(const std::string& url); + std::string getOrgId()const; + void setOrgId(const std::string& orgId); + std::string getOrgName()const; + void setOrgName(const std::string& orgName); private: std::string dataFormat_; std::string url_; + std::string orgId_; + std::string orgName_; }; } diff --git a/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h b/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h index c6a5db806..12bef2801 100644 --- a/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h +++ b/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h @@ -40,14 +40,23 @@ namespace AlibabaCloud DetectLungNoduleRequest(); ~DetectLungNoduleRequest(); + std::string getDataFormat()const; + void setDataFormat(const std::string& dataFormat); std::vector getURLList()const; void setURLList(const std::vector& uRLList); + std::string getOrgId()const; + void setOrgId(const std::string& orgId); bool getAsync()const; void setAsync(bool async); + std::string getOrgName()const; + void setOrgName(const std::string& orgName); private: + std::string dataFormat_; std::vector uRLList_; + std::string orgId_; bool async_; + std::string orgName_; }; } diff --git a/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleResult.h b/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleResult.h index efd59baf6..c24ccb56f 100644 --- a/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleResult.h +++ b/imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleResult.h @@ -38,7 +38,10 @@ namespace AlibabaCloud { struct Element { + float imageZ; + float imageY; std::string lobe; + float imageX; std::string category; float confidence; std::string lung; @@ -47,6 +50,8 @@ namespace AlibabaCloud float z; float diameter; }; + std::vector origin; + std::vector spacing; std::vector elements; std::string seriesInstanceUid; }; diff --git a/imageprocess/include/alibabacloud/imageprocess/model/DetectSpineMRIRequest.h b/imageprocess/include/alibabacloud/imageprocess/model/DetectSpineMRIRequest.h index 44fa5e3bc..37c2233fd 100644 --- a/imageprocess/include/alibabacloud/imageprocess/model/DetectSpineMRIRequest.h +++ b/imageprocess/include/alibabacloud/imageprocess/model/DetectSpineMRIRequest.h @@ -40,11 +40,20 @@ namespace AlibabaCloud DetectSpineMRIRequest(); ~DetectSpineMRIRequest(); + std::string getDataFormat()const; + void setDataFormat(const std::string& dataFormat); std::vector getURLList()const; void setURLList(const std::vector& uRLList); + std::string getOrgId()const; + void setOrgId(const std::string& orgId); + std::string getOrgName()const; + void setOrgName(const std::string& orgName); private: + std::string dataFormat_; std::vector uRLList_; + std::string orgId_; + std::string orgName_; }; } diff --git a/imageprocess/src/model/DetectCovid19CadRequest.cc b/imageprocess/src/model/DetectCovid19CadRequest.cc index 7391f35da..33ea640d7 100644 --- a/imageprocess/src/model/DetectCovid19CadRequest.cc +++ b/imageprocess/src/model/DetectCovid19CadRequest.cc @@ -27,6 +27,17 @@ DetectCovid19CadRequest::DetectCovid19CadRequest() : DetectCovid19CadRequest::~DetectCovid19CadRequest() {} +std::string DetectCovid19CadRequest::getDataFormat()const +{ + return dataFormat_; +} + +void DetectCovid19CadRequest::setDataFormat(const std::string& dataFormat) +{ + dataFormat_ = dataFormat; + setBodyParameter("DataFormat", dataFormat); +} + std::vector DetectCovid19CadRequest::getURLList()const { return uRLList_; @@ -42,6 +53,17 @@ void DetectCovid19CadRequest::setURLList(const std::vector& uRLList) } } +std::string DetectCovid19CadRequest::getOrgId()const +{ + return orgId_; +} + +void DetectCovid19CadRequest::setOrgId(const std::string& orgId) +{ + orgId_ = orgId; + setBodyParameter("OrgId", orgId); +} + bool DetectCovid19CadRequest::getAsync()const { return async_; @@ -53,3 +75,14 @@ void DetectCovid19CadRequest::setAsync(bool async) setBodyParameter("Async", async ? "true" : "false"); } +std::string DetectCovid19CadRequest::getOrgName()const +{ + return orgName_; +} + +void DetectCovid19CadRequest::setOrgName(const std::string& orgName) +{ + orgName_ = orgName; + setBodyParameter("OrgName", orgName); +} + diff --git a/imageprocess/src/model/DetectKneeXRayRequest.cc b/imageprocess/src/model/DetectKneeXRayRequest.cc index 712f078f4..ff4f0fed0 100644 --- a/imageprocess/src/model/DetectKneeXRayRequest.cc +++ b/imageprocess/src/model/DetectKneeXRayRequest.cc @@ -49,3 +49,25 @@ void DetectKneeXRayRequest::setUrl(const std::string& url) setBodyParameter("Url", url); } +std::string DetectKneeXRayRequest::getOrgId()const +{ + return orgId_; +} + +void DetectKneeXRayRequest::setOrgId(const std::string& orgId) +{ + orgId_ = orgId; + setBodyParameter("OrgId", orgId); +} + +std::string DetectKneeXRayRequest::getOrgName()const +{ + return orgName_; +} + +void DetectKneeXRayRequest::setOrgName(const std::string& orgName) +{ + orgName_ = orgName; + setBodyParameter("OrgName", orgName); +} + diff --git a/imageprocess/src/model/DetectLungNoduleRequest.cc b/imageprocess/src/model/DetectLungNoduleRequest.cc index 64741db73..164337c4c 100644 --- a/imageprocess/src/model/DetectLungNoduleRequest.cc +++ b/imageprocess/src/model/DetectLungNoduleRequest.cc @@ -27,6 +27,17 @@ DetectLungNoduleRequest::DetectLungNoduleRequest() : DetectLungNoduleRequest::~DetectLungNoduleRequest() {} +std::string DetectLungNoduleRequest::getDataFormat()const +{ + return dataFormat_; +} + +void DetectLungNoduleRequest::setDataFormat(const std::string& dataFormat) +{ + dataFormat_ = dataFormat; + setBodyParameter("DataFormat", dataFormat); +} + std::vector DetectLungNoduleRequest::getURLList()const { return uRLList_; @@ -42,6 +53,17 @@ void DetectLungNoduleRequest::setURLList(const std::vector& uRLList) } } +std::string DetectLungNoduleRequest::getOrgId()const +{ + return orgId_; +} + +void DetectLungNoduleRequest::setOrgId(const std::string& orgId) +{ + orgId_ = orgId; + setBodyParameter("OrgId", orgId); +} + bool DetectLungNoduleRequest::getAsync()const { return async_; @@ -53,3 +75,14 @@ void DetectLungNoduleRequest::setAsync(bool async) setBodyParameter("Async", async ? "true" : "false"); } +std::string DetectLungNoduleRequest::getOrgName()const +{ + return orgName_; +} + +void DetectLungNoduleRequest::setOrgName(const std::string& orgName) +{ + orgName_ = orgName; + setBodyParameter("OrgName", orgName); +} + diff --git a/imageprocess/src/model/DetectLungNoduleResult.cc b/imageprocess/src/model/DetectLungNoduleResult.cc index 44a57600a..6d533d9d5 100644 --- a/imageprocess/src/model/DetectLungNoduleResult.cc +++ b/imageprocess/src/model/DetectLungNoduleResult.cc @@ -66,8 +66,20 @@ void DetectLungNoduleResult::parse(const std::string &payload) elementsObject.z = std::stof(allSeriesNodeElementsElement["Z"].asString()); if(!allSeriesNodeElementsElement["Y"].isNull()) elementsObject.y = std::stof(allSeriesNodeElementsElement["Y"].asString()); + if(!allSeriesNodeElementsElement["ImageX"].isNull()) + elementsObject.imageX = std::stof(allSeriesNodeElementsElement["ImageX"].asString()); + if(!allSeriesNodeElementsElement["ImageY"].isNull()) + elementsObject.imageY = std::stof(allSeriesNodeElementsElement["ImageY"].asString()); + if(!allSeriesNodeElementsElement["ImageZ"].isNull()) + elementsObject.imageZ = std::stof(allSeriesNodeElementsElement["ImageZ"].asString()); serieObject.elements.push_back(elementsObject); } + auto allOrigin = value["Origin"]["Origin"]; + for (auto value : allOrigin) + serieObject.origin.push_back(value.asString()); + auto allSpacing = value["Spacing"]["Spacing"]; + for (auto value : allSpacing) + serieObject.spacing.push_back(value.asString()); data_.series.push_back(serieObject); } diff --git a/imageprocess/src/model/DetectSpineMRIRequest.cc b/imageprocess/src/model/DetectSpineMRIRequest.cc index 44d5bbc21..1a8eff48b 100644 --- a/imageprocess/src/model/DetectSpineMRIRequest.cc +++ b/imageprocess/src/model/DetectSpineMRIRequest.cc @@ -27,6 +27,17 @@ DetectSpineMRIRequest::DetectSpineMRIRequest() : DetectSpineMRIRequest::~DetectSpineMRIRequest() {} +std::string DetectSpineMRIRequest::getDataFormat()const +{ + return dataFormat_; +} + +void DetectSpineMRIRequest::setDataFormat(const std::string& dataFormat) +{ + dataFormat_ = dataFormat; + setBodyParameter("DataFormat", dataFormat); +} + std::vector DetectSpineMRIRequest::getURLList()const { return uRLList_; @@ -42,3 +53,25 @@ void DetectSpineMRIRequest::setURLList(const std::vector& uRLList) } } +std::string DetectSpineMRIRequest::getOrgId()const +{ + return orgId_; +} + +void DetectSpineMRIRequest::setOrgId(const std::string& orgId) +{ + orgId_ = orgId; + setBodyParameter("OrgId", orgId); +} + +std::string DetectSpineMRIRequest::getOrgName()const +{ + return orgName_; +} + +void DetectSpineMRIRequest::setOrgName(const std::string& orgName) +{ + orgName_ = orgName; + setBodyParameter("OrgName", orgName); +} +