comparison Applications/Samples/SimpleViewer/SimpleViewerApplication.cpp @ 388:20f149669c1f

renamed LayerWidget as SliceViewerWidget
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Nov 2018 17:26:39 +0100
parents 8eb4fe74000f
children e7a494bdd956
comparison
equal deleted inserted replaced
387:a8b5cf760473 388:20f149669c1f
52 thumbnailsLayout_->SetPadding(10); 52 thumbnailsLayout_->SetPadding(10);
53 thumbnailsLayout_->SetBackgroundCleared(true); 53 thumbnailsLayout_->SetBackgroundCleared(true);
54 thumbnailsLayout_->SetBackgroundColor(50, 50, 50); 54 thumbnailsLayout_->SetBackgroundColor(50, 50, 50);
55 thumbnailsLayout_->SetVertical(); 55 thumbnailsLayout_->SetVertical();
56 56
57 mainWidget_ = new LayerWidget(IObserver::broker_, "main-viewport"); 57 mainWidget_ = new SliceViewerWidget(IObserver::broker_, "main-viewport");
58 //mainWidget_->RegisterObserver(*this); 58 //mainWidget_->RegisterObserver(*this);
59 59
60 // hierarchy 60 // hierarchy
61 mainLayout_->AddWidget(thumbnailsLayout_); 61 mainLayout_->AddWidget(thumbnailsLayout_);
62 mainLayout_->AddWidget(mainWidget_); 62 mainLayout_->AddWidget(mainWidget_);
150 } 150 }
151 151
152 void SimpleViewerApplication::LoadThumbnailForSeries(const std::string& seriesId, const std::string& instanceId) 152 void SimpleViewerApplication::LoadThumbnailForSeries(const std::string& seriesId, const std::string& instanceId)
153 { 153 {
154 LOG(INFO) << "Loading thumbnail for series " << seriesId; 154 LOG(INFO) << "Loading thumbnail for series " << seriesId;
155 LayerWidget* thumbnailWidget = new LayerWidget(IObserver::broker_, "thumbnail-series-" + seriesId); 155 SliceViewerWidget* thumbnailWidget =
156 new SliceViewerWidget(IObserver::broker_, "thumbnail-series-" + seriesId);
156 thumbnails_.push_back(thumbnailWidget); 157 thumbnails_.push_back(thumbnailWidget);
157 thumbnailsLayout_->AddWidget(thumbnailWidget); 158 thumbnailsLayout_->AddWidget(thumbnailWidget);
158 thumbnailWidget->RegisterObserverCallback(new Callable<SimpleViewerApplication, LayerWidget::GeometryChangedMessage>(*this, &SimpleViewerApplication::OnWidgetGeometryChanged)); 159 thumbnailWidget->RegisterObserverCallback(
160 new Callable<SimpleViewerApplication, SliceViewerWidget::GeometryChangedMessage>
161 (*this, &SimpleViewerApplication::OnWidgetGeometryChanged));
159 smartLoader_->SetFrameInWidget(*thumbnailWidget, 0, instanceId, 0); 162 smartLoader_->SetFrameInWidget(*thumbnailWidget, 0, instanceId, 0);
160 thumbnailWidget->SetInteractor(*thumbnailInteractor_); 163 thumbnailWidget->SetInteractor(*thumbnailInteractor_);
161 } 164 }
162 165
163 void SimpleViewerApplication::SelectStudy(const std::string& studyId) 166 void SimpleViewerApplication::SelectStudy(const std::string& studyId)
164 { 167 {
165 orthancApiClient_->GetJsonAsync("/studies/" + studyId, new Callable<SimpleViewerApplication, OrthancApiClient::JsonResponseReadyMessage>(*this, &SimpleViewerApplication::OnStudyReceived)); 168 orthancApiClient_->GetJsonAsync("/studies/" + studyId, new Callable<SimpleViewerApplication, OrthancApiClient::JsonResponseReadyMessage>(*this, &SimpleViewerApplication::OnStudyReceived));
166 } 169 }
167 170
168 void SimpleViewerApplication::OnWidgetGeometryChanged(const LayerWidget::GeometryChangedMessage& message) 171 void SimpleViewerApplication::OnWidgetGeometryChanged(const SliceViewerWidget::GeometryChangedMessage& message)
169 { 172 {
170 message.GetOrigin().FitContent(); 173 message.GetOrigin().FitContent();
171 } 174 }
172 175
173 void SimpleViewerApplication::SelectSeriesInMainViewport(const std::string& seriesId) 176 void SimpleViewerApplication::SelectSeriesInMainViewport(const std::string& seriesId)