diff Framework/Radiography/RadiographyScene.h @ 1336:379c00958553 broker

integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 31 Mar 2020 15:51:02 +0200
parents 7ec8fea061b9 a72c2c9af49a
children 6ea4062c1a0d
line wrap: on
line diff
--- a/Framework/Radiography/RadiographyScene.h	Tue Mar 31 11:01:34 2020 +0200
+++ b/Framework/Radiography/RadiographyScene.h	Tue Mar 31 15:51:02 2020 +0200
@@ -281,7 +281,7 @@
 
     void GetLayersIndexes(std::vector<size_t>& output) const;
 
-    Extent2D GetSceneExtent() const;
+    virtual Extent2D GetSceneExtent(bool minimal) const;
 
     virtual void Render(Orthanc::ImageAccessor& buffer,
                         const AffineTransform2D& viewTransform,
@@ -307,6 +307,7 @@
                      double pixelSpacingX,
                      double pixelSpacingY,
                      bool invert,
+                     bool autoCrop,
                      ImageInterpolation interpolation,
                      bool usePam);
 
@@ -316,6 +317,7 @@
                      double pixelSpacingX,
                      double pixelSpacingY,
                      bool invert,
+                     bool autoCrop,
                      ImageInterpolation interpolation,
                      bool usePam);
 
@@ -325,6 +327,7 @@
                                     double pixelSpacingX,
                                     double pixelSpacingY,
                                     bool invert,
+                                    bool autoCrop,
                                     ImageInterpolation interpolation,
                                     bool usePam);
 
@@ -334,14 +337,16 @@
                                                        double pixelSpacingX,
                                                        double pixelSpacingY,
                                                        bool invert,
+                                                       bool autoCrop,
                                                        ImageInterpolation interpolation);
 
     Orthanc::Image* ExportToImage(double pixelSpacingX,
                                   double pixelSpacingY,
                                   ImageInterpolation interpolation,
+                                  bool autoCrop,
                                   bool applyWindowing)
     {
-      return ExportToImage(pixelSpacingX, pixelSpacingY, interpolation, false, 0, applyWindowing);
+      return ExportToImage(pixelSpacingX, pixelSpacingY, interpolation, false, 0, autoCrop, applyWindowing);
     }
 
     Orthanc::Image* ExportToImage(double pixelSpacingX,
@@ -349,11 +354,13 @@
                                   ImageInterpolation interpolation,
                                   bool invert,
                                   int64_t maxValue /* for inversion */,
+                                  bool autoCrop,
                                   bool applyWindowing);
 
     void ExtractLayerFromRenderedScene(Orthanc::ImageAccessor& layer,
                                        const Orthanc::ImageAccessor& renderedScene,
                                        size_t layerIndex,
+                                       bool isCropped,
                                        ImageInterpolation interpolation);
   };
 }