Mercurial > hg > orthanc
comparison Plugins/Engine/PluginsJob.cpp @ 2812:ea7aea6f6a95
improved naming of methods in IJob
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 06 Sep 2018 16:23:40 +0200 |
parents | 7cfc8d266f41 |
children | 7d1d3136f6cf |
comparison
equal
deleted
inserted
replaced
2811:7cfc8d266f41 | 2812:ea7aea6f6a95 |
---|---|
49 PluginsJob::PluginsJob(const _OrthancPluginSubmitJob& parameters) : | 49 PluginsJob::PluginsJob(const _OrthancPluginSubmitJob& parameters) : |
50 job_(parameters.job_), | 50 job_(parameters.job_), |
51 free_(parameters.free_), | 51 free_(parameters.free_), |
52 getProgress_(parameters.getProgress_), | 52 getProgress_(parameters.getProgress_), |
53 step_(parameters.step_), | 53 step_(parameters.step_), |
54 releaseResources_(parameters.releaseResources_), | 54 stop_(parameters.stop_), |
55 reset_(parameters.reset_) | 55 reset_(parameters.reset_) |
56 { | 56 { |
57 if (job_ == NULL || | 57 if (job_ == NULL || |
58 parameters.type_ == NULL || | 58 parameters.type_ == NULL || |
59 free_ == NULL || | 59 free_ == NULL || |
60 getProgress_ == NULL || | 60 getProgress_ == NULL || |
61 step_ == NULL || | 61 step_ == NULL || |
62 releaseResources_ == NULL || | 62 stop_ == NULL || |
63 reset_ == NULL) | 63 reset_ == NULL) |
64 { | 64 { |
65 throw OrthancException(ErrorCode_NullPointer); | 65 throw OrthancException(ErrorCode_NullPointer); |
66 } | 66 } |
67 | 67 |
106 { | 106 { |
107 assert(job_ != NULL); | 107 assert(job_ != NULL); |
108 free_(job_); | 108 free_(job_); |
109 } | 109 } |
110 | 110 |
111 JobStepResult PluginsJob::ExecuteStep() | 111 JobStepResult PluginsJob::Step() |
112 { | 112 { |
113 OrthancPluginJobStepStatus status = step_(job_); | 113 OrthancPluginJobStepStatus status = step_(job_); |
114 | 114 |
115 switch (status) | 115 switch (status) |
116 { | 116 { |
126 default: | 126 default: |
127 throw OrthancException(ErrorCode_ParameterOutOfRange); | 127 throw OrthancException(ErrorCode_ParameterOutOfRange); |
128 } | 128 } |
129 } | 129 } |
130 | 130 |
131 void PluginsJob::SignalResubmit() | 131 void PluginsJob::Reset() |
132 { | 132 { |
133 reset_(job_); | 133 reset_(job_); |
134 } | 134 } |
135 | 135 |
136 void PluginsJob::ReleaseResources(JobReleaseReason reason) | 136 void PluginsJob::Stop(JobStopReason reason) |
137 { | 137 { |
138 switch (reason) | 138 switch (reason) |
139 { | 139 { |
140 case JobReleaseReason_Success: | 140 case JobStopReason_Success: |
141 releaseResources_(job_, OrthancPluginJobReleaseReason_Success); | 141 stop_(job_, OrthancPluginJobStopReason_Success); |
142 break; | 142 break; |
143 | 143 |
144 case JobReleaseReason_Failure: | 144 case JobStopReason_Failure: |
145 releaseResources_(job_, OrthancPluginJobReleaseReason_Failure); | 145 stop_(job_, OrthancPluginJobStopReason_Failure); |
146 break; | 146 break; |
147 | 147 |
148 case JobReleaseReason_Canceled: | 148 case JobStopReason_Canceled: |
149 releaseResources_(job_, OrthancPluginJobReleaseReason_Canceled); | 149 stop_(job_, OrthancPluginJobStopReason_Canceled); |
150 break; | 150 break; |
151 | 151 |
152 case JobReleaseReason_Paused: | 152 case JobStopReason_Paused: |
153 releaseResources_(job_, OrthancPluginJobReleaseReason_Paused); | 153 stop_(job_, OrthancPluginJobStopReason_Paused); |
154 break; | 154 break; |
155 | 155 |
156 default: | 156 default: |
157 throw OrthancException(ErrorCode_ParameterOutOfRange); | 157 throw OrthancException(ErrorCode_ParameterOutOfRange); |
158 } | 158 } |