From 3be1b59786e91cff6ddd5f6e2720c446f11b5e91 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Thu, 29 Oct 2015 13:27:56 +0000
Subject: [PATCH] Fixed buggy ortho panel screenshot generation - hidden wx
objects can return non-zero size.
---
fsl/fsleyes/views/canvaspanel.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/fsl/fsleyes/views/canvaspanel.py b/fsl/fsleyes/views/canvaspanel.py
index 9ac670741..4ca4ad406 100644
--- a/fsl/fsleyes/views/canvaspanel.py
+++ b/fsl/fsleyes/views/canvaspanel.py
@@ -134,7 +134,7 @@ class CanvasPanel(viewpanel.ViewPanel):
1 [label="CanvasPanel"];
2 [label="Centre panel"];
- 3 [label="Advanced layout"];
+ 3 [label="Custom content (for complex layouts)"];
4 [label="Container panel"];
5 [label="ColourBarPanel"];
6 [label="Content panel"];
@@ -170,10 +170,10 @@ class CanvasPanel(viewpanel.ViewPanel):
scrollbar) may override the :meth:`centrePanelLayout` method to implement
their own layout. These sub-class implementations must:
- 1. Call the :meth:`layoutCanvasContainer` method.
+ 1. Call the :meth:`layoutContainerPanel` method.
2. Add the container panel (accessed via :meth:`getContainerPanel`)
- to the centre panel (:meth:`getCentrePanel`)
+ to the centre panel (accessed via :meth:`getCentrePanel`).
3. Add any other custom content to the centre panel.
"""
@@ -735,6 +735,9 @@ def _screenshot(overlayList, displayCtx, canvasPanel):
rgb = bmp.ConvertToImage().GetData()
rgb = np.fromstring(rgb, dtype=np.uint8)
+ log.debug('Creating bitmap {} * {} for {} screenshot'.format(
+ width, height, type(canvasPanel).__name__))
+
data[:, :, :3] = rgb.reshape(height, width, 3)
# Patch in bitmaps for every GL canvas
@@ -745,6 +748,11 @@ def _screenshot(overlayList, displayCtx, canvasPanel):
if glCanvas is None:
continue
+ # Hidden wx objects will
+ # still return a size
+ if not glCanvas.IsShown():
+ continue
+
pos = relativePosition(glCanvas, parent)
size = glCanvas.GetClientSize().Get()
@@ -766,6 +774,9 @@ def _screenshot(overlayList, displayCtx, canvasPanel):
w = xend - xstart
h = yend - ystart
bmp = bmp[:h, :w, :]
+
+ log.debug('Patching {} in at [{} - {}], [{} - {}]'.format(
+ type(glCanvas).__name__, xstart, xend, ystart, yend))
data[ystart:yend, xstart:xend] = bmp
--
GitLab