# HG changeset patch # User am@osimis.io # Date 1545326692 -3600 # Node ID 237160cbb44ffe4f618bfa780b2eecce37b7ffab # Parent 8f7220433b59c3198736696fe706ade71751fa68 allow derivation of RadiographyScene diff -r 8f7220433b59 -r 237160cbb44f Framework/Radiography/RadiographyScene.h --- a/Framework/Radiography/RadiographyScene.h Thu Dec 06 16:44:06 2018 +0100 +++ b/Framework/Radiography/RadiographyScene.h Thu Dec 20 18:24:52 2018 +0100 @@ -33,7 +33,7 @@ { public: class GeometryChangedMessage : - public OriginMessage + public OriginMessage { private: RadiographyLayer& layer_; @@ -53,14 +53,14 @@ }; class ContentChangedMessage : - public OriginMessage + public OriginMessage { private: RadiographyLayer& layer_; public: ContentChangedMessage(const RadiographyScene& origin, - RadiographyLayer& layer) : + RadiographyLayer& layer) : OriginMessage(origin), layer_(layer) { @@ -115,6 +115,7 @@ float windowingWidth_; Layers layers_; + protected: RadiographyLayer& RegisterLayer(RadiographyLayer* layer); void OnTagsReceived(const OrthancApiClient::BinaryResponseReadyMessage& message); @@ -152,11 +153,11 @@ RadiographyLayer& LoadAlphaBitmap(Orthanc::ImageAccessor* bitmap, // takes ownership RadiographyLayer::Geometry* geometry); - RadiographyLayer& LoadDicomFrame(OrthancApiClient& orthanc, - const std::string& instance, - unsigned int frame, - bool httpCompression, - RadiographyLayer::Geometry* geometry); // pass NULL if you want default geometry + virtual RadiographyLayer& LoadDicomFrame(OrthancApiClient& orthanc, + const std::string& instance, + unsigned int frame, + bool httpCompression, + RadiographyLayer::Geometry* geometry); // pass NULL if you want default geometry RadiographyLayer& LoadDicomWebFrame(IWebService& web); @@ -196,11 +197,11 @@ // temporary version used by VSOL because we need to send the same request at another url void ExportToCreateDicomRequest(Json::Value& createDicomRequestContent, - const Orthanc::DicomMap& dicom, - double pixelSpacingX, - double pixelSpacingY, - bool invert, - ImageInterpolation interpolation, - bool usePam); + const Orthanc::DicomMap& dicom, + double pixelSpacingX, + double pixelSpacingY, + bool invert, + ImageInterpolation interpolation, + bool usePam); }; }