Skip to content

Commit 4d470ec

Browse files
alixdammanalixdamman
committed
renamed xlabels and ylabels as hlabels and vlabels
1 parent e94a5ed commit 4d470ec

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎larray_editor/arrayadapter.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77

88
class LArrayDataAdapter(object):
9-
def __init__(self, axes_model, xlabels_model, ylabels_model, data_model,
9+
def __init__(self, axes_model, hlabels_model, vlabels_model, data_model,
1010
data=None, changes=None, current_filter=None, bg_gradient=None, bg_value=None):
1111
# set models
1212
self.axes_model = axes_model
13-
self.xlabels_model = xlabels_model
14-
self.ylabels_model = ylabels_model
13+
self.hlabels_model = hlabels_model
14+
self.vlabels_model = vlabels_model
1515
self.data_model = data_model
1616
# set current filter
1717
if current_filter is None:
@@ -44,7 +44,7 @@ def get_axes(self):
4444
axes_names = axes_names[:-2] + [axes_names[-2] + '\\' + axes_names[-1]]
4545
return [[axis_name] for axis_name in axes_names]
4646

47-
def get_xlabels(self):
47+
def get_hlabels(self):
4848
axes = self.filtered_data.axes
4949
if len(axes) == 0:
5050
return None
@@ -53,7 +53,7 @@ def get_xlabels(self):
5353
else:
5454
return [[label] for label in axes.labels[-1]]
5555

56-
def get_ylabels(self):
56+
def get_vlabels(self):
5757
axes = self.filtered_data.axes
5858
if len(axes) == 0:
5959
return None
@@ -118,14 +118,14 @@ def update_filtered_data(self, current_filter=None):
118118
if np.isscalar(self.filtered_data):
119119
self.filtered_data = la.aslarray(self.filtered_data)
120120
axes = self.get_axes()
121-
xlabels = self.get_xlabels()
122-
ylabels = self.get_ylabels()
121+
hlabels = self.get_hlabels()
122+
vlabels = self.get_vlabels()
123123
data_2D = self.get_2D_data()
124124
changes_2D = self.get_changes_2D()
125125
bg_value_2D = self.get_bg_value_2D(data_2D.shape)
126126
self.axes_model.set_data(axes)
127-
self.xlabels_model.set_data(xlabels)
128-
self.ylabels_model.set_data(ylabels)
127+
self.hlabels_model.set_data(hlabels)
128+
self.vlabels_model.set_data(vlabels)
129129
self.data_model.set_data(data_2D, changes_2D)
130130
self.data_model.set_background(self.bg_gradient, bg_value_2D)
131131

‎larray_editor/arraymodel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def flags(self, index):
149149
def get_value(self, index):
150150
i = index.row()
151151
j = index.column()
152-
# we need to inverse column and row because of the way ylabels are generated
152+
# we need to inverse column and row because of the way vlabels are generated
153153
return str(self._data[j][i])
154154

155155
# XXX: I wonder if we shouldn't return a 2D Numpy array of strings?

‎larray_editor/arraywidget.py

+43-43
Original file line numberDiff line numberDiff line change
@@ -514,33 +514,33 @@ def __init__(self, parent, data, readonly=False, bg_value=None, bg_gradient=None
514514
self.model_axes = LabelsArrayModel(parent=self, readonly=readonly)
515515
self.view_axes = LabelsView(parent=self, model=self.model_axes, position=(TOP, LEFT))
516516

517-
self.model_xlabels = LabelsArrayModel(parent=self, readonly=readonly)
518-
self.view_xlabels = LabelsView(parent=self, model=self.model_xlabels, position=(TOP, RIGHT))
517+
self.model_hlabels = LabelsArrayModel(parent=self, readonly=readonly)
518+
self.view_hlabels = LabelsView(parent=self, model=self.model_hlabels, position=(TOP, RIGHT))
519519

520-
self.model_ylabels = LabelsArrayModel(parent=self, readonly=readonly)
521-
self.view_ylabels = LabelsView(parent=self, model=self.model_ylabels, position=(BOTTOM, LEFT))
520+
self.model_vlabels = LabelsArrayModel(parent=self, readonly=readonly)
521+
self.view_vlabels = LabelsView(parent=self, model=self.model_vlabels, position=(BOTTOM, LEFT))
522522

523523
self.model_data = DataArrayModel(parent=self, readonly=readonly, minvalue=minvalue, maxvalue=maxvalue)
524524
self.view_data = DataView(parent=self, model=self.model_data, dtype=data.dtype, shape=data.shape)
525525

526-
self.data_adapter = LArrayDataAdapter(axes_model=self.model_axes, xlabels_model=self.model_xlabels,
527-
ylabels_model=self.model_ylabels, data_model=self.model_data, data=data,
526+
self.data_adapter = LArrayDataAdapter(axes_model=self.model_axes, hlabels_model=self.model_hlabels,
527+
vlabels_model=self.model_vlabels, data_model=self.model_data, data=data,
528528
bg_value=bg_value, bg_gradient=bg_gradient)
529529

530530
# Create vertical and horizontal scrollbars
531531
self.vscrollbar = ScrollBar(self, self.view_data.verticalScrollBar())
532532
self.hscrollbar = ScrollBar(self, self.view_data.horizontalScrollBar())
533533

534534
# Synchronize resizing
535-
self.view_axes.horizontalHeader().sectionResized.connect(self.view_ylabels.updateSectionWidth)
536-
self.view_axes.verticalHeader().sectionResized.connect(self.view_xlabels.updateSectionHeight)
537-
self.view_xlabels.horizontalHeader().sectionResized.connect(self.view_data.updateSectionWidth)
538-
self.view_ylabels.verticalHeader().sectionResized.connect(self.view_data.updateSectionHeight)
535+
self.view_axes.horizontalHeader().sectionResized.connect(self.view_vlabels.updateSectionWidth)
536+
self.view_axes.verticalHeader().sectionResized.connect(self.view_hlabels.updateSectionHeight)
537+
self.view_hlabels.horizontalHeader().sectionResized.connect(self.view_data.updateSectionWidth)
538+
self.view_vlabels.verticalHeader().sectionResized.connect(self.view_data.updateSectionHeight)
539539
# Synchronize auto-resizing
540540
self.view_axes.horizontalHeader().sectionHandleDoubleClicked.connect(self.resize_axes_column_to_contents)
541-
self.view_xlabels.horizontalHeader().sectionHandleDoubleClicked.connect(self.resize_xlabels_column_to_contents)
541+
self.view_hlabels.horizontalHeader().sectionHandleDoubleClicked.connect(self.resize_hlabels_column_to_contents)
542542
self.view_axes.verticalHeader().sectionHandleDoubleClicked.connect(self.resize_axes_row_to_contents)
543-
self.view_ylabels.verticalHeader().sectionHandleDoubleClicked.connect(self.resize_ylabels_row_to_contents)
543+
self.view_vlabels.verticalHeader().sectionHandleDoubleClicked.connect(self.resize_vlabels_row_to_contents)
544544

545545
# synchronize specific methods
546546
self.view_axes.allSelected.connect(self.view_data.selectAll)
@@ -550,18 +550,18 @@ def __init__(self, parent, data, readonly=False, bg_value=None, bg_gradient=None
550550
self.view_data.signal_plot.connect(self.plot)
551551

552552
# Synchronize scrolling
553-
# data <--> xlabels
554-
self.view_data.horizontalScrollBar().valueChanged.connect(self.view_xlabels.horizontalScrollBar().setValue)
555-
self.view_xlabels.horizontalScrollBar().valueChanged.connect(self.view_data.horizontalScrollBar().setValue)
556-
# data <--> ylabels
557-
self.view_data.verticalScrollBar().valueChanged.connect(self.view_ylabels.verticalScrollBar().setValue)
558-
self.view_ylabels.verticalScrollBar().valueChanged.connect(self.view_data.verticalScrollBar().setValue)
553+
# data <--> hlabels
554+
self.view_data.horizontalScrollBar().valueChanged.connect(self.view_hlabels.horizontalScrollBar().setValue)
555+
self.view_hlabels.horizontalScrollBar().valueChanged.connect(self.view_data.horizontalScrollBar().setValue)
556+
# data <--> vlabels
557+
self.view_data.verticalScrollBar().valueChanged.connect(self.view_vlabels.verticalScrollBar().setValue)
558+
self.view_vlabels.verticalScrollBar().valueChanged.connect(self.view_data.verticalScrollBar().setValue)
559559

560560
# Synchronize selecting columns(rows) via hor.(vert.) header of x(y)labels view
561-
self.view_xlabels.horizontalHeader().sectionPressed.connect(self.view_data.selectColumn)
562-
self.view_xlabels.horizontalHeader().sectionEntered.connect(self.view_data.selectNewColumn)
563-
self.view_ylabels.verticalHeader().sectionPressed.connect(self.view_data.selectRow)
564-
self.view_ylabels.verticalHeader().sectionEntered.connect(self.view_data.selectNewRow)
561+
self.view_hlabels.horizontalHeader().sectionPressed.connect(self.view_data.selectColumn)
562+
self.view_hlabels.horizontalHeader().sectionEntered.connect(self.view_data.selectNewColumn)
563+
self.view_vlabels.verticalHeader().sectionPressed.connect(self.view_data.selectRow)
564+
self.view_vlabels.verticalHeader().sectionEntered.connect(self.view_data.selectNewRow)
565565

566566
# following lines are required to keep usual selection color
567567
# when selecting rows/columns via headers of label views.
@@ -576,17 +576,17 @@ def __init__(self, parent, data, readonly=False, bg_value=None, bg_gradient=None
576576
array_frame.setFrameStyle(QFrame.StyledPanel)
577577
# remove borders of internal tables
578578
self.view_axes.setFrameStyle(QFrame.NoFrame)
579-
self.view_xlabels.setFrameStyle(QFrame.NoFrame)
580-
self.view_ylabels.setFrameStyle(QFrame.NoFrame)
579+
self.view_hlabels.setFrameStyle(QFrame.NoFrame)
580+
self.view_vlabels.setFrameStyle(QFrame.NoFrame)
581581
self.view_data.setFrameStyle(QFrame.NoFrame)
582582
# Set layout of table views:
583-
# [ axes ][xlabels]|V|
584-
# [ylabels][ data ]|s|
583+
# [ axes ][vlabels]|V|
584+
# [hlabels][ data ]|s|
585585
# | H. scrollbar |
586586
array_layout = QGridLayout()
587587
array_layout.addWidget(self.view_axes, 0, 0)
588-
array_layout.addWidget(self.view_xlabels, 0, 1)
589-
array_layout.addWidget(self.view_ylabels, 1, 0)
588+
array_layout.addWidget(self.view_hlabels, 0, 1)
589+
array_layout.addWidget(self.view_vlabels, 1, 0)
590590
self.view_data.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
591591
array_layout.addWidget(self.view_data, 1, 1)
592592
array_layout.addWidget(self.vscrollbar, 0, 2, 2, 1)
@@ -847,9 +847,9 @@ def autofit_columns(self):
847847
self.view_axes.autofit_columns()
848848
for column in range(self.model_axes.columnCount()):
849849
self.resize_axes_column_to_contents(column)
850-
self.view_xlabels.autofit_columns()
851-
for column in range(self.model_xlabels.columnCount()):
852-
self.resize_xlabels_column_to_contents(column)
850+
self.view_hlabels.autofit_columns()
851+
for column in range(self.model_hlabels.columnCount()):
852+
self.resize_hlabels_column_to_contents(column)
853853

854854
def resize_axes_column_to_contents(self, column):
855855
# must be connected to view_axes.horizontalHeader().sectionHandleDoubleClicked signal
@@ -858,12 +858,12 @@ def resize_axes_column_to_contents(self, column):
858858
# no need to call resizeSection on view_ylabels (see synchronization lines in init)
859859
self.view_axes.horizontalHeader().resizeSection(column, width)
860860

861-
def resize_xlabels_column_to_contents(self, column):
861+
def resize_hlabels_column_to_contents(self, column):
862862
# must be connected to view_labels.horizontalHeader().sectionHandleDoubleClicked signal
863-
width = max(self.view_xlabels.horizontalHeader().sectionSize(column),
863+
width = max(self.view_hlabels.horizontalHeader().sectionSize(column),
864864
self.view_data.sizeHintForColumn(column))
865865
# no need to call resizeSection on view_data (see synchronization lines in init)
866-
self.view_xlabels.horizontalHeader().resizeSection(column, width)
866+
self.view_hlabels.horizontalHeader().resizeSection(column, width)
867867

868868
def resize_axes_row_to_contents(self, row):
869869
# must be connected to view_axes.verticalHeader().sectionHandleDoubleClicked
@@ -872,12 +872,12 @@ def resize_axes_row_to_contents(self, row):
872872
# no need to call resizeSection on view_xlabels (see synchronization lines in init)
873873
self.view_axes.verticalHeader().resizeSection(row, height)
874874

875-
def resize_ylabels_row_to_contents(self, row):
875+
def resize_vlabels_row_to_contents(self, row):
876876
# must be connected to view_labels.verticalHeader().sectionHandleDoubleClicked
877-
height = max(self.view_ylabels.verticalHeader().sectionSize(row),
877+
height = max(self.view_vlabels.verticalHeader().sectionSize(row),
878878
self.view_data.sizeHintForRow(row))
879879
# no need to call resizeSection on view_data (see synchronization lines in init)
880-
self.view_ylabels.verticalHeader().resizeSection(row, height)
880+
self.view_vlabels.verticalHeader().resizeSection(row, height)
881881

882882
@property
883883
def dirty(self):
@@ -949,15 +949,15 @@ def _selection_data(self, headers=True, none_selects_all=True):
949949
# FIXME: this is extremely ad-hoc.
950950
# TODO: in the future (pandas-based branch) we should use to_string(data[self._selection_filter()])
951951
dim_headers = self.model_axes.get_values()
952-
xlabels = self.model_xlabels.get_values(top=col_min, bottom=col_max)
953-
topheaders = [[dim_header[0] for dim_header in dim_headers] + [label[0] for label in xlabels]]
952+
hlabels = self.model_hlabels.get_values(top=col_min, bottom=col_max)
953+
topheaders = [[dim_header[0] for dim_header in dim_headers] + [label[0] for label in hlabels]]
954954
if self.data_adapter.ndim == 1:
955955
return chain(topheaders, [chain([''], row) for row in raw_data])
956956
else:
957957
assert self.data_adapter.ndim > 1
958-
ylabels = self.model_ylabels.get_values(left=row_min, right=row_max)
958+
vlabels = self.model_vlabels.get_values(left=row_min, right=row_max)
959959
return chain(topheaders,
960-
[chain([ylabels[j][r] for j in range(len(ylabels))], row)
960+
[chain([vlabels[j][r] for j in range(len(vlabels))], row)
961961
for r, row in enumerate(raw_data)])
962962
else:
963963
return raw_data
@@ -1039,8 +1039,8 @@ def plot(self):
10391039
row_min, row_max, col_min, col_max = self.view_data._selection_bounds()
10401040
dim_names = self.data_adapter.get_axes_names()
10411041
# labels
1042-
xlabels = [label[0] for label in self.model_xlabels.get_values(top=col_min, bottom=col_max)]
1043-
ylabels = self.model_ylabels.get_values(left=row_min, right=row_max)
1042+
xlabels = [label[0] for label in self.model_hlabels.get_values(top=col_min, bottom=col_max)]
1043+
ylabels = self.model_vlabels.get_values(left=row_min, right=row_max)
10441044
# transpose ylabels
10451045
ylabels = [[str(ylabels[i][j]) for i in range(len(ylabels))] for j in range(len(ylabels[0]))]
10461046
# if there is only one dimension, ylabels is empty

‎larray_editor/editor.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ def __init__(self, parent=None):
705705
self.arraywidget = None
706706

707707
def setup_and_check(self, data, title='', readonly=False,
708-
xlabels=None, ylabels=None,
708+
hlabels=None, vlabels=None,
709709
minvalue=None, maxvalue=None):
710710
"""
711711
Setup ArrayEditor:
@@ -735,7 +735,7 @@ def setup_and_check(self, data, title='', readonly=False,
735735
self.resize(800, 600)
736736
self.setMinimumSize(400, 300)
737737

738-
self.arraywidget = ArrayEditorWidget(self, data, readonly, xlabels, ylabels,
738+
self.arraywidget = ArrayEditorWidget(self, data, readonly, hlabels, vlabels,
739739
minvalue=minvalue, maxvalue=maxvalue)
740740
layout.addWidget(self.arraywidget, 1, 0)
741741

0 commit comments

Comments
 (0)