Commit 96ac7807 authored by David Flitney's avatar David Flitney
Browse files

merging conflicts

parents 112aa17a 1d99f6f6
...@@ -26,6 +26,9 @@ import re ...@@ -26,6 +26,9 @@ import re
os.environ['ETS_TOOLKIT'] = 'qt4' os.environ['ETS_TOOLKIT'] = 'qt4'
os.environ['QT_API'] = 'pyside' os.environ['QT_API'] = 'pyside'
import logging
logging.basicConfig(level=logging.INFO)
import numpy as np import numpy as np
from fsl.melodic import * from fsl.melodic import *
...@@ -34,8 +37,8 @@ from fsl.melodic import * ...@@ -34,8 +37,8 @@ from fsl.melodic import *
# To be able to use PySide or PyQt4 and not run in conflicts with traits, # To be able to use PySide or PyQt4 and not run in conflicts with traits,
# we need to import QtGui and QtCore from pyface.qt # we need to import QtGui and QtCore from pyface.qt
# from pyface.qt import QtGui, QtCore #from pyface.qt import QtGui, QtCore
from pyface.api import FileDialog, OK, confirm, error, YES #from pyface.api import FileDialog, OK, confirm, error, YES
#from PyQt4.QtGui import QWidget, QSizePolicy #from PyQt4.QtGui import QWidget, QSizePolicy
...@@ -50,7 +53,7 @@ from traitsui.api import Handler, View, Item, \ ...@@ -50,7 +53,7 @@ from traitsui.api import Handler, View, Item, \
UItem, HGroup, HSplit, VSplit, VGroup, Group, \ UItem, HGroup, HSplit, VSplit, VGroup, Group, \
RangeEditor, EnumEditor, InstanceEditor RangeEditor, EnumEditor, InstanceEditor
from enthought.traits.ui.api import CustomEditor from traitsui.api import CustomEditor
from enthought.etsconfig.api import ETSConfig from enthought.etsconfig.api import ETSConfig
from traitsui.menu import Action from traitsui.menu import Action
...@@ -468,7 +471,7 @@ class MelodicWindow(HasTraits): ...@@ -468,7 +471,7 @@ class MelodicWindow(HasTraits):
return M return M
def __init__(self, path="", bgpath="", ic=1, *args, **kwargs): def __init__(self, path="", bgpath="", ic=1, *args, **kwargs):
print "MelodicWindow.__init__()" logging.debug("MelodicWindow.__init__()")
super(MelodicWindow, self).__init__(*args, **kwargs) super(MelodicWindow, self).__init__(*args, **kwargs)
# print "MelodicWindow.__init__() called super" # print "MelodicWindow.__init__() called super"
...@@ -505,7 +508,7 @@ class MelodicWindow(HasTraits): ...@@ -505,7 +508,7 @@ class MelodicWindow(HasTraits):
finally: finally:
self.initialised = True self.initialised = True
print "MelodicWindow.__init__()...done" logging.debug("MelodicWindow.__init__()...done")
def dirty(self): def dirty(self):
unsaved = False unsaved = False
...@@ -611,8 +614,7 @@ class MelodicWindow(HasTraits): ...@@ -611,8 +614,7 @@ class MelodicWindow(HasTraits):
self.display() self.display()
def display(self): def display(self):
# print "MelodicWindow.display()" logging.debug("MelodicWindow.display()")
d=self.mel.get_stat_data() d=self.mel.get_stat_data()
b=self.bg_data b=self.bg_data
...@@ -670,6 +672,8 @@ class MelodicWindow(HasTraits): ...@@ -670,6 +672,8 @@ class MelodicWindow(HasTraits):
if self.initialised: if self.initialised:
self.lbox.canvas.draw() self.lbox.canvas.draw()
logging.debug("MelodicWindow.display()... done")
@on_trait_change('ncols') @on_trait_change('ncols')
def ncolsChange(self, ncols): def ncolsChange(self, ncols):
...@@ -724,8 +728,8 @@ class MelodicWindow(HasTraits): ...@@ -724,8 +728,8 @@ class MelodicWindow(HasTraits):
if obj: if obj:
self.mel.select_component(obj.ic_number) self.mel.select_component(obj.ic_number)
if self.initialised: # if self.initialised:
self.display() # self.display()
self.needs_saving = self.dirty() self.needs_saving = self.dirty()
self.reset_lut() self.reset_lut()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment