From 675df848bacfd51270fa821e26730fe8806dd368 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Thu, 10 Nov 2022 09:00:50 +0000 Subject: [PATCH] Update imageaudit. --- VERSION | 2 +- .../imageaudit/model/ScanImageRequest.h | 90 +++++++++--------- .../imageaudit/model/ScanImageResult.h | 26 +++--- .../imageaudit/model/ScanTextRequest.h | 89 ++++++++---------- imageaudit/src/model/ScanImageRequest.cc | 75 +++++++-------- imageaudit/src/model/ScanImageResult.cc | 92 +++++++++---------- imageaudit/src/model/ScanTextRequest.cc | 74 +++++++-------- imageaudit/src/model/ScanTextResult.cc | 4 +- 8 files changed, 210 insertions(+), 242 deletions(-) diff --git a/VERSION b/VERSION index 6a125f716..50f89b414 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1332 \ No newline at end of file +1.36.1333 \ No newline at end of file diff --git a/imageaudit/include/alibabacloud/imageaudit/model/ScanImageRequest.h b/imageaudit/include/alibabacloud/imageaudit/model/ScanImageRequest.h index 1ea329e09..f4220edfb 100644 --- a/imageaudit/include/alibabacloud/imageaudit/model/ScanImageRequest.h +++ b/imageaudit/include/alibabacloud/imageaudit/model/ScanImageRequest.h @@ -1,60 +1,52 @@ /* * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - -#ifndef ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ -#define ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Imageaudit - { - namespace Model - { - class ALIBABACLOUD_IMAGEAUDIT_EXPORT ScanImageRequest : public RpcServiceRequest - { - public: - struct Task - { - std::string dataId; - std::string imageURL; - int maxFrames; - int interval; - long imageTimeMillisecond; - }; - - public: - ScanImageRequest(); - ~ScanImageRequest(); - - std::vector getScene()const; - void setScene(const std::vector& scene); - std::vector getTask()const; - void setTask(const std::vector& task); - - private: - std::vector scene_; - std::vector task_; - - }; - } - } -} -#endif // !ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ \ No newline at end of file + */ + +#ifndef ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ +#define ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Imageaudit { +namespace Model { +class ALIBABACLOUD_IMAGEAUDIT_EXPORT ScanImageRequest : public RpcServiceRequest { +public: + struct Task { + std::string dataId; + std::string imageURL; + int maxFrames; + int interval; + long imageTimeMillisecond; + }; + ScanImageRequest(); + ~ScanImageRequest(); + std::vector getScene() const; + void setScene(const std::vector &scene); + std::vector getTask() const; + void setTask(const std::vector &task); + +private: + std::vector scene_; + std::vector task_; +}; +} // namespace Model +} // namespace Imageaudit +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANIMAGEREQUEST_H_ diff --git a/imageaudit/include/alibabacloud/imageaudit/model/ScanImageResult.h b/imageaudit/include/alibabacloud/imageaudit/model/ScanImageResult.h index dd5e4ebb4..5c8fda60e 100644 --- a/imageaudit/include/alibabacloud/imageaudit/model/ScanImageResult.h +++ b/imageaudit/include/alibabacloud/imageaudit/model/ScanImageResult.h @@ -38,11 +38,6 @@ namespace AlibabaCloud { struct SubResult { - struct Frame - { - float rate; - std::string uRL; - }; struct SfaceData { struct Face @@ -61,6 +56,18 @@ namespace AlibabaCloud { std::string context; }; + struct ProgramCodeData + { + float x; + float y; + float height; + float width; + }; + struct Frame + { + float rate; + std::string uRL; + }; struct LogoData { std::string type; @@ -70,13 +77,6 @@ namespace AlibabaCloud float width; std::string name; }; - struct ProgramCodeData - { - float x; - float y; - float height; - float width; - }; std::vector frames; std::string suggestion; std::vector sfaceDataList; @@ -88,8 +88,8 @@ namespace AlibabaCloud std::string scene; std::vector programCodeDataList; }; - std::string taskId; std::string dataId; + std::string taskId; std::string imageURL; std::vector subResults; }; diff --git a/imageaudit/include/alibabacloud/imageaudit/model/ScanTextRequest.h b/imageaudit/include/alibabacloud/imageaudit/model/ScanTextRequest.h index e3a65d22b..bb93f2e92 100644 --- a/imageaudit/include/alibabacloud/imageaudit/model/ScanTextRequest.h +++ b/imageaudit/include/alibabacloud/imageaudit/model/ScanTextRequest.h @@ -1,60 +1,51 @@ /* * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - -#ifndef ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ -#define ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Imageaudit - { - namespace Model - { - class ALIBABACLOUD_IMAGEAUDIT_EXPORT ScanTextRequest : public RpcServiceRequest - { - public: - struct Labels - { - std::string label; - }; - struct Tasks - { - std::string content; - }; - - public: - ScanTextRequest(); - ~ScanTextRequest(); - - std::vector getLabels()const; - void setLabels(const std::vector& labels); - std::vector getTasks()const; - void setTasks(const std::vector& tasks); - - private: - std::vector labels_; - std::vector tasks_; - - }; - } - } -} -#endif // !ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ \ No newline at end of file + */ + +#ifndef ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ +#define ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Imageaudit { +namespace Model { +class ALIBABACLOUD_IMAGEAUDIT_EXPORT ScanTextRequest : public RpcServiceRequest { +public: + struct Labels { + std::string label; + }; + struct Tasks { + std::string content; + }; + ScanTextRequest(); + ~ScanTextRequest(); + std::vector getLabels() const; + void setLabels(const std::vector &labels); + std::vector getTasks() const; + void setTasks(const std::vector &tasks); + +private: + std::vector labels_; + std::vector tasks_; +}; +} // namespace Model +} // namespace Imageaudit +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_IMAGEAUDIT_MODEL_SCANTEXTREQUEST_H_ diff --git a/imageaudit/src/model/ScanImageRequest.cc b/imageaudit/src/model/ScanImageRequest.cc index 5c3b4d548..c13b064f0 100644 --- a/imageaudit/src/model/ScanImageRequest.cc +++ b/imageaudit/src/model/ScanImageRequest.cc @@ -1,61 +1,52 @@ /* * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - -#include - -using AlibabaCloud::Imageaudit::Model::ScanImageRequest; - -ScanImageRequest::ScanImageRequest() : - RpcServiceRequest("imageaudit", "2019-12-30", "ScanImage") -{ - setMethod(HttpRequest::Method::Post); -} - -ScanImageRequest::~ScanImageRequest() -{} - -std::vector ScanImageRequest::getScene()const -{ - return scene_; + */ + +#include + +using AlibabaCloud::Imageaudit::Model::ScanImageRequest; + +ScanImageRequest::ScanImageRequest() + : RpcServiceRequest("imageaudit", "2019-12-30", "ScanImage") { + setMethod(HttpRequest::Method::Post); } -void ScanImageRequest::setScene(const std::vector& scene) -{ - scene_ = scene; - for(int dep1 = 0; dep1!= scene.size(); dep1++) { - setBodyParameter("Scene."+ std::to_string(dep1), scene.at(dep1)); - } +ScanImageRequest::~ScanImageRequest() {} + +std::vector ScanImageRequest::getScene() const { + return scene_; } -std::vector ScanImageRequest::getTask()const -{ - return task_; +void ScanImageRequest::setScene(const std::vector &scene) { + scene_ = scene; } -void ScanImageRequest::setTask(const std::vector& task) -{ - task_ = task; - for(int dep1 = 0; dep1!= task.size(); dep1++) { - auto taskObj = task.at(dep1); - std::string taskObjStr = "Task." + std::to_string(dep1 + 1); - setParameter(taskObjStr + ".DataId", taskObj.dataId); - setParameter(taskObjStr + ".ImageURL", taskObj.imageURL); - setParameter(taskObjStr + ".MaxFrames", std::to_string(taskObj.maxFrames)); - setParameter(taskObjStr + ".Interval", std::to_string(taskObj.interval)); - setParameter(taskObjStr + ".ImageTimeMillisecond", std::to_string(taskObj.imageTimeMillisecond)); - } +std::vector ScanImageRequest::getTask() const { + return task_; +} + +void ScanImageRequest::setTask(const std::vector &task) { + task_ = task; + for(int dep1 = 0; dep1 != task.size(); dep1++) { + auto taskObj = task.at(dep1); + std::string taskObjStr = std::string("Task") + "." + std::to_string(dep1 + 1); + setBodyParameter(taskObjStr + ".DataId", taskObj.dataId); + setBodyParameter(taskObjStr + ".ImageURL", taskObj.imageURL); + setBodyParameter(taskObjStr + ".MaxFrames", std::to_string(taskObj.maxFrames)); + setBodyParameter(taskObjStr + ".Interval", std::to_string(taskObj.interval)); + setBodyParameter(taskObjStr + ".ImageTimeMillisecond", std::to_string(taskObj.imageTimeMillisecond)); + } } diff --git a/imageaudit/src/model/ScanImageResult.cc b/imageaudit/src/model/ScanImageResult.cc index c300f61aa..00a6053ac 100644 --- a/imageaudit/src/model/ScanImageResult.cc +++ b/imageaudit/src/model/ScanImageResult.cc @@ -44,56 +44,46 @@ void ScanImageResult::parse(const std::string &payload) for (auto dataNodeResultsResult : allResultsNode) { Data::Result resultObject; - if(!dataNodeResultsResult["TaskId"].isNull()) - resultObject.taskId = dataNodeResultsResult["TaskId"].asString(); - if(!dataNodeResultsResult["DataId"].isNull()) - resultObject.dataId = dataNodeResultsResult["DataId"].asString(); if(!dataNodeResultsResult["ImageURL"].isNull()) resultObject.imageURL = dataNodeResultsResult["ImageURL"].asString(); + if(!dataNodeResultsResult["DataId"].isNull()) + resultObject.dataId = dataNodeResultsResult["DataId"].asString(); + if(!dataNodeResultsResult["TaskId"].isNull()) + resultObject.taskId = dataNodeResultsResult["TaskId"].asString(); auto allSubResultsNode = dataNodeResultsResult["SubResults"]["SubResult"]; for (auto dataNodeResultsResultSubResultsSubResult : allSubResultsNode) { Data::Result::SubResult subResultsObject; if(!dataNodeResultsResultSubResultsSubResult["Suggestion"].isNull()) subResultsObject.suggestion = dataNodeResultsResultSubResultsSubResult["Suggestion"].asString(); - if(!dataNodeResultsResultSubResultsSubResult["Rate"].isNull()) - subResultsObject.rate = std::stof(dataNodeResultsResultSubResultsSubResult["Rate"].asString()); if(!dataNodeResultsResultSubResultsSubResult["Label"].isNull()) subResultsObject.label = dataNodeResultsResultSubResultsSubResult["Label"].asString(); if(!dataNodeResultsResultSubResultsSubResult["Scene"].isNull()) subResultsObject.scene = dataNodeResultsResultSubResultsSubResult["Scene"].asString(); - auto allFramesNode = dataNodeResultsResultSubResultsSubResult["Frames"]["Frame"]; - for (auto dataNodeResultsResultSubResultsSubResultFramesFrame : allFramesNode) - { - Data::Result::SubResult::Frame framesObject; - if(!dataNodeResultsResultSubResultsSubResultFramesFrame["Rate"].isNull()) - framesObject.rate = std::stof(dataNodeResultsResultSubResultsSubResultFramesFrame["Rate"].asString()); - if(!dataNodeResultsResultSubResultsSubResultFramesFrame["URL"].isNull()) - framesObject.uRL = dataNodeResultsResultSubResultsSubResultFramesFrame["URL"].asString(); - subResultsObject.frames.push_back(framesObject); - } + if(!dataNodeResultsResultSubResultsSubResult["Rate"].isNull()) + subResultsObject.rate = std::stof(dataNodeResultsResultSubResultsSubResult["Rate"].asString()); auto allSfaceDataListNode = dataNodeResultsResultSubResultsSubResult["SfaceDataList"]["SfaceData"]; for (auto dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData : allSfaceDataListNode) { Data::Result::SubResult::SfaceData sfaceDataListObject; - if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["X"].isNull()) - sfaceDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["X"].asString()); - if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Y"].isNull()) - sfaceDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Y"].asString()); - if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Height"].isNull()) - sfaceDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Height"].asString()); if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Width"].isNull()) sfaceDataListObject.width = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Width"].asString()); + if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Height"].isNull()) + sfaceDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Height"].asString()); + if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Y"].isNull()) + sfaceDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Y"].asString()); + if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["X"].isNull()) + sfaceDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["X"].asString()); auto allFacesNode = dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceData["Faces"]["Face"]; for (auto dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace : allFacesNode) { Data::Result::SubResult::SfaceData::Face facesObject; - if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Rate"].isNull()) - facesObject.rate = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Rate"].asString()); - if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Id"].isNull()) - facesObject.id = dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Id"].asString(); if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Name"].isNull()) facesObject.name = dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Name"].asString(); + if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Id"].isNull()) + facesObject.id = dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Id"].asString(); + if(!dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Rate"].isNull()) + facesObject.rate = std::stof(dataNodeResultsResultSubResultsSubResultSfaceDataListSfaceDataFacesFace["Rate"].asString()); sfaceDataListObject.faces.push_back(facesObject); } subResultsObject.sfaceDataList.push_back(sfaceDataListObject); @@ -106,38 +96,48 @@ void ScanImageResult::parse(const std::string &payload) hintWordsInfoListObject.context = dataNodeResultsResultSubResultsSubResultHintWordsInfoListHintWordsInfo["Context"].asString(); subResultsObject.hintWordsInfoList.push_back(hintWordsInfoListObject); } + auto allProgramCodeDataListNode = dataNodeResultsResultSubResultsSubResult["ProgramCodeDataList"]["ProgramCodeData"]; + for (auto dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData : allProgramCodeDataListNode) + { + Data::Result::SubResult::ProgramCodeData programCodeDataListObject; + if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Width"].isNull()) + programCodeDataListObject.width = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Width"].asString()); + if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Height"].isNull()) + programCodeDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Height"].asString()); + if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Y"].isNull()) + programCodeDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Y"].asString()); + if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["X"].isNull()) + programCodeDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["X"].asString()); + subResultsObject.programCodeDataList.push_back(programCodeDataListObject); + } + auto allFramesNode = dataNodeResultsResultSubResultsSubResult["Frames"]["Frame"]; + for (auto dataNodeResultsResultSubResultsSubResultFramesFrame : allFramesNode) + { + Data::Result::SubResult::Frame framesObject; + if(!dataNodeResultsResultSubResultsSubResultFramesFrame["URL"].isNull()) + framesObject.uRL = dataNodeResultsResultSubResultsSubResultFramesFrame["URL"].asString(); + if(!dataNodeResultsResultSubResultsSubResultFramesFrame["Rate"].isNull()) + framesObject.rate = std::stof(dataNodeResultsResultSubResultsSubResultFramesFrame["Rate"].asString()); + subResultsObject.frames.push_back(framesObject); + } auto allLogoDataListNode = dataNodeResultsResultSubResultsSubResult["LogoDataList"]["LogoData"]; for (auto dataNodeResultsResultSubResultsSubResultLogoDataListLogoData : allLogoDataListNode) { Data::Result::SubResult::LogoData logoDataListObject; if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Type"].isNull()) logoDataListObject.type = dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Type"].asString(); - if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["X"].isNull()) - logoDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["X"].asString()); - if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Y"].isNull()) - logoDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Y"].asString()); - if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Height"].isNull()) - logoDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Height"].asString()); if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Width"].isNull()) logoDataListObject.width = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Width"].asString()); + if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Height"].isNull()) + logoDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Height"].asString()); + if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Y"].isNull()) + logoDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Y"].asString()); if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Name"].isNull()) logoDataListObject.name = dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["Name"].asString(); + if(!dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["X"].isNull()) + logoDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultLogoDataListLogoData["X"].asString()); subResultsObject.logoDataList.push_back(logoDataListObject); } - auto allProgramCodeDataListNode = dataNodeResultsResultSubResultsSubResult["ProgramCodeDataList"]["ProgramCodeData"]; - for (auto dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData : allProgramCodeDataListNode) - { - Data::Result::SubResult::ProgramCodeData programCodeDataListObject; - if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["X"].isNull()) - programCodeDataListObject.x = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["X"].asString()); - if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Y"].isNull()) - programCodeDataListObject.y = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Y"].asString()); - if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Height"].isNull()) - programCodeDataListObject.height = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Height"].asString()); - if(!dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Width"].isNull()) - programCodeDataListObject.width = std::stof(dataNodeResultsResultSubResultsSubResultProgramCodeDataListProgramCodeData["Width"].asString()); - subResultsObject.programCodeDataList.push_back(programCodeDataListObject); - } auto allOCRDataList = value["OCRDataList"]["OCRData"]; for (auto value : allOCRDataList) subResultsObject.oCRDataList.push_back(value.asString()); diff --git a/imageaudit/src/model/ScanTextRequest.cc b/imageaudit/src/model/ScanTextRequest.cc index 614746bb0..60901899d 100644 --- a/imageaudit/src/model/ScanTextRequest.cc +++ b/imageaudit/src/model/ScanTextRequest.cc @@ -1,59 +1,53 @@ /* * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ - -#include - -using AlibabaCloud::Imageaudit::Model::ScanTextRequest; - -ScanTextRequest::ScanTextRequest() : - RpcServiceRequest("imageaudit", "2019-12-30", "ScanText") -{ - setMethod(HttpRequest::Method::Post); -} - -ScanTextRequest::~ScanTextRequest() -{} - -std::vector ScanTextRequest::getLabels()const -{ - return labels_; + */ + +#include + +using AlibabaCloud::Imageaudit::Model::ScanTextRequest; + +ScanTextRequest::ScanTextRequest() + : RpcServiceRequest("imageaudit", "2019-12-30", "ScanText") { + setMethod(HttpRequest::Method::Post); } -void ScanTextRequest::setLabels(const std::vector& labels) -{ - labels_ = labels; - for(int dep1 = 0; dep1!= labels.size(); dep1++) { - auto labelsObj = labels.at(dep1); - std::string labelsObjStr = "Labels." + std::to_string(dep1 + 1); - setParameter(labelsObjStr + ".Label", labelsObj.label); - } +ScanTextRequest::~ScanTextRequest() {} + +std::vector ScanTextRequest::getLabels() const { + return labels_; } -std::vector ScanTextRequest::getTasks()const -{ - return tasks_; +void ScanTextRequest::setLabels(const std::vector &labels) { + labels_ = labels; + for(int dep1 = 0; dep1 != labels.size(); dep1++) { + auto labelsObj = labels.at(dep1); + std::string labelsObjStr = std::string("Labels") + "." + std::to_string(dep1 + 1); + setBodyParameter(labelsObjStr + ".Label", labelsObj.label); + } } -void ScanTextRequest::setTasks(const std::vector& tasks) -{ - tasks_ = tasks; - for(int dep1 = 0; dep1!= tasks.size(); dep1++) { - auto tasksObj = tasks.at(dep1); - std::string tasksObjStr = "Tasks." + std::to_string(dep1 + 1); - setParameter(tasksObjStr + ".Content", tasksObj.content); - } +std::vector ScanTextRequest::getTasks() const { + return tasks_; +} + +void ScanTextRequest::setTasks(const std::vector &tasks) { + tasks_ = tasks; + for(int dep1 = 0; dep1 != tasks.size(); dep1++) { + auto tasksObj = tasks.at(dep1); + std::string tasksObjStr = std::string("Tasks") + "." + std::to_string(dep1 + 1); + setBodyParameter(tasksObjStr + ".Content", tasksObj.content); + } } diff --git a/imageaudit/src/model/ScanTextResult.cc b/imageaudit/src/model/ScanTextResult.cc index e06a95365..71dc85e7c 100644 --- a/imageaudit/src/model/ScanTextResult.cc +++ b/imageaudit/src/model/ScanTextResult.cc @@ -52,10 +52,10 @@ void ScanTextResult::parse(const std::string &payload) Data::Element::Result resultsObject; if(!dataNodeElementsElementResultsResult["Suggestion"].isNull()) resultsObject.suggestion = dataNodeElementsElementResultsResult["Suggestion"].asString(); - if(!dataNodeElementsElementResultsResult["Rate"].isNull()) - resultsObject.rate = std::stof(dataNodeElementsElementResultsResult["Rate"].asString()); if(!dataNodeElementsElementResultsResult["Label"].isNull()) resultsObject.label = dataNodeElementsElementResultsResult["Label"].asString(); + if(!dataNodeElementsElementResultsResult["Rate"].isNull()) + resultsObject.rate = std::stof(dataNodeElementsElementResultsResult["Rate"].asString()); auto allDetailsNode = dataNodeElementsElementResultsResult["Details"]["Detail"]; for (auto dataNodeElementsElementResultsResultDetailsDetail : allDetailsNode) {