Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
melview
Commits
96ac7807
Commit
96ac7807
authored
Nov 17, 2012
by
David Flitney
Browse files
merging conflicts
parents
112aa17a
1d99f6f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
melview/melodic_traits.py
View file @
96ac7807
...
...
@@ -26,6 +26,9 @@ import re
os
.
environ
[
'ETS_TOOLKIT'
]
=
'qt4'
os
.
environ
[
'QT_API'
]
=
'pyside'
import
logging
logging
.
basicConfig
(
level
=
logging
.
INFO
)
import
numpy
as
np
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,
# we need to import QtGui and QtCore from pyface.qt
#
from pyface.qt import QtGui, QtCore
from
pyface.api
import
FileDialog
,
OK
,
confirm
,
error
,
YES
#from pyface.qt import QtGui, QtCore
#
from pyface.api import FileDialog, OK, confirm, error, YES
#from PyQt4.QtGui import QWidget, QSizePolicy
...
...
@@ -50,7 +53,7 @@ from traitsui.api import Handler, View, Item, \
UItem
,
HGroup
,
HSplit
,
VSplit
,
VGroup
,
Group
,
\
RangeEditor
,
EnumEditor
,
InstanceEditor
from
enthought.
traits
.
ui.api
import
CustomEditor
from
traitsui.api
import
CustomEditor
from
enthought.etsconfig.api
import
ETSConfig
from
traitsui.menu
import
Action
...
...
@@ -468,7 +471,7 @@ class MelodicWindow(HasTraits):
return
M
def
__init__
(
self
,
path
=
""
,
bgpath
=
""
,
ic
=
1
,
*
args
,
**
kwargs
):
print
"MelodicWindow.__init__()"
logging
.
debug
(
"MelodicWindow.__init__()"
)
super
(
MelodicWindow
,
self
).
__init__
(
*
args
,
**
kwargs
)
# print "MelodicWindow.__init__() called super"
...
...
@@ -505,7 +508,7 @@ class MelodicWindow(HasTraits):
finally
:
self
.
initialised
=
True
print
"MelodicWindow.__init__()...done"
logging
.
debug
(
"MelodicWindow.__init__()...done"
)
def
dirty
(
self
):
unsaved
=
False
...
...
@@ -611,8 +614,7 @@ class MelodicWindow(HasTraits):
self
.
display
()
def
display
(
self
):
# print "MelodicWindow.display()"
logging
.
debug
(
"MelodicWindow.display()"
)
d
=
self
.
mel
.
get_stat_data
()
b
=
self
.
bg_data
...
...
@@ -670,6 +672,8 @@ class MelodicWindow(HasTraits):
if
self
.
initialised
:
self
.
lbox
.
canvas
.
draw
()
logging
.
debug
(
"MelodicWindow.display()... done"
)
@
on_trait_change
(
'ncols'
)
def
ncolsChange
(
self
,
ncols
):
...
...
@@ -724,8 +728,8 @@ class MelodicWindow(HasTraits):
if
obj
:
self
.
mel
.
select_component
(
obj
.
ic_number
)
if
self
.
initialised
:
self
.
display
()
#
if self.initialised:
#
self.display()
self
.
needs_saving
=
self
.
dirty
()
self
.
reset_lut
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment