Mercurial > hg > orthanc
diff OrthancServer/Scheduler/ModifyInstanceCommand.cpp @ 1698:d78b87f93bcf
DicomModification use Json::Value
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 09 Oct 2015 12:29:21 +0200 |
parents | 0a2ad4a6858f |
children | b1291df2f780 |
line wrap: on
line diff
--- a/OrthancServer/Scheduler/ModifyInstanceCommand.cpp Thu Oct 08 14:52:03 2015 +0200 +++ b/OrthancServer/Scheduler/ModifyInstanceCommand.cpp Fri Oct 09 12:29:21 2015 +0200 @@ -39,28 +39,28 @@ { ModifyInstanceCommand::ModifyInstanceCommand(ServerContext& context, RequestOrigin origin, - const DicomModification& modification) : + DicomModification* modification) : context_(context), origin_(origin), modification_(modification) { - modification_.SetAllowManualIdentifiers(true); + modification_->SetAllowManualIdentifiers(true); - if (modification_.IsReplaced(DICOM_TAG_PATIENT_ID)) + if (modification_->IsReplaced(DICOM_TAG_PATIENT_ID)) { - modification_.SetLevel(ResourceType_Patient); + modification_->SetLevel(ResourceType_Patient); } - else if (modification_.IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID)) + else if (modification_->IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID)) { - modification_.SetLevel(ResourceType_Study); + modification_->SetLevel(ResourceType_Study); } - else if (modification_.IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID)) + else if (modification_->IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID)) { - modification_.SetLevel(ResourceType_Series); + modification_->SetLevel(ResourceType_Series); } else { - modification_.SetLevel(ResourceType_Instance); + modification_->SetLevel(ResourceType_Instance); } if (origin_ != RequestOrigin_Lua) @@ -71,6 +71,15 @@ } + ModifyInstanceCommand::~ModifyInstanceCommand() + { + if (modification_) + { + delete modification_; + } + } + + bool ModifyInstanceCommand::Apply(ListOfStrings& outputs, const ListOfStrings& inputs) { @@ -88,7 +97,7 @@ modified.reset(lock.GetDicom().Clone()); } - modification_.Apply(*modified); + modification_->Apply(*modified); DicomInstanceToStore toStore; assert(origin_ == RequestOrigin_Lua);