Update ScreenChestCT DetectRibFracture.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-04-06 Version: 1.36.668
+- Update ScreenChestCT DetectRibFracture.
+
 2021-04-01 Version: 1.36.667
 - Add data service api, including ListAnalyticsData.
 - Update file uploading api, including GenerateFileUploadURL.

VERSION

@@ -1 +1 @@
-1.36.667
+1.36.668

imageprocess/include/alibabacloud/imageprocess/model/DetectHipKeypointXRayRequest.h

@@ -35,23 +35,23 @@ namespace AlibabaCloud
 				DetectHipKeypointXRayRequest();
 				~DetectHipKeypointXRayRequest();
 
+				std::string getOrgName()const;
+				void setOrgName(const std::string& orgName);
+				std::string getTracerId()const;
+				void setTracerId(const std::string& tracerId);
 				std::string getDataFormat()const;
 				void setDataFormat(const std::string& dataFormat);
 				std::string getOrgId()const;
 				void setOrgId(const std::string& orgId);
-				std::string getOrgName()const;
-				void setOrgName(const std::string& orgName);
 				std::string getImageUrl()const;
 				void setImageUrl(const std::string& imageUrl);
-				std::string getTracerId()const;
-				void setTracerId(const std::string& tracerId);
 
             private:
+				std::string orgName_;
+				std::string tracerId_;
 				std::string dataFormat_;
 				std::string orgId_;
-				std::string orgName_;
 				std::string imageUrl_;
-				std::string tracerId_;
 
 			};
 		}

imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h

@@ -40,26 +40,26 @@ namespace AlibabaCloud
 				DetectLungNoduleRequest();
 				~DetectLungNoduleRequest();
 
-				std::string getDataFormat()const;
-				void setDataFormat(const std::string& dataFormat);
 				float getThreshold()const;
 				void setThreshold(float threshold);
+				std::string getOrgName()const;
+				void setOrgName(const std::string& orgName);
+				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_;
 				float threshold_;
+				std::string orgName_;
+				std::string dataFormat_;
 				std::vector<URLList> uRLList_;
 				std::string orgId_;
 				bool async_;
-				std::string orgName_;
 
 			};
 		}

imageprocess/include/alibabacloud/imageprocess/model/DetectRibFractureRequest.h

@@ -40,6 +40,10 @@ namespace AlibabaCloud
 				DetectRibFractureRequest();
 				~DetectRibFractureRequest();
 
+				std::string getOrgName()const;
+				void setOrgName(const std::string& orgName);
+				std::string getSourceType()const;
+				void setSourceType(const std::string& sourceType);
 				std::string getDataFormat()const;
 				void setDataFormat(const std::string& dataFormat);
 				std::vector<URLList> getURLList()const;
@@ -48,18 +52,14 @@ namespace AlibabaCloud
 				void setOrgId(const std::string& orgId);
 				bool getAsync()const;
 				void setAsync(bool async);
-				std::string getOrgName()const;
-				void setOrgName(const std::string& orgName);
-				std::string getSourceType()const;
-				void setSourceType(const std::string& sourceType);
 
             private:
+				std::string orgName_;
+				std::string sourceType_;
 				std::string dataFormat_;
 				std::vector<URLList> uRLList_;
 				std::string orgId_;
 				bool async_;
-				std::string orgName_;
-				std::string sourceType_;
 
 			};
 		}

imageprocess/include/alibabacloud/imageprocess/model/DetectRibFractureResult.h

@@ -36,10 +36,12 @@ namespace AlibabaCloud
 				{
 					struct DetectionsItem
 					{
-						float fractureConfidence;
 						std::string fractureCategory;
+						float fractureConfidence;
 						std::vector<std::string> coordinateImage;
 						std::vector<std::string> coordinates;
+						std::string fractureLocation;
+						long fractureSegment;
 						int fractureId;
 					};
 					std::vector<std::string> origin;

imageprocess/include/alibabacloud/imageprocess/model/ScreenChestCTResult.h

@@ -84,6 +84,8 @@ namespace AlibabaCloud
 							float fractureConfidence;
 							std::vector<std::string> coordinateImage;
 							std::vector<std::string> coordinates;
+							std::string fractureLocation;
+							long fractureSegment;
 							long fractureId;
 						};
 						std::vector<std::string> origin1;

imageprocess/src/model/DetectHipKeypointXRayRequest.cc

@@ -27,6 +27,28 @@ DetectHipKeypointXRayRequest::DetectHipKeypointXRayRequest() :
 DetectHipKeypointXRayRequest::~DetectHipKeypointXRayRequest()
 {}
 
+std::string DetectHipKeypointXRayRequest::getOrgName()const
+{
+	return orgName_;
+}
+
+void DetectHipKeypointXRayRequest::setOrgName(const std::string& orgName)
+{
+	orgName_ = orgName;
+	setBodyParameter("OrgName", orgName);
+}
+
+std::string DetectHipKeypointXRayRequest::getTracerId()const
+{
+	return tracerId_;
+}
+
+void DetectHipKeypointXRayRequest::setTracerId(const std::string& tracerId)
+{
+	tracerId_ = tracerId;
+	setBodyParameter("TracerId", tracerId);
+}
+
 std::string DetectHipKeypointXRayRequest::getDataFormat()const
 {
 	return dataFormat_;
@@ -49,17 +71,6 @@ void DetectHipKeypointXRayRequest::setOrgId(const std::string& orgId)
 	setBodyParameter("OrgId", orgId);
 }
 
-std::string DetectHipKeypointXRayRequest::getOrgName()const
-{
-	return orgName_;
-}
-
-void DetectHipKeypointXRayRequest::setOrgName(const std::string& orgName)
-{
-	orgName_ = orgName;
-	setBodyParameter("OrgName", orgName);
-}
-
 std::string DetectHipKeypointXRayRequest::getImageUrl()const
 {
 	return imageUrl_;
@@ -71,14 +82,3 @@ void DetectHipKeypointXRayRequest::setImageUrl(const std::string& imageUrl)
 	setBodyParameter("ImageUrl", imageUrl);
 }
 
-std::string DetectHipKeypointXRayRequest::getTracerId()const
-{
-	return tracerId_;
-}
-
-void DetectHipKeypointXRayRequest::setTracerId(const std::string& tracerId)
-{
-	tracerId_ = tracerId;
-	setBodyParameter("TracerId", tracerId);
-}
-

imageprocess/src/model/DetectHipKeypointXRayResult.cc

@@ -40,10 +40,10 @@ void DetectHipKeypointXRayResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["ImageUrl"].isNull())
-		data_.imageUrl = dataNode["ImageUrl"].asString();
 	if(!dataNode["OrgId"].isNull())
 		data_.orgId = dataNode["OrgId"].asString();
+	if(!dataNode["ImageUrl"].isNull())
+		data_.imageUrl = dataNode["ImageUrl"].asString();
 	if(!dataNode["OrgName"].isNull())
 		data_.orgName = dataNode["OrgName"].asString();
 	auto allKeyPointsNode = dataNode["KeyPoints"]["KeyPointsItem"];
@@ -53,10 +53,10 @@ void DetectHipKeypointXRayResult::parse(const std::string &payload)
 		if(!dataNodeKeyPointsKeyPointsItem["Value"].isNull())
 			keyPointsItemObject.value = std::stof(dataNodeKeyPointsKeyPointsItem["Value"].asString());
 		auto tagNode = value["Tag"];
-		if(!tagNode["Direction"].isNull())
-			keyPointsItemObject.tag.direction = tagNode["Direction"].asString();
 		if(!tagNode["Label"].isNull())
 			keyPointsItemObject.tag.label = tagNode["Label"].asString();
+		if(!tagNode["Direction"].isNull())
+			keyPointsItemObject.tag.direction = tagNode["Direction"].asString();
 		auto allCoordinates = value["Coordinates"]["Coordinate"];
 		for (auto value : allCoordinates)
 			keyPointsItemObject.coordinates.push_back(value.asString());

imageprocess/src/model/DetectLungNoduleRequest.cc

@@ -27,26 +27,37 @@ DetectLungNoduleRequest::DetectLungNoduleRequest() :
 DetectLungNoduleRequest::~DetectLungNoduleRequest()
 {}
 
-std::string DetectLungNoduleRequest::getDataFormat()const
+float DetectLungNoduleRequest::getThreshold()const
 {
-	return dataFormat_;
+	return threshold_;
 }
 
-void DetectLungNoduleRequest::setDataFormat(const std::string& dataFormat)
+void DetectLungNoduleRequest::setThreshold(float threshold)
 {
-	dataFormat_ = dataFormat;
-	setBodyParameter("DataFormat", dataFormat);
+	threshold_ = threshold;
+	setBodyParameter("Threshold", std::to_string(threshold));
 }
 
-float DetectLungNoduleRequest::getThreshold()const
+std::string DetectLungNoduleRequest::getOrgName()const
 {
-	return threshold_;
+	return orgName_;
 }
 
-void DetectLungNoduleRequest::setThreshold(float threshold)
+void DetectLungNoduleRequest::setOrgName(const std::string& orgName)
 {
-	threshold_ = threshold;
-	setBodyParameter("Threshold", std::to_string(threshold));
+	orgName_ = orgName;
+	setBodyParameter("OrgName", orgName);
+}
+
+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
@@ -86,14 +97,3 @@ 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);
-}
-

imageprocess/src/model/DetectRibFractureRequest.cc

@@ -27,6 +27,28 @@ DetectRibFractureRequest::DetectRibFractureRequest() :
 DetectRibFractureRequest::~DetectRibFractureRequest()
 {}
 
+std::string DetectRibFractureRequest::getOrgName()const
+{
+	return orgName_;
+}
+
+void DetectRibFractureRequest::setOrgName(const std::string& orgName)
+{
+	orgName_ = orgName;
+	setBodyParameter("OrgName", orgName);
+}
+
+std::string DetectRibFractureRequest::getSourceType()const
+{
+	return sourceType_;
+}
+
+void DetectRibFractureRequest::setSourceType(const std::string& sourceType)
+{
+	sourceType_ = sourceType;
+	setBodyParameter("SourceType", sourceType);
+}
+
 std::string DetectRibFractureRequest::getDataFormat()const
 {
 	return dataFormat_;
@@ -75,25 +97,3 @@ void DetectRibFractureRequest::setAsync(bool async)
 	setBodyParameter("Async", async ? "true" : "false");
 }
 
-std::string DetectRibFractureRequest::getOrgName()const
-{
-	return orgName_;
-}
-
-void DetectRibFractureRequest::setOrgName(const std::string& orgName)
-{
-	orgName_ = orgName;
-	setBodyParameter("OrgName", orgName);
-}
-
-std::string DetectRibFractureRequest::getSourceType()const
-{
-	return sourceType_;
-}
-
-void DetectRibFractureRequest::setSourceType(const std::string& sourceType)
-{
-	sourceType_ = sourceType;
-	setBodyParameter("SourceType", sourceType);
-}
-

imageprocess/src/model/DetectRibFractureResult.cc

@@ -46,26 +46,30 @@ void DetectRibFractureResult::parse(const std::string &payload)
 	for (auto dataNodeDetectionsDetectionsItem : allDetectionsNode)
 	{
 		Data::DetectionsItem detectionsItemObject;
-		if(!dataNodeDetectionsDetectionsItem["FractureId"].isNull())
-			detectionsItemObject.fractureId = std::stoi(dataNodeDetectionsDetectionsItem["FractureId"].asString());
-		if(!dataNodeDetectionsDetectionsItem["FractureConfidence"].isNull())
-			detectionsItemObject.fractureConfidence = std::stof(dataNodeDetectionsDetectionsItem["FractureConfidence"].asString());
 		if(!dataNodeDetectionsDetectionsItem["FractureCategory"].isNull())
 			detectionsItemObject.fractureCategory = dataNodeDetectionsDetectionsItem["FractureCategory"].asString();
-		auto allCoordinates = value["Coordinates"]["Coordinates"];
-		for (auto value : allCoordinates)
-			detectionsItemObject.coordinates.push_back(value.asString());
+		if(!dataNodeDetectionsDetectionsItem["FractureConfidence"].isNull())
+			detectionsItemObject.fractureConfidence = std::stof(dataNodeDetectionsDetectionsItem["FractureConfidence"].asString());
+		if(!dataNodeDetectionsDetectionsItem["FractureLocation"].isNull())
+			detectionsItemObject.fractureLocation = dataNodeDetectionsDetectionsItem["FractureLocation"].asString();
+		if(!dataNodeDetectionsDetectionsItem["FractureSegment"].isNull())
+			detectionsItemObject.fractureSegment = std::stol(dataNodeDetectionsDetectionsItem["FractureSegment"].asString());
+		if(!dataNodeDetectionsDetectionsItem["FractureId"].isNull())
+			detectionsItemObject.fractureId = std::stoi(dataNodeDetectionsDetectionsItem["FractureId"].asString());
 		auto allCoordinateImage = value["CoordinateImage"]["CoordinateImage"];
 		for (auto value : allCoordinateImage)
 			detectionsItemObject.coordinateImage.push_back(value.asString());
+		auto allCoordinates = value["Coordinates"]["Coordinates"];
+		for (auto value : allCoordinates)
+			detectionsItemObject.coordinates.push_back(value.asString());
 		data_.detections.push_back(detectionsItemObject);
 	}
-		auto allSpacing = dataNode["Spacing"]["Spacing"];
-		for (auto value : allSpacing)
-			data_.spacing.push_back(value.asString());
 		auto allOrigin = dataNode["Origin"]["Origin"];
 		for (auto value : allOrigin)
 			data_.origin.push_back(value.asString());
+		auto allSpacing = dataNode["Spacing"]["Spacing"];
+		for (auto value : allSpacing)
+			data_.spacing.push_back(value.asString());
 
 }
 

imageprocess/src/model/ScreenChestCTResult.cc

@@ -118,6 +118,10 @@ void ScreenChestCTResult::parse(const std::string &payload)
 			detectionsItemObject.fractureCategory = std::stol(detectRibFractureNodeDetectionsDetectionsItem["FractureCategory"].asString());
 		if(!detectRibFractureNodeDetectionsDetectionsItem["FractureConfidence"].isNull())
 			detectionsItemObject.fractureConfidence = std::stof(detectRibFractureNodeDetectionsDetectionsItem["FractureConfidence"].asString());
+		if(!detectRibFractureNodeDetectionsDetectionsItem["FractureLocation"].isNull())
+			detectionsItemObject.fractureLocation = detectRibFractureNodeDetectionsDetectionsItem["FractureLocation"].asString();
+		if(!detectRibFractureNodeDetectionsDetectionsItem["FractureSegment"].isNull())
+			detectionsItemObject.fractureSegment = std::stol(detectRibFractureNodeDetectionsDetectionsItem["FractureSegment"].asString());
 		if(!detectRibFractureNodeDetectionsDetectionsItem["FractureId"].isNull())
 			detectionsItemObject.fractureId = std::stol(detectRibFractureNodeDetectionsDetectionsItem["FractureId"].asString());
 		auto allCoordinateImage = value["CoordinateImage"]["CoordinateImage"];