Skip to content

Commit 71a903c

Browse files
Align stages 5 in controlling what columns are displayed.
1 parent 1d423b8 commit 71a903c

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

stage5.1_fuller_application/pycasa/ui/image_folder_view.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
)
55
from traitsui.ui_editors.data_frame_editor import DataFrameEditor
66

7-
from pycasa.model.image_folder import ImageFolder
7+
# Local imports
8+
from pycasa.model.image_folder import FILENAME_COL, ImageFolder, NUM_FACE_COL
89

9-
DISPLAYED_COLUMNS = [
10+
DISPLAYED_COLUMNS = [FILENAME_COL, NUM_FACE_COL] + [
1011
'ApertureValue', 'ExifVersion', 'Model', 'Make', 'LensModel', 'DateTime',
11-
'ShutterSpeedValue', 'XResolution', 'YResolution'
12+
'ShutterSpeedValue', 'ExposureTime', 'XResolution', 'YResolution',
13+
'Orientation', 'GPSInfo', 'DigitalZoomRatio', 'FocalLengthIn35mmFilm',
14+
'ISOSpeedRatings', 'SceneType'
1215
]
1316

1417

@@ -21,7 +24,7 @@ class ImageFolderView(ModelView):
2124
Item('model.directory', style="readonly", show_label=False),
2225
Item(
2326
'model.data',
24-
editor=DataFrameEditor(),
27+
editor=DataFrameEditor(columns=DISPLAYED_COLUMNS),
2528
show_label=False,
2629
visible_when="len(model.data) > 0",
2730
),

stage5.2_fuller_application/pycasa/ui/image_folder_view.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
from traits.api import Button, Instance, observe
55
from traitsui.api import HGroup, Item, Label, ModelView, Spring, View
66
from traitsui.ui_editors.data_frame_editor import DataFrameEditor
7+
78
# Local imports
8-
from ..model.image_folder import ImageFolder
9+
from ..model.image_folder import FILENAME_COL, ImageFolder, NUM_FACE_COL
10+
11+
12+
DISPLAYED_COLUMNS = [FILENAME_COL, NUM_FACE_COL] + [
13+
'ApertureValue', 'ExifVersion', 'Model', 'Make', 'LensModel', 'DateTime',
14+
'ShutterSpeedValue', 'ExposureTime', 'XResolution', 'YResolution',
15+
'Orientation', 'GPSInfo', 'DigitalZoomRatio', 'FocalLengthIn35mmFilm',
16+
'ISOSpeedRatings', 'SceneType'
17+
]
918

1019

1120
class ImageFolderView(ModelView):
@@ -19,7 +28,8 @@ class ImageFolderView(ModelView):
1928
Item("model.directory", style="readonly", show_label=False),
2029
Item(
2130
"model.data",
22-
editor=DataFrameEditor(update="data_updated"),
31+
editor=DataFrameEditor(columns=DISPLAYED_COLUMNS,
32+
update="data_updated"),
2333
show_label=False,
2434
visible_when="len(model.data) > 0"),
2535
HGroup(

0 commit comments

Comments
 (0)