From b81b2a925ef3871f09af00864eb78d54a65d7ebf Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Mon, 20 Jul 2015 17:54:09 +0100
Subject: [PATCH] FSLViewPanel is now a PyPanel, so I can override some wx
widgets methods. FSLViewPanel sets the wx window variant on control panels,
but it doesn't seem to have an effect.
---
fsl/fslview/controls/overlaydisplaypanel.py | 2 --
fsl/fslview/panel.py | 4 ++--
fsl/fslview/views/viewpanel.py | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fsl/fslview/controls/overlaydisplaypanel.py b/fsl/fslview/controls/overlaydisplaypanel.py
index ed3fc8363..25485089a 100644
--- a/fsl/fslview/controls/overlaydisplaypanel.py
+++ b/fsl/fslview/controls/overlaydisplaypanel.py
@@ -258,8 +258,6 @@ class OverlayDisplayPanel(fslpanel.FSLViewPanel):
self.__widgets.ClearGroup(groupName)
widgets = _DISPLAY_PROPS[target]
- if isinstance(target, displayctx.RGBVectorOpts):
- print 'bah'
labels = [strings.properties[target, w.key] for w in widgets]
widgets = [props.buildGUI(self.__widgets,
target,
diff --git a/fsl/fslview/panel.py b/fsl/fslview/panel.py
index a40313b41..66df10f14 100644
--- a/fsl/fslview/panel.py
+++ b/fsl/fslview/panel.py
@@ -131,11 +131,11 @@ class _FSLViewPanel(actions.ActionProvider):
'this is probably a bug!'.format(type(self).__name__))
-class FSLViewPanel(_FSLViewPanel, wx.Panel):
+class FSLViewPanel(_FSLViewPanel, wx.PyPanel):
"""
"""
def __init__(self, parent, overlayList, displayCtx, actionz=None):
- wx.Panel.__init__(self, parent)
+ wx.PyPanel.__init__(self, parent)
_FSLViewPanel.__init__(self, overlayList, displayCtx, actionz)
diff --git a/fsl/fslview/views/viewpanel.py b/fsl/fslview/views/viewpanel.py
index 390c2c771..588601495 100644
--- a/fsl/fslview/views/viewpanel.py
+++ b/fsl/fslview/views/viewpanel.py
@@ -186,10 +186,11 @@ class ViewPanel(fslpanel.FSLViewPanel):
else:
+ paneInfo = aui.AuiPaneInfo()
window = panelType(
self, self._overlayList, self._displayCtx, *args, **kwargs)
- paneInfo = aui.AuiPaneInfo()
+ window.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
if isinstance(window, fsltoolbar.FSLViewToolBar):
paneInfo.ToolbarPane()
--
GitLab