Mercurial > hg > orthanc-stone

changeset 438:237160cbb44f am-vsol-upgrade

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow derivation of RadiographyScene
author am@osimis.io
date Thu, 20 Dec 2018 18:24:52 +0100
parents 8f7220433b59
children a750f11892ec
files Framework/Radiography/RadiographyScene.h
diffstat 1 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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<MessageType_Scene_GeometryChanged, RadiographyScene>
+        public OriginMessage<MessageType_Scene_GeometryChanged, RadiographyScene>
     {
     private:
       RadiographyLayer&        layer_;
@@ -53,14 +53,14 @@
     };
 
     class ContentChangedMessage :
-      public OriginMessage<MessageType_Scene_ContentChanged, RadiographyScene>
+        public OriginMessage<MessageType_Scene_ContentChanged, RadiographyScene>
     {
     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);
   };
 }