|
9 | 9 | from PyQt5 import QtWidgets
|
10 | 10 | from pyqtgraph import mkPen
|
11 | 11 | from PyQt5.QtGui import QPixmap
|
12 |
| -from PyQt5.QtWidgets import (QCheckBox, QVBoxLayout, QFileDialog, QLabel, QGroupBox, QActionGroup, QAction, QSplitter, |
13 |
| - QTabWidget) |
| 12 | +from PyQt5.QtWidgets import (QSplitter, QTabWidget, QCheckBox, QVBoxLayout, QFileDialog, QLabel, QGroupBox, |
| 13 | + QActionGroup, QAction) |
14 | 14 | from PyQt5.QtCore import QModelIndex
|
15 | 15 | from logging import getLogger
|
16 | 16 |
|
|
27 | 27 | from mantidimaging.gui.widgets.spectrum_widgets.fitting_param_form_widget import FittingParamFormWidget
|
28 | 28 | from mantidimaging.gui.widgets.spectrum_widgets.export_settings_widget import FitExportFormWidget
|
29 | 29 | from mantidimaging.gui.widgets.spectrum_widgets.export_data_table_widget import ExportDataTableWidget
|
| 30 | +from mantidimaging.gui.widgets.spectrum_widgets.export_image_widget import ExportImageViewWidget |
30 | 31 |
|
31 | 32 | import numpy as np
|
32 | 33 |
|
@@ -64,7 +65,6 @@ def __init__(self, main_window: MainWindowView):
|
64 | 65 | super().__init__(None, 'gui/ui/spectrum_viewer.ui')
|
65 | 66 |
|
66 | 67 | self.main_window = main_window
|
67 |
| - |
68 | 68 | splitter = self.findChild(QSplitter, "splitter")
|
69 | 69 | sidebar = self.findChild(QTabWidget, "formTabs")
|
70 | 70 |
|
@@ -99,6 +99,19 @@ def __init__(self, main_window: MainWindowView):
|
99 | 99 | self.scalable_roi_widget = FittingParamFormWidget(self.presenter)
|
100 | 100 | self.fittingFormLayout.layout().addWidget(self.scalable_roi_widget)
|
101 | 101 |
|
| 102 | + self.export_display_tabs = QTabWidget(self) |
| 103 | + self.exportDataTableWidget = ExportDataTableWidget() |
| 104 | + self.export_display_tabs.addTab(self.exportDataTableWidget, "Table") |
| 105 | + |
| 106 | + self._export_image_widget = ExportImageViewWidget(self) |
| 107 | + self.export_display_tabs.addTab(self._export_image_widget, "Image") |
| 108 | + self.exportLayout.addWidget(self.export_display_tabs) |
| 109 | + export_image = self.spectrum_widget.image.image_item.image |
| 110 | + if export_image is not None: |
| 111 | + self._export_image_widget.update_image(export_image) |
| 112 | + self.spectrum_widget.image.image_item.sigImageChanged.connect( |
| 113 | + lambda: self._export_image_widget.update_image(self.spectrum_widget.image.image_item.image)) |
| 114 | + |
102 | 115 | self.exportSettingsWidget = FitExportFormWidget()
|
103 | 116 | self.exportFormLayout.layout().addWidget(self.exportSettingsWidget)
|
104 | 117 | self.exportSettingsWidget.exportButton.clicked.connect(self.presenter.handle_export_table)
|
@@ -155,8 +168,6 @@ def __init__(self, main_window: MainWindowView):
|
155 | 168 |
|
156 | 169 | self.roi_form.exportButton.clicked.connect(self.presenter.handle_export_csv)
|
157 | 170 | self.roi_form.exportButtonRITS.clicked.connect(self.presenter.handle_rits_export)
|
158 |
| - self.exportDataTableWidget = ExportDataTableWidget() |
159 |
| - self.exportLayout.addWidget(self.exportDataTableWidget) |
160 | 171 |
|
161 | 172 | self.roi_form.table_view.clicked.connect(self.handle_table_click)
|
162 | 173 |
|
|
0 commit comments