comparison OrthancStone/Samples/Common/RtViewerApp.cpp @ 1522:fa30f275cd80

Removed requirement for a non-empty RTDOSE
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 31 Jul 2020 17:06:11 +0200
parents 244ad1e4e76a
children 4e3d11755e9b
comparison
equal deleted inserted replaced
1521:bc4c50a53bd3 1522:fa30f275cd80
155 void RtViewerApp::StartLoaders() 155 void RtViewerApp::StartLoaders()
156 { 156 {
157 ORTHANC_ASSERT(HasArgument("ctseries") && HasArgument("rtdose") && HasArgument("rtstruct")); 157 ORTHANC_ASSERT(HasArgument("ctseries") && HasArgument("rtdose") && HasArgument("rtstruct"));
158 158
159 LOG(INFO) << "About to load:"; 159 LOG(INFO) << "About to load:";
160 LOG(INFO) << " CT : " << GetArgument("ctseries"); 160
161 LOG(INFO) << " RTDOSE : " << GetArgument("rtdose"); 161 if (GetArgument("ctseries") == "")
162 LOG(INFO) << " RTSTRUCT : " << GetArgument("rtstruct"); 162 {
163 ctLoader_->LoadSeries(GetArgument("ctseries")); 163 LOG(INFO) << " CT : <unspecified>";
164 doseLoader_->LoadInstance(GetArgument("rtdose")); 164 }
165 rtstructLoader_->LoadInstanceFullVisibility(GetArgument("rtstruct")); 165 else
166 {
167 LOG(INFO) << " CT : " << GetArgument("ctseries");
168 ctLoader_->LoadSeries(GetArgument("ctseries"));
169 }
170
171 if (GetArgument("rtdose") == "")
172 {
173 LOG(INFO) << " RTDOSE : <unspecified>";
174 }
175 else
176 {
177 LOG(INFO) << " RTDOSE : " << GetArgument("rtdose");
178 doseLoader_->LoadInstance(GetArgument("rtdose"));
179 }
180
181 if (GetArgument("rtstruct") == "")
182 {
183 LOG(INFO) << " RTSTRUCT : : <unspecified>";
184 }
185 else
186 {
187 LOG(INFO) << " RTSTRUCT : : " << GetArgument("rtstruct");
188 rtstructLoader_->LoadInstanceFullVisibility(GetArgument("rtstruct"));
189 }
166 } 190 }
167 191
168 void RtViewerApp::HandleGeometryReady(const DicomVolumeImage::GeometryReadyMessage& message) 192 void RtViewerApp::HandleGeometryReady(const DicomVolumeImage::GeometryReadyMessage& message)
169 { 193 {
170 for (size_t i = 0; i < views_.size(); ++i) 194 for (size_t i = 0; i < views_.size(); ++i)