Skip to content

Commit 2cf1bf2

Browse files
committed
Fix for crash when changing GDOS
1 parent 410c614 commit 2cf1bf2

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

src/mslice/plotting/plot_window/plot_figure_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def release_active_interactive_cuts_on_slice_plots() -> None:
2525
action_icuts = plot_handler.plot_window.action_interactive_cuts
2626
if not action_icuts.isChecked():
2727
continue
28-
plot_handler.toggle_interactive_cuts()
28+
plot_handler.toggle_interactive_cuts(True)
2929
action_icuts.setChecked(False)
3030

3131

src/mslice/plotting/plot_window/slice_plot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ def _update_lines(self):
521521
self._canvas.draw()
522522

523523
def toggle_interactive_cuts(self, store=True):
524-
self.toggle_icut_button(store)
524+
self.toggle_icut_button(True)
525525
self.toggle_icut()
526526

527527
def toggle_icut_button(self, store=True):

src/mslice/presenters/cut_plotter_presenter.py

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from mslice.models.cut.cut_functions import compute_cut
1010
from mslice.models.labels import generate_legend
1111
from mslice.models.workspacemanager.workspace_algorithms import export_workspace_to_ads
12-
from mslice.models.workspacemanager.workspace_provider import get_workspace_handle
12+
from mslice.models.workspacemanager.workspace_provider import add_workspace, get_workspace_handle
1313
import mslice.plotting.pyplot as plt
1414
from mslice.presenters.presenter_utility import PresenterUtility
1515
from mslice.plotting.plot_window.overplot_interface import (
@@ -18,7 +18,6 @@
1818
)
1919
from mslice.models.powder.powder_functions import compute_powder_line
2020
from mslice.models.intensity_correction_algs import sample_temperature
21-
from mslice.models.workspacemanager.workspace_provider import add_workspace
2221
from mslice.models.axis import Axis
2322
from mslice.util.intensity_correction import IntensityType, IntensityCache
2423
import warnings
@@ -350,24 +349,40 @@ def _show_intensity(self, cut_cache, intensity_correction):
350349
self._temp_cut_cache = []
351350

352351
def show_scattering_function(self, axes):
353-
self._show_intensity(
354-
self._cut_cache_dict[axes], IntensityType.SCATTERING_FUNCTION
355-
)
352+
for key, value in self._cut_cache_dict.items():
353+
if key == axes:
354+
self._show_intensity(value, IntensityType.SCATTERING_FUNCTION)
355+
break
356356

357357
def show_dynamical_susceptibility(self, axes):
358-
self._show_intensity(self._cut_cache_dict[axes], IntensityType.CHI)
358+
for key, value in self._cut_cache_dict.items():
359+
if key == axes:
360+
self._show_intensity(value, IntensityType.CHI)
361+
break
359362

360363
def show_dynamical_susceptibility_magnetic(self, axes):
361-
self._show_intensity(self._cut_cache_dict[axes], IntensityType.CHI_MAGNETIC)
364+
for key, value in self._cut_cache_dict.items():
365+
if key == axes:
366+
self._show_intensity(value, IntensityType.CHI_MAGNETIC)
367+
break
362368

363369
def show_d2sigma(self, axes):
364-
self._show_intensity(self._cut_cache_dict[axes], IntensityType.D2SIGMA)
370+
for key, value in self._cut_cache_dict.items():
371+
if key == axes:
372+
self._show_intensity(value, IntensityType.D2SIGMA)
373+
break
365374

366375
def show_symmetrised(self, axes):
367-
self._show_intensity(self._cut_cache_dict[axes], IntensityType.SYMMETRISED)
376+
for key, value in self._cut_cache_dict.items():
377+
if key == axes:
378+
self._show_intensity(value, IntensityType.SYMMETRISED)
379+
break
368380

369381
def show_gdos(self, axes):
370-
self._show_intensity(self._cut_cache_dict[axes], IntensityType.GDOS)
382+
for key, value in self._cut_cache_dict.items():
383+
if key == axes:
384+
self._show_intensity(value, IntensityType.GDOS)
385+
break
371386

372387
def set_sample_temperature(self, axes, ws_name, temp):
373388
cut_dict = {}

0 commit comments

Comments
 (0)