Skip to content

Commit cc724ec

Browse files
authored
Fix error on sample log plot resize (#39248)
* fix error on sample log plot resize * add release note
1 parent 994e3de commit cc724ec

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Minimizing the sample log plot on the ``SampleLogs`` widget so that it is not visible no longer throws an error.

qt/python/mantidqt/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,11 @@ def test_workspace_updates(self):
4848
assert pres.view.isVisible()
4949
DeleteWorkspace("new_name")
5050
assert not pres.view.isVisible()
51+
52+
def test_minimum_canvas_size(self):
53+
ws = CreateSampleWorkspace()
54+
pres = SampleLogs(ws)
55+
pres.view.show_plot_and_stats(True)
56+
pres.view.canvas.resize(-1, -1)
57+
self.assertEqual(0, pres.view.canvas.width())
58+
self.assertEqual(0, pres.view.canvas.height())

qt/python/mantidqt/mantidqt/widgets/samplelogs/view.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
QFrame,
2525
QSpacerItem,
2626
)
27-
from qtpy.QtCore import QItemSelectionModel, Qt, Signal
27+
from qtpy.QtCore import QItemSelectionModel, Qt, Signal, QSize
2828
from mantidqt.widgets.observers.observing_view import ObservingView
2929
from mantidqt.MPLwidgets import FigureCanvas
3030
from mantid.api import Workspace
@@ -123,6 +123,7 @@ def __init__(self, presenter, parent=None, window_flags=Qt.Window, name="", isMD
123123
self.fig = Figure()
124124
self.canvas = FigureCanvas(self.fig)
125125
self.canvas.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
126+
self.canvas.setMinimumSize(QSize(0, 0))
126127
self.canvas.mpl_connect("button_press_event", self.presenter.plot_clicked)
127128
self.ax = self.fig.add_subplot(111, projection="mantid")
128129
layout_right.addWidget(self.canvas)
@@ -169,7 +170,7 @@ def set_model(self, model):
169170
self.table.selectionModel().selectionChanged.connect(self.presenter.update)
170171

171172
def show_plot_and_stats(self, show_plot_and_stats):
172-
"""sets wether the plot and stats section should be visible"""
173+
"""sets whether the plot and stats section should be visible"""
173174
if self.frame_right.isVisible() != show_plot_and_stats:
174175
# the desired state is nor the current state
175176
self.setUpdatesEnabled(False)

0 commit comments

Comments
 (0)