Skip to content

Commit 9519ce5

Browse files
committed
remove wx support
Former-commit-id: ce778967be8ac41b32b7bb8ca92d6e7e85746ea4
1 parent 0c8716a commit 9519ce5

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

dpx/srxplanargui/calibration.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,7 @@
1818
import re
1919

2020
from traits.etsconfig.api import ETSConfig
21-
if ETSConfig.toolkit == '' :
22-
ETSConfig.toolkit = 'qt4'
23-
elif ETSConfig.toolkit == 'wx':
24-
try:
25-
import wx
26-
if wx.versions() > 2.8:
27-
ETSConfig.toolkit = 'qt4'
28-
except:
29-
ETSConfig.toolkit = 'qt4'
21+
ETSConfig.toolkit = 'qt4'
3022

3123
from traits.api import \
3224
Dict, List, Enum, Bool, File, Float, Int, Array, Str, Range, Directory, CFloat, CInt, \

dpx/srxplanargui/selectfiles.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
2020
from collections import OrderedDict
2121
from traits.etsconfig.api import ETSConfig
2222

23-
if ETSConfig.toolkit == 'qt4':
24-
from traitsui.qt4.table_editor import TableEditor as TableEditorBE
25-
tableautosize = True
26-
else:
27-
from traitsui.wx.table_editor import TableEditor as TableEditorBE
28-
tableautosize = False
29-
23+
from traitsui.qt4.table_editor import TableEditor as TableEditorBE
3024
from traits.api import \
3125
Dict, List, Enum, Bool, File, Float, Int, Array, Str, Range, Directory, CFloat, CInt, \
3226
HasTraits, Property, Instance, Event, Button, Any, \
@@ -61,8 +55,6 @@ def object_selectallbb_changed(self, info):
6155
# FIXME
6256
try:
6357
editor = [aa for aa in info.ui._editors if isinstance(aa, TableEditorBE)][0]
64-
if ETSConfig.toolkit == 'wx':
65-
editor.selected_row_indices = editor.filtered_indices
6658
info.object.selected = [info.object.datafiles[i] for i in editor.filtered_indices]
6759
editor.refresh()
6860
except:
@@ -223,7 +215,7 @@ def _sumImgs(self):
223215
editable=False,
224216
),
225217
],
226-
auto_size=tableautosize,
218+
auto_size=True,
227219
# show_toolbar = True,
228220
deletable=True,
229221
# reorderable = True,

dpx/srxplanargui/srxconfig.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,7 @@
2020
import argparse
2121

2222
from traits.etsconfig.api import ETSConfig
23-
if ETSConfig.toolkit == '' :
24-
ETSConfig.toolkit = 'qt4'
25-
elif ETSConfig.toolkit == 'wx':
26-
try:
27-
import wx
28-
if wx.versions() > 2.8:
29-
ETSConfig.toolkit = 'qt4'
30-
except:
31-
ETSConfig.toolkit = 'qt4'
23+
ETSConfig.toolkit = 'qt4'
3224

3325
from traits.api import \
3426
Dict, List, Enum, Bool, File, Float, Int, Array, Str, Range, Directory, CFloat, CInt, \

0 commit comments

Comments
 (0)