Sfoglia il codice sorgente

Update DetectLungNodule.

sdk-team 5 anni fa
parent
commit
193b07c609

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-01-06 Version: patch
+- Update DetectLungNodule.
+
 2021-01-06 Version: patch
 - Support input parameter ClientToken for CreateAutoProvisioningGroup.
 

+ 3 - 0
imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleRequest.h

@@ -42,6 +42,8 @@ namespace AlibabaCloud
 
 				std::string getDataFormat()const;
 				void setDataFormat(const std::string& dataFormat);
+				float getThreshold()const;
+				void setThreshold(float threshold);
 				std::vector<URLList> getURLList()const;
 				void setURLList(const std::vector<URLList>& uRLList);
 				std::string getOrgId()const;
@@ -53,6 +55,7 @@ namespace AlibabaCloud
 
             private:
 				std::string dataFormat_;
+				float threshold_;
 				std::vector<URLList> uRLList_;
 				std::string orgId_;
 				bool async_;

+ 2 - 2
imageprocess/include/alibabacloud/imageprocess/model/DetectLungNoduleResult.h

@@ -40,13 +40,13 @@ namespace AlibabaCloud
 						{
 							float imageZ;
 							float imageY;
-							std::string lobe;
 							float imageX;
+							std::string lobe;
 							std::string category;
 							std::string lung;
 							float meanValue;
-							float confidence;
 							float volume;
+							float confidence;
 							float x;
 							float y;
 							float z;

+ 11 - 0
imageprocess/src/model/DetectLungNoduleRequest.cc

@@ -38,6 +38,17 @@ void DetectLungNoduleRequest::setDataFormat(const std::string& dataFormat)
 	setBodyParameter("DataFormat", dataFormat);
 }
 
+float DetectLungNoduleRequest::getThreshold()const
+{
+	return threshold_;
+}
+
+void DetectLungNoduleRequest::setThreshold(float threshold)
+{
+	threshold_ = threshold;
+	setBodyParameter("Threshold", std::to_string(threshold));
+}
+
 std::vector<DetectLungNoduleRequest::URLList> DetectLungNoduleRequest::getURLList()const
 {
 	return uRLList_;

+ 20 - 20
imageprocess/src/model/DetectLungNoduleResult.cc

@@ -44,42 +44,42 @@ void DetectLungNoduleResult::parse(const std::string &payload)
 	for (auto dataNodeSeriesSerie : allSeriesNode)
 	{
 		Data::Serie serieObject;
-		if(!dataNodeSeriesSerie["SeriesInstanceUid"].isNull())
-			serieObject.seriesInstanceUid = dataNodeSeriesSerie["SeriesInstanceUid"].asString();
 		if(!dataNodeSeriesSerie["Report"].isNull())
 			serieObject.report = dataNodeSeriesSerie["Report"].asString();
+		if(!dataNodeSeriesSerie["SeriesInstanceUid"].isNull())
+			serieObject.seriesInstanceUid = dataNodeSeriesSerie["SeriesInstanceUid"].asString();
 		auto allElementsNode = dataNodeSeriesSerie["Elements"]["Element"];
 		for (auto dataNodeSeriesSerieElementsElement : allElementsNode)
 		{
 			Data::Serie::Element elementsObject;
-			if(!dataNodeSeriesSerieElementsElement["Category"].isNull())
-				elementsObject.category = dataNodeSeriesSerieElementsElement["Category"].asString();
-			if(!dataNodeSeriesSerieElementsElement["Confidence"].isNull())
-				elementsObject.confidence = std::stof(dataNodeSeriesSerieElementsElement["Confidence"].asString());
-			if(!dataNodeSeriesSerieElementsElement["Diameter"].isNull())
-				elementsObject.diameter = std::stof(dataNodeSeriesSerieElementsElement["Diameter"].asString());
+			if(!dataNodeSeriesSerieElementsElement["ImageZ"].isNull())
+				elementsObject.imageZ = std::stof(dataNodeSeriesSerieElementsElement["ImageZ"].asString());
+			if(!dataNodeSeriesSerieElementsElement["ImageY"].isNull())
+				elementsObject.imageY = std::stof(dataNodeSeriesSerieElementsElement["ImageY"].asString());
+			if(!dataNodeSeriesSerieElementsElement["ImageX"].isNull())
+				elementsObject.imageX = std::stof(dataNodeSeriesSerieElementsElement["ImageX"].asString());
 			if(!dataNodeSeriesSerieElementsElement["Lobe"].isNull())
 				elementsObject.lobe = dataNodeSeriesSerieElementsElement["Lobe"].asString();
+			if(!dataNodeSeriesSerieElementsElement["Category"].isNull())
+				elementsObject.category = dataNodeSeriesSerieElementsElement["Category"].asString();
 			if(!dataNodeSeriesSerieElementsElement["Lung"].isNull())
 				elementsObject.lung = dataNodeSeriesSerieElementsElement["Lung"].asString();
+			if(!dataNodeSeriesSerieElementsElement["MeanValue"].isNull())
+				elementsObject.meanValue = std::stof(dataNodeSeriesSerieElementsElement["MeanValue"].asString());
+			if(!dataNodeSeriesSerieElementsElement["Volume"].isNull())
+				elementsObject.volume = std::stof(dataNodeSeriesSerieElementsElement["Volume"].asString());
+			if(!dataNodeSeriesSerieElementsElement["Confidence"].isNull())
+				elementsObject.confidence = std::stof(dataNodeSeriesSerieElementsElement["Confidence"].asString());
 			if(!dataNodeSeriesSerieElementsElement["X"].isNull())
 				elementsObject.x = std::stof(dataNodeSeriesSerieElementsElement["X"].asString());
-			if(!dataNodeSeriesSerieElementsElement["Z"].isNull())
-				elementsObject.z = std::stof(dataNodeSeriesSerieElementsElement["Z"].asString());
 			if(!dataNodeSeriesSerieElementsElement["Y"].isNull())
 				elementsObject.y = std::stof(dataNodeSeriesSerieElementsElement["Y"].asString());
-			if(!dataNodeSeriesSerieElementsElement["ImageX"].isNull())
-				elementsObject.imageX = std::stof(dataNodeSeriesSerieElementsElement["ImageX"].asString());
-			if(!dataNodeSeriesSerieElementsElement["ImageY"].isNull())
-				elementsObject.imageY = std::stof(dataNodeSeriesSerieElementsElement["ImageY"].asString());
-			if(!dataNodeSeriesSerieElementsElement["ImageZ"].isNull())
-				elementsObject.imageZ = std::stof(dataNodeSeriesSerieElementsElement["ImageZ"].asString());
+			if(!dataNodeSeriesSerieElementsElement["Z"].isNull())
+				elementsObject.z = std::stof(dataNodeSeriesSerieElementsElement["Z"].asString());
 			if(!dataNodeSeriesSerieElementsElement["SOPInstanceUID"].isNull())
 				elementsObject.sOPInstanceUID = dataNodeSeriesSerieElementsElement["SOPInstanceUID"].asString();
-			if(!dataNodeSeriesSerieElementsElement["Volume"].isNull())
-				elementsObject.volume = std::stof(dataNodeSeriesSerieElementsElement["Volume"].asString());
-			if(!dataNodeSeriesSerieElementsElement["MeanValue"].isNull())
-				elementsObject.meanValue = std::stof(dataNodeSeriesSerieElementsElement["MeanValue"].asString());
+			if(!dataNodeSeriesSerieElementsElement["Diameter"].isNull())
+				elementsObject.diameter = std::stof(dataNodeSeriesSerieElementsElement["Diameter"].asString());
 			serieObject.elements.push_back(elementsObject);
 		}
 		auto allOrigin = value["Origin"]["Origin"];