diff --git a/VERSION b/VERSION index 23cfcb10a..6e754a78e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1509 \ No newline at end of file +1.36.1510 \ No newline at end of file diff --git a/imageprocess/CMakeLists.txt b/imageprocess/CMakeLists.txt index 0bbe2ebd0..00f64d7af 100644 --- a/imageprocess/CMakeLists.txt +++ b/imageprocess/CMakeLists.txt @@ -59,6 +59,8 @@ set(imageprocess_public_header_model include/alibabacloud/imageprocess/model/ScreenChestCTResult.h include/alibabacloud/imageprocess/model/ScreenECRequest.h include/alibabacloud/imageprocess/model/ScreenECResult.h + include/alibabacloud/imageprocess/model/SegmentLymphNodeRequest.h + include/alibabacloud/imageprocess/model/SegmentLymphNodeResult.h include/alibabacloud/imageprocess/model/SegmentOARRequest.h include/alibabacloud/imageprocess/model/SegmentOARResult.h include/alibabacloud/imageprocess/model/TargetVolumeSegmentRequest.h @@ -106,6 +108,8 @@ set(imageprocess_src src/model/ScreenChestCTResult.cc src/model/ScreenECRequest.cc src/model/ScreenECResult.cc + src/model/SegmentLymphNodeRequest.cc + src/model/SegmentLymphNodeResult.cc src/model/SegmentOARRequest.cc src/model/SegmentOARResult.cc src/model/TargetVolumeSegmentRequest.cc diff --git a/imageprocess/include/alibabacloud/imageprocess/ImageprocessClient.h b/imageprocess/include/alibabacloud/imageprocess/ImageprocessClient.h index c735bd8cc..005482bed 100644 --- a/imageprocess/include/alibabacloud/imageprocess/ImageprocessClient.h +++ b/imageprocess/include/alibabacloud/imageprocess/ImageprocessClient.h @@ -60,6 +60,8 @@ #include "model/ScreenChestCTResult.h" #include "model/ScreenECRequest.h" #include "model/ScreenECResult.h" +#include "model/SegmentLymphNodeRequest.h" +#include "model/SegmentLymphNodeResult.h" #include "model/SegmentOARRequest.h" #include "model/SegmentOARResult.h" #include "model/TargetVolumeSegmentRequest.h" @@ -132,6 +134,9 @@ namespace AlibabaCloud typedef Outcome ScreenECOutcome; typedef std::future ScreenECOutcomeCallable; typedef std::function&)> ScreenECAsyncHandler; + typedef Outcome SegmentLymphNodeOutcome; + typedef std::future SegmentLymphNodeOutcomeCallable; + typedef std::function&)> SegmentLymphNodeAsyncHandler; typedef Outcome SegmentOAROutcome; typedef std::future SegmentOAROutcomeCallable; typedef std::function&)> SegmentOARAsyncHandler; @@ -203,6 +208,9 @@ namespace AlibabaCloud ScreenECOutcome screenEC(const Model::ScreenECRequest &request)const; void screenECAsync(const Model::ScreenECRequest& request, const ScreenECAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ScreenECOutcomeCallable screenECCallable(const Model::ScreenECRequest& request) const; + SegmentLymphNodeOutcome segmentLymphNode(const Model::SegmentLymphNodeRequest &request)const; + void segmentLymphNodeAsync(const Model::SegmentLymphNodeRequest& request, const SegmentLymphNodeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + SegmentLymphNodeOutcomeCallable segmentLymphNodeCallable(const Model::SegmentLymphNodeRequest& request) const; SegmentOAROutcome segmentOAR(const Model::SegmentOARRequest &request)const; void segmentOARAsync(const Model::SegmentOARRequest& request, const SegmentOARAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; SegmentOAROutcomeCallable segmentOARCallable(const Model::SegmentOARRequest& request) const; diff --git a/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeRequest.h b/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeRequest.h new file mode 100644 index 000000000..cc0a6c118 --- /dev/null +++ b/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeRequest.h @@ -0,0 +1,60 @@ +/* + * 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_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODEREQUEST_H_ +#define ALIBABACLOUD_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODEREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Imageprocess { +namespace Model { +class ALIBABACLOUD_IMAGEPROCESS_EXPORT SegmentLymphNodeRequest : public RpcServiceRequest { +public: + struct URLList { + std::string uRL; + }; + SegmentLymphNodeRequest(); + ~SegmentLymphNodeRequest(); + std::string getOrgName() const; + void setOrgName(const std::string &orgName); + std::string getBodyPart() const; + void setBodyPart(const std::string &bodyPart); + 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); + +private: + std::string orgName_; + std::string bodyPart_; + std::string dataFormat_; + std::vector uRLList_; + std::string orgId_; + bool async_; +}; +} // namespace Model +} // namespace Imageprocess +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODEREQUEST_H_ diff --git a/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeResult.h b/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeResult.h new file mode 100644 index 000000000..b192c22e9 --- /dev/null +++ b/imageprocess/include/alibabacloud/imageprocess/model/SegmentLymphNodeResult.h @@ -0,0 +1,59 @@ +/* + * 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_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODERESULT_H_ +#define ALIBABACLOUD_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Imageprocess + { + namespace Model + { + class ALIBABACLOUD_IMAGEPROCESS_EXPORT SegmentLymphNodeResult : public ServiceResult + { + public: + struct Data + { + std::string resultURL; + }; + + + SegmentLymphNodeResult(); + explicit SegmentLymphNodeResult(const std::string &payload); + ~SegmentLymphNodeResult(); + std::string getMessage()const; + Data getData()const; + std::string getCode()const; + + protected: + void parse(const std::string &payload); + private: + std::string message_; + Data data_; + std::string code_; + + }; + } + } +} +#endif // !ALIBABACLOUD_IMAGEPROCESS_MODEL_SEGMENTLYMPHNODERESULT_H_ \ No newline at end of file diff --git a/imageprocess/src/ImageprocessClient.cc b/imageprocess/src/ImageprocessClient.cc index 9ecb3ed86..de395ce3b 100644 --- a/imageprocess/src/ImageprocessClient.cc +++ b/imageprocess/src/ImageprocessClient.cc @@ -735,6 +735,42 @@ ImageprocessClient::ScreenECOutcomeCallable ImageprocessClient::screenECCallable return task->get_future(); } +ImageprocessClient::SegmentLymphNodeOutcome ImageprocessClient::segmentLymphNode(const SegmentLymphNodeRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return SegmentLymphNodeOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return SegmentLymphNodeOutcome(SegmentLymphNodeResult(outcome.result())); + else + return SegmentLymphNodeOutcome(outcome.error()); +} + +void ImageprocessClient::segmentLymphNodeAsync(const SegmentLymphNodeRequest& request, const SegmentLymphNodeAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, segmentLymphNode(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ImageprocessClient::SegmentLymphNodeOutcomeCallable ImageprocessClient::segmentLymphNodeCallable(const SegmentLymphNodeRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->segmentLymphNode(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ImageprocessClient::SegmentOAROutcome ImageprocessClient::segmentOAR(const SegmentOARRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/imageprocess/src/model/SegmentLymphNodeRequest.cc b/imageprocess/src/model/SegmentLymphNodeRequest.cc new file mode 100644 index 000000000..74c8e383a --- /dev/null +++ b/imageprocess/src/model/SegmentLymphNodeRequest.cc @@ -0,0 +1,85 @@ +/* + * 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::Imageprocess::Model::SegmentLymphNodeRequest; + +SegmentLymphNodeRequest::SegmentLymphNodeRequest() + : RpcServiceRequest("imageprocess", "2020-03-20", "SegmentLymphNode") { + setMethod(HttpRequest::Method::Post); +} + +SegmentLymphNodeRequest::~SegmentLymphNodeRequest() {} + +std::string SegmentLymphNodeRequest::getOrgName() const { + return orgName_; +} + +void SegmentLymphNodeRequest::setOrgName(const std::string &orgName) { + orgName_ = orgName; + setBodyParameter(std::string("OrgName"), orgName); +} + +std::string SegmentLymphNodeRequest::getBodyPart() const { + return bodyPart_; +} + +void SegmentLymphNodeRequest::setBodyPart(const std::string &bodyPart) { + bodyPart_ = bodyPart; + setBodyParameter(std::string("BodyPart"), bodyPart); +} + +std::string SegmentLymphNodeRequest::getDataFormat() const { + return dataFormat_; +} + +void SegmentLymphNodeRequest::setDataFormat(const std::string &dataFormat) { + dataFormat_ = dataFormat; + setBodyParameter(std::string("DataFormat"), dataFormat); +} + +std::vector SegmentLymphNodeRequest::getURLList() const { + return uRLList_; +} + +void SegmentLymphNodeRequest::setURLList(const std::vector &uRLList) { + uRLList_ = uRLList; + for(int dep1 = 0; dep1 != uRLList.size(); dep1++) { + auto uRLListObj = uRLList.at(dep1); + std::string uRLListObjStr = std::string("URLList") + "." + std::to_string(dep1 + 1); + setBodyParameter(uRLListObjStr + ".URL", uRLListObj.uRL); + } +} + +std::string SegmentLymphNodeRequest::getOrgId() const { + return orgId_; +} + +void SegmentLymphNodeRequest::setOrgId(const std::string &orgId) { + orgId_ = orgId; + setBodyParameter(std::string("OrgId"), orgId); +} + +bool SegmentLymphNodeRequest::getAsync() const { + return async_; +} + +void SegmentLymphNodeRequest::setAsync(bool async) { + async_ = async; + setBodyParameter(std::string("Async"), async ? "true" : "false"); +} + diff --git a/imageprocess/src/model/SegmentLymphNodeResult.cc b/imageprocess/src/model/SegmentLymphNodeResult.cc new file mode 100644 index 000000000..14731431d --- /dev/null +++ b/imageprocess/src/model/SegmentLymphNodeResult.cc @@ -0,0 +1,66 @@ +/* + * 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 +#include + +using namespace AlibabaCloud::Imageprocess; +using namespace AlibabaCloud::Imageprocess::Model; + +SegmentLymphNodeResult::SegmentLymphNodeResult() : + ServiceResult() +{} + +SegmentLymphNodeResult::SegmentLymphNodeResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +SegmentLymphNodeResult::~SegmentLymphNodeResult() +{} + +void SegmentLymphNodeResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto dataNode = value["Data"]; + if(!dataNode["ResultURL"].isNull()) + data_.resultURL = dataNode["ResultURL"].asString(); + if(!value["Code"].isNull()) + code_ = value["Code"].asString(); + if(!value["Message"].isNull()) + message_ = value["Message"].asString(); + +} + +std::string SegmentLymphNodeResult::getMessage()const +{ + return message_; +} + +SegmentLymphNodeResult::Data SegmentLymphNodeResult::getData()const +{ + return data_; +} + +std::string SegmentLymphNodeResult::getCode()const +{ + return code_; +} +