Mercurial > hg > orthanc-stone

comparison Framework/Layers/DicomSeriesVolumeSlicer.cpp @ 726:4f2416d519b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving layers, widgets and loaders to Deprecated namespace
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 May 2019 11:43:25 +0200
parents 6af3099ed8da
children
comparison
equal deleted inserted replaced
714:d2c0e347ddc2 726:4f2416d519b4
27 #include <Core/Logging.h> 27 #include <Core/Logging.h>
28 #include <Core/OrthancException.h> 28 #include <Core/OrthancException.h>
29 29
30 #include <boost/lexical_cast.hpp> 30 #include <boost/lexical_cast.hpp>
31 31
32 namespace OrthancStone 32 namespace Deprecated
33 { 33 {
34 34
35 void DicomSeriesVolumeSlicer::OnSliceGeometryReady(const OrthancSlicesLoader::SliceGeometryReadyMessage& message) 35 void DicomSeriesVolumeSlicer::OnSliceGeometryReady(const OrthancSlicesLoader::SliceGeometryReadyMessage& message)
36 { 36 {
37 if (message.GetOrigin().GetSlicesCount() > 0) 37 if (message.GetOrigin().GetSlicesCount() > 0)
61 { 61 {
62 } 62 }
63 63
64 virtual ILayerRenderer* CreateRenderer() const 64 virtual ILayerRenderer* CreateRenderer() const
65 { 65 {
66 bool isFull = (message_.GetEffectiveQuality() == SliceImageQuality_FullPng || 66 bool isFull = (message_.GetEffectiveQuality() == OrthancStone::SliceImageQuality_FullPng ||
67 message_.GetEffectiveQuality() == SliceImageQuality_FullPam); 67 message_.GetEffectiveQuality() == OrthancStone::SliceImageQuality_FullPam);
68 68
69 return FrameRenderer::CreateRenderer(message_.GetImage(), message_.GetSlice(), isFull); 69 return FrameRenderer::CreateRenderer(message_.GetImage(), message_.GetSlice(), isFull);
70 } 70 }
71 }; 71 };
72 72
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(MessageBroker& broker, OrthancApiClient& orthanc) : 90 DicomSeriesVolumeSlicer::DicomSeriesVolumeSlicer(OrthancStone::MessageBroker& broker,
91 OrthancApiClient& orthanc) :
91 IVolumeSlicer(broker), 92 IVolumeSlicer(broker),
92 IObserver(broker), 93 IObserver(broker),
93 loader_(broker, orthanc), 94 loader_(broker, orthanc),
94 quality_(SliceImageQuality_FullPng) 95 quality_(OrthancStone::SliceImageQuality_FullPng)
95 { 96 {
96 loader_.RegisterObserverCallback( 97 loader_.RegisterObserverCallback(
97 new Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryReadyMessage> 98 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryReadyMessage>
98 (*this, &DicomSeriesVolumeSlicer::OnSliceGeometryReady)); 99 (*this, &DicomSeriesVolumeSlicer::OnSliceGeometryReady));
99 100
100 loader_.RegisterObserverCallback( 101 loader_.RegisterObserverCallback(
101 new Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryErrorMessage> 102 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceGeometryErrorMessage>
102 (*this, &DicomSeriesVolumeSlicer::OnSliceGeometryError)); 103 (*this, &DicomSeriesVolumeSlicer::OnSliceGeometryError));
103 104
104 loader_.RegisterObserverCallback( 105 loader_.RegisterObserverCallback(
105 new Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageReadyMessage> 106 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageReadyMessage>
106 (*this, &DicomSeriesVolumeSlicer::OnSliceImageReady)); 107 (*this, &DicomSeriesVolumeSlicer::OnSliceImageReady));
107 108
108 loader_.RegisterObserverCallback( 109 loader_.RegisterObserverCallback(
109 new Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageErrorMessage> 110 new OrthancStone::Callable<DicomSeriesVolumeSlicer, OrthancSlicesLoader::SliceImageErrorMessage>
110 (*this, &DicomSeriesVolumeSlicer::OnSliceImageError)); 111 (*this, &DicomSeriesVolumeSlicer::OnSliceImageError));
111 } 112 }
112 113
113 114
114 void DicomSeriesVolumeSlicer::LoadSeries(const std::string& seriesId) 115 void DicomSeriesVolumeSlicer::LoadSeries(const std::string& seriesId)
128 { 129 {
129 loader_.ScheduleLoadFrame(instanceId, frame); 130 loader_.ScheduleLoadFrame(instanceId, frame);
130 } 131 }
131 132
132 133
133 bool DicomSeriesVolumeSlicer::GetExtent(std::vector<Vector>& points, 134 bool DicomSeriesVolumeSlicer::GetExtent(std::vector<OrthancStone::Vector>& points,
134 const CoordinateSystem3D& viewportSlice) 135 const OrthancStone::CoordinateSystem3D& viewportSlice)
135 { 136 {
136 size_t index; 137 size_t index;
137 138
138 if (loader_.IsGeometryReady() && 139 if (loader_.IsGeometryReady() &&
139 loader_.LookupSlice(index, viewportSlice)) 140 loader_.LookupSlice(index, viewportSlice))
146 return false; 147 return false;
147 } 148 }
148 } 149 }
149 150
150 151
151 void DicomSeriesVolumeSlicer::ScheduleLayerCreation(const CoordinateSystem3D& viewportSlice) 152 void DicomSeriesVolumeSlicer::ScheduleLayerCreation(const OrthancStone::CoordinateSystem3D& viewportSlice)
152 { 153 {
153 size_t index; 154 size_t index;
154 155
155 if (loader_.IsGeometryReady() && 156 if (loader_.IsGeometryReady() &&
156 loader_.LookupSlice(index, viewportSlice)) 157 loader_.LookupSlice(index, viewportSlice))