Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ENH] Heatmap: Tighter layout #4390

Merged
merged 6 commits into from
Feb 14, 2020
Merged

[ENH] Heatmap: Tighter layout #4390

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e45a83
owheatmap: Ignore width size hint for legend's pixmap
ales-erjavec Jan 30, 2020
8126b2f
owheatmap: Use font's line spacing to set preferred cell size
ales-erjavec Jan 30, 2020
ef79c82
owheatmap: Place label left of the heatmap
ales-erjavec Jan 30, 2020
5f3bd5b
owheatmap: Tighter layout
ales-erjavec Jan 31, 2020
f749c2b
owheatmap: Use FLT_MAX to 'unset' the maximum row height constraints
ales-erjavec Jan 31, 2020
a63c8c1
owheatmap: Remove unnecessary row constraints
ales-erjavec Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 21 additions & 28 deletions Orange/widgets/visualize/owheatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,9 @@ def enum_get(etype: Type[E], name: str, default: E) -> E:
return default


FLT_MAX = np.finfo(np.float32).max


class OWHeatMap(widget.OWWidget):
name = "Heat Map"
description = "Plot a data matrix heatmap."
Expand Down Expand Up @@ -433,7 +436,7 @@ def _():
self.row_clustering_method = self.row_clustering.name

# set default settings
self.space_x = 10
self.space_x = 3

self.colorSettings = None
self.selectedSchemaIndex = 0
Expand Down Expand Up @@ -999,12 +1002,13 @@ def setup_scene(self, parts, data):
Col0 = 3
LegendRow = 0
# The column for the vertical dendrogram
DendrogramColumn = 0
DendrogramColumn = 1
# The row for the horizontal dendrograms
DendrogramRow = 1
RightLabelColumn = Col0 + M
TopLabelsRow = 2
BottomLabelsRow = Row0 + 2 * N
BottomLabelsRow = Row0 + N
GroupTitleColumn = 0

widget.setLayout(grid)

Expand All @@ -1019,9 +1023,9 @@ def setup_scene(self, parts, data):
for i, rowitem in enumerate(parts.rows):
if rowitem.title:
title = QGraphicsSimpleTextItem(rowitem.title, widget)
item = GraphicsSimpleTextLayoutItem(title, parent=grid)
item.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
grid.addItem(item, Row0 + i * 2, Col0)
item = GraphicsSimpleTextLayoutItem(title, orientation=Qt.Vertical, parent=grid)
item.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Maximum)
grid.addItem(item, Row0 + i, GroupTitleColumn, alignment=Qt.AlignCenter)

if rowitem.cluster:
dendrogram = DendrogramWidget(
Expand All @@ -1040,7 +1044,7 @@ def setup_scene(self, parts, data):
self.__select_by_cluster(item, partindex)
)

grid.addItem(dendrogram, Row0 + i * 2 + 1, DendrogramColumn)
grid.addItem(dendrogram, Row0 + i, DendrogramColumn)
sort_i.append(np.array(leaf_indices(rowitem.cluster)))
row_dendrograms[i] = dendrogram
else:
Expand Down Expand Up @@ -1092,8 +1096,8 @@ def setup_scene(self, parts, data):
hw.set_show_averages(self.averages)
hw.set_heatmap_data(X_part)

grid.addItem(hw, Row0 + i * 2 + 1, Col0 + j)
grid.setRowStretchFactor(Row0 + i * 2 + 1, X_part.shape[0] * 100)
grid.addItem(hw, Row0 + i, Col0 + j)
grid.setRowStretchFactor(Row0 + i, X_part.shape[0] * 100)
heatmap_row.append(hw)
heatmap_widgets.append(heatmap_row)

Expand Down Expand Up @@ -1121,7 +1125,7 @@ def setup_scene(self, parts, data):
labelslist.setContentsMargins(0.0, 0.0, 0.0, 0.0)
labelslist.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)

grid.addItem(labelslist, Row0 + i * 2 + 1, RightLabelColumn)
grid.addItem(labelslist, Row0 + i, RightLabelColumn)
grid.setAlignment(labelslist, Qt.AlignLeft)
row_annotation_widgets.append(labelslist)

Expand Down Expand Up @@ -1203,8 +1207,7 @@ def __update_size_constraints(self):
if mode == Qt.IgnoreAspectRatio:
# Reset the row height constraints ...
for i, hm_row in enumerate(self.heatmap_widget_grid):
layout.setRowMaximumHeight(3 + i * 2 + 1, np.finfo(np.float32).max)
layout.setRowPreferredHeight(3 + i * 2 + 1, 0)
layout.setRowMaximumHeight(3 + i, FLT_MAX)
# ... and resize to match the viewport, taking the minimum size
# into account
minsize = widget.minimumSize()
Expand Down Expand Up @@ -1234,8 +1237,8 @@ def __update_size_constraints(self):
Qt.KeepAspectRatioByExpanding)

heights.append(hm_size.height())
layout.setRowMaximumHeight(3 + i * 2 + 1, max(heights))
layout.setRowPreferredHeight(3 + i * 2 + 1, max(heights))
layout.setRowMaximumHeight(3 + i, max(heights))
layout.setRowPreferredHeight(3 + i, max(heights))

# set/update the widget's height
constraint = QSizeF(size.width(), -1)
Expand Down Expand Up @@ -1502,20 +1505,8 @@ def update_column_annotations(self):

for labelslist in self.col_annotation_widgets_top:
labelslist.setVisible(show_top)

TopLabelsRow = 2
Row0 = 3
BottomLabelsRow = Row0 + 2 * len(self.heatmapparts.rows)

layout = self.heatmap_scene.widget.layout()
layout.setRowMaximumHeight(TopLabelsRow, -1 if show_top else 0)
layout.setRowSpacing(TopLabelsRow, -1 if show_top else 0)

for labelslist in self.col_annotation_widgets_bottom:
labelslist.setVisible(show_bottom)

layout.setRowMaximumHeight(BottomLabelsRow, -1 if show_top else 0)

self.__fixup_grid_layout()

def __select_by_cluster(self, item, dendrogramindex):
Expand Down Expand Up @@ -1836,8 +1827,9 @@ def _update_pixmap(self):

self.heatmap_item.setMinimumSize(hmsize)
self.averages_item.setMinimumSize(avsize)
self.heatmap_item.setPreferredSize(hmsize * 10)
self.averages_item.setPreferredSize(avsize * 10)
size = QFontMetrics(self.font()).lineSpacing()
self.heatmap_item.setPreferredSize(hmsize * size)
self.averages_item.setPreferredSize(avsize * size)
self.layout().invalidate()

def cell_at(self, pos):
Expand Down Expand Up @@ -2071,6 +2063,7 @@ def __init__(self, low, high, threshold_low, threshold_high, parent=None):
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
self.__pixitem = GraphicsPixmapWidget(parent=self, scaleContents=True,
aspectMode=Qt.IgnoreAspectRatio)
self.__pixitem.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Preferred)
self.__pixitem.setMinimumHeight(12)
layout.addItem(self.__pixitem)
self.__update()
Expand Down