Skip to content
Snippets Groups Projects
Commit e04b8a14 authored by Paul McCarthy's avatar Paul McCarthy
Browse files

1. ModelOpts was trying to remove name listener on overlay, instead of on

Display instance.

2. Sprinkled some more debug statements about the place

3. fsl/__init__ configures root logger, instead of 'fsl' logger.
parent 42a6421e
No related branches found
No related tags found
No related merge requests found
......@@ -88,7 +88,8 @@ logHandler = logging.StreamHandler()
logHandler.setFormatter(logFormatter)
log = logging.getLogger('fsl')
# We want the root logger
log = logging.getLogger()
log.addHandler(logHandler)
......@@ -273,6 +274,8 @@ def parseArgs(argv, allTools):
log.setLevel(logging.MEMORY)
log.handlers[0].addFilter(MemFilter())
log.memory('Added filter for MEMORY messages')
logging.getLogger('props') .setLevel(logging.WARNING)
logging.getLogger('pwidgets').setLevel(logging.WARNING)
if namespace.verbose == 1:
log.setLevel(logging.DEBUG)
......
......@@ -65,7 +65,8 @@ class ModelOpts(fsldisplay.DisplayOpts):
self.overlayList.removeListener('overlays', self.name)
for overlay in self.overlayList:
overlay.removeListener('name', self.name)
display = self.displayCtx.getDisplay(overlay)
display.removeListener('name', self.name)
fsldisplay.DisplayOpts.destroy(self)
......
......@@ -136,7 +136,12 @@ class FSLViewFrame(wx.Frame):
panel = panelCls(
self.__centrePane,
self.__overlayList,
childDC)
childDC)
log.debug('Created new {} ({}) with DisplayContext {}'.format(
panelCls.__name__,
id(panel),
id(childDC)))
self.__viewPanelCount = self.__viewPanelCount + 1
......@@ -188,8 +193,12 @@ class FSLViewFrame(wx.Frame):
title = self.__viewPanelTitles.pop( panel)
dctx = self.__viewPanelDCs .pop( panel)
log.debug('Destroying view panel {} ({})'.format(
title, type(panel).__name__))
log.debug('Destroying {} (title {}, id {}) and '
'associated DisplayContext ({})'.format(
type(panel).__name__,
title,
id(panel),
id(dctx)))
# Unbind view panel menu
# items, and remove the menu
......
......@@ -138,6 +138,9 @@ def context(args):
# linked to this master one.
overlayList = fsloverlay.OverlayList()
displayCtx = displaycontext.DisplayContext(overlayList)
log.debug('Created overlay list and master DisplayContext ({})'.format(
id(displayCtx)))
# Load the images - the splash screen status will
# be updated with the currently loading overlay name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment