Mercurial > hg > orthanc
annotate Core/JobsEngine/JobInfo.cpp @ 2589:a3fdfb6979ed jobs
getting rid of ReusableDicomConnection in REST API
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 15 May 2018 16:10:03 +0200 |
parents | 3372c5255333 |
children | 7b72061157b1 |
rev | line source |
---|---|
2569 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium | |
6 * | |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU General Public License as | |
9 * published by the Free Software Foundation, either version 3 of the | |
10 * License, or (at your option) any later version. | |
11 * | |
12 * In addition, as a special exception, the copyright holders of this | |
13 * program give permission to link the code of its release with the | |
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
15 * that use the same license as the "OpenSSL" library), and distribute | |
16 * the linked executables. You must obey the GNU General Public License | |
17 * in all respects for all of the code used other than "OpenSSL". If you | |
18 * modify file(s) with this exception, you may extend this exception to | |
19 * your version of the file(s), but you are not obligated to do so. If | |
20 * you do not wish to do so, delete this exception statement from your | |
21 * version. If you delete this exception statement from all source files | |
22 * in the program, then also delete it here. | |
23 * | |
24 * This program is distributed in the hope that it will be useful, but | |
25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
27 * General Public License for more details. | |
28 * | |
29 * You should have received a copy of the GNU General Public License | |
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
31 **/ | |
32 | |
33 | |
34 #include "../PrecompiledHeaders.h" | |
35 #include "JobInfo.h" | |
36 | |
37 #include "../OrthancException.h" | |
38 | |
39 namespace Orthanc | |
40 { | |
41 JobInfo::JobInfo(const std::string& id, | |
42 int priority, | |
43 JobState state, | |
44 const JobStatus& status, | |
45 const boost::posix_time::ptime& creationTime, | |
46 const boost::posix_time::ptime& lastStateChangeTime, | |
47 const boost::posix_time::time_duration& runtime) : | |
48 id_(id), | |
49 priority_(priority), | |
50 state_(state), | |
51 timestamp_(boost::posix_time::microsec_clock::universal_time()), | |
52 creationTime_(creationTime), | |
53 lastStateChangeTime_(lastStateChangeTime), | |
54 runtime_(runtime), | |
55 hasEta_(false), | |
56 status_(status) | |
57 { | |
58 if (state_ == JobState_Running) | |
59 { | |
60 float ms = static_cast<float>(runtime_.total_milliseconds()); | |
61 | |
62 if (status_.GetProgress() > 0.01f && | |
63 ms > 0.01f) | |
64 { | |
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
65 float ratio = static_cast<float>(1.0 - status_.GetProgress()); |
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
66 long long remaining = boost::math::llround(ratio * ms); |
2569 | 67 eta_ = timestamp_ + boost::posix_time::milliseconds(remaining); |
68 hasEta_ = true; | |
69 } | |
70 } | |
71 } | |
72 | |
73 | |
74 JobInfo::JobInfo() : | |
75 priority_(0), | |
76 state_(JobState_Failure), | |
77 timestamp_(boost::posix_time::microsec_clock::universal_time()), | |
78 creationTime_(timestamp_), | |
79 lastStateChangeTime_(timestamp_), | |
80 runtime_(boost::posix_time::milliseconds(0)), | |
81 hasEta_(false) | |
82 { | |
83 } | |
84 | |
85 | |
86 bool JobInfo::HasCompletionTime() const | |
87 { | |
88 return (state_ == JobState_Success || | |
89 state_ == JobState_Failure); | |
90 } | |
91 | |
92 | |
93 const boost::posix_time::ptime& JobInfo::GetEstimatedTimeOfArrival() const | |
94 { | |
95 if (hasEta_) | |
96 { | |
97 return eta_; | |
98 } | |
99 else | |
100 { | |
101 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
102 } | |
103 } | |
104 | |
105 | |
106 const boost::posix_time::ptime& JobInfo::GetCompletionTime() const | |
107 { | |
108 if (HasCompletionTime()) | |
109 { | |
110 return lastStateChangeTime_; | |
111 } | |
112 else | |
113 { | |
114 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
115 } | |
116 } | |
117 | |
118 | |
2589
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
119 void JobInfo::Serialize(Json::Value& target, |
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
120 bool includeInternalContent) const |
2569 | 121 { |
122 target = Json::objectValue; | |
123 target["ID"] = id_; | |
124 target["Priority"] = priority_; | |
125 target["ErrorCode"] = static_cast<int>(status_.GetErrorCode()); | |
126 target["ErrorDescription"] = EnumerationToString(status_.GetErrorCode()); | |
127 target["State"] = EnumerationToString(state_); | |
128 target["Timestamp"] = boost::posix_time::to_iso_string(timestamp_); | |
129 target["CreationTime"] = boost::posix_time::to_iso_string(creationTime_); | |
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
130 target["EffectiveRuntime"] = static_cast<double>(runtime_.total_milliseconds()) / 1000.0; |
2569 | 131 target["Progress"] = boost::math::iround(status_.GetProgress() * 100.0f); |
2573
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
132 |
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
133 target["Type"] = status_.GetJobType(); |
3372c5255333
StoreScuJob, Orthanc Explorer for jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2569
diff
changeset
|
134 target["PublicContent"] = status_.GetPublicContent(); |
2589
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
135 |
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
136 if (includeInternalContent) |
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
137 { |
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
138 target["InternalContent"] = status_.GetInternalContent(); |
a3fdfb6979ed
getting rid of ReusableDicomConnection in REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2573
diff
changeset
|
139 } |
2569 | 140 |
141 if (HasEstimatedTimeOfArrival()) | |
142 { | |
143 target["EstimatedTimeOfArrival"] = boost::posix_time::to_iso_string(GetEstimatedTimeOfArrival()); | |
144 } | |
145 | |
146 if (HasCompletionTime()) | |
147 { | |
148 target["CompletionTime"] = boost::posix_time::to_iso_string(GetCompletionTime()); | |
149 } | |
150 } | |
151 } |