@@ -96,8 +96,8 @@ def setup_and_check(self, data, title='', readonly=False, minvalue=None, maxvalu
96
96
title = _ ("Session viewer" ) if readonly else _ ("Session editor" )
97
97
if readonly :
98
98
title += ' (' + _ ('read only' ) + ')'
99
- self .title = title
100
- self .setWindowTitle (self . title )
99
+ self ._title = title
100
+ self .setWindowTitle (title )
101
101
102
102
self .statusBar ().showMessage ("Welcome to the LArray Viewer" , 4000 )
103
103
@@ -464,7 +464,9 @@ def on_item_changed(self, curr, prev):
464
464
465
465
def update_title (self ):
466
466
array = self .current_array
467
- name = self .current_array_name
467
+ name = self .current_array_name if self .current_array_name is not None else ''
468
+ dtype = array .dtype .name
469
+ unsave_marker = '*' if self ._is_unsaved_modifications () else ''
468
470
title = []
469
471
if isinstance (array , LArray ):
470
472
# current file (if not None)
@@ -474,19 +476,17 @@ def update_title(self):
474
476
else :
475
477
title = [self .current_file ]
476
478
# array info
477
- axes = array .axes
478
- axes_info = ' x ' .join ("%s (%d)" % (display_name , len (axis ))
479
- for display_name , axis
480
- in zip (axes .display_names , axes ))
481
- title += [(name + ': ' + axes_info ) if name else axes_info ]
482
- # name of non-LArray displayed item (if not None)
483
- elif name :
484
- title = [name ]
479
+ shape = ['{} ({})' .format (display_name , len (axis ))
480
+ for display_name , axis in zip (array .axes .display_names , array .axes )]
481
+ else :
482
+ # if it's not an LArray, it must be a Numpy ndarray
483
+ assert isinstance (array , np .ndarray )
484
+ shape = [str (length ) for length in array .shape ]
485
+ # name + shape + dtype
486
+ array_info = ' x ' .join (shape ) + ' [{}]' .format (dtype )
487
+ title += [unsave_marker + name + ': ' + array_info ]
485
488
# extra info
486
- title += [self .title ]
487
- # add '*' at the end of the title if unsaved modifications.
488
- if self ._is_unsaved_modifications ():
489
- title += ['*' ]
489
+ title += [self ._title ]
490
490
# set title
491
491
self .setWindowTitle (' - ' .join (title ))
492
492
0 commit comments