comparison Framework/Deprecated/Layers/DicomSeriesVolumeSlicer.cpp @ 1066:b537002f83a9 broker

removing broker from deprecated classes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 Oct 2019 15:39:39 +0200
parents e713f1a99861
children 04a95ee91327
comparison
equal deleted inserted replaced
1065:9d42f89b8c3c 1066:b537002f83a9
85 { 85 {
86 BroadcastMessage(IVolumeSlicer::LayerErrorMessage(*this, message.GetSlice().GetGeometry())); 86 BroadcastMessage(IVolumeSlicer::LayerErrorMessage(*this, message.GetSlice().GetGeometry()));
87 } 87 }
88 88
89 89
90 DicomSeriesVolumeSlicer::DicomSeriesVolumeSlicer(OrthancStone::MessageBroker& broker, 90 DicomSeriesVolumeSlicer::DicomSeriesVolumeSlicer(OrthancApiClient& orthanc) :
91 OrthancApiClient& orthanc) : 91 loader_(orthanc),
92 IVolumeSlicer(broker),
93 loader_(broker, orthanc),
94 quality_(SliceImageQuality_FullPng) 92 quality_(SliceImageQuality_FullPng)
95 { 93 {
96 loader_.RegisterObserverCallback( 94 // TODO => Move this out of the constructor
97 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryReadyMessage> 95 Register<OrthancSlicesLoader::SliceGeometryReadyMessage>(loader_, &DicomSeriesVolumeSlicer::OnSliceGeometryReady);
98 (shared_from_this(), &DicomSeriesVolumeSlicer::OnSliceGeometryReady)); 96 Register<OrthancSlicesLoader::SliceGeometryErrorMessage>(loader_, &DicomSeriesVolumeSlicer::OnSliceGeometryError);
99 97 Register<OrthancSlicesLoader::SliceImageReadyMessage>(loader_, &DicomSeriesVolumeSlicer::OnSliceImageReady);
100 loader_.RegisterObserverCallback( 98 Register<OrthancSlicesLoader::SliceImageErrorMessage>(loader_, &DicomSeriesVolumeSlicer::OnSliceImageError);
101 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryErrorMessage>
102 (shared_from_this(), &DicomSeriesVolumeSlicer::OnSliceGeometryError));
103
104 loader_.RegisterObserverCallback(
105 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageReadyMessage>
106 (shared_from_this(), &DicomSeriesVolumeSlicer::OnSliceImageReady));
107
108 loader_.RegisterObserverCallback(
109 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageErrorMessage>
110 (shared_from_this(), &DicomSeriesVolumeSlicer::OnSliceImageError));
111 } 99 }
112 100
113 101
114 void DicomSeriesVolumeSlicer::LoadSeries(const std::string& seriesId) 102 void DicomSeriesVolumeSlicer::LoadSeries(const std::string& seriesId)
115 { 103 {