Mercurial > hg > orthanc-stone
diff Framework/Layers/SingleFrameRendererFactory.h @ 32:517c46f527cd
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 19 Dec 2016 11:00:23 +0100 |
parents | 9aace933cb64 |
children | 7207a407bcd8 |
line wrap: on
line diff
--- a/Framework/Layers/SingleFrameRendererFactory.h Fri Dec 16 15:41:20 2016 +0100 +++ b/Framework/Layers/SingleFrameRendererFactory.h Mon Dec 19 11:00:23 2016 +0100 @@ -33,15 +33,16 @@ #pragma once #include "ILayerRendererFactory.h" +#include "../../Resources/Orthanc/Plugins/Samples/Common/IOrthancConnection.h" namespace OrthancStone { class SingleFrameRendererFactory : public ILayerRendererFactory { private: - OrthancPlugins::IOrthancConnection& orthanc_; + OrthancPlugins::IOrthancConnection& orthanc_; + std::auto_ptr<OrthancPlugins::IDicomDataset> dicom_; - DicomDataset dicom_; std::string instance_; unsigned int frame_; Orthanc::PixelFormat format_; @@ -51,12 +52,15 @@ const std::string& instanceId, unsigned int frame); - const DicomDataset& GetDataset() const + const OrthancPlugins::IDicomDataset& GetDataset() const { - return dicom_; + return *dicom_; } - SliceGeometry GetSliceGeometry(); + SliceGeometry GetSliceGeometry() + { + return SliceGeometry(*dicom_); + } virtual bool GetExtent(double& x1, double& y1,