Browse Source

Update DetectLungNodule, DetectSpineMRI, DetectKneeXRay, DetectCovid19Cad.

sdk-team 6 years ago
parent
commit
7ac1c23a9f

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-09-18 Version: patch
+- Update DetectLungNodule, DetectSpineMRI, DetectKneeXRay, DetectCovid19Cad.
+
 2020-09-17 Version: patch
 - Add Api DetectIPCPedestrianOptimized.
 

+ 9 - 0
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<URLList> getURLList()const;
 				void setURLList(const std::vector<URLList>& 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> uRLList_;
+				std::string orgId_;
 				bool async_;
+				std::string orgName_;
 
 			};
 		}

+ 6 - 0
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_;
 
 			};
 		}

+ 9 - 0
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<URLList> getURLList()const;
 				void setURLList(const std::vector<URLList>& 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> uRLList_;
+				std::string orgId_;
 				bool async_;
+				std::string orgName_;
 
 			};
 		}

+ 5 - 0
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<std::string> origin;
+						std::vector<std::string> spacing;
 						std::vector<Serie::Element> elements;
 						std::string seriesInstanceUid;
 					};

+ 9 - 0
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<URLList> getURLList()const;
 				void setURLList(const std::vector<URLList>& 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> uRLList_;
+				std::string orgId_;
+				std::string orgName_;
 
 			};
 		}

+ 33 - 0
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::URLList> DetectCovid19CadRequest::getURLList()const
 {
 	return uRLList_;
@@ -42,6 +53,17 @@ void DetectCovid19CadRequest::setURLList(const std::vector<URLList>& 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);
+}
+

+ 22 - 0
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);
+}
+

+ 33 - 0
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::URLList> DetectLungNoduleRequest::getURLList()const
 {
 	return uRLList_;
@@ -42,6 +53,17 @@ void DetectLungNoduleRequest::setURLList(const std::vector<URLList>& 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);
+}
+

+ 12 - 0
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);
 	}
 

+ 33 - 0
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::URLList> DetectSpineMRIRequest::getURLList()const
 {
 	return uRLList_;
@@ -42,3 +53,25 @@ void DetectSpineMRIRequest::setURLList(const std::vector<URLList>& 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);
+}
+