GitLab will be upgraded on June 23rd evening. During the upgrade the service will be unavailable, sorry for the inconvenience.

Commit 81dfc09c authored by Thomas Vincent's avatar Thomas Vincent

Update to FitWidget API and update sliders labels

parent 6b6ea839
......@@ -344,7 +344,7 @@ class QSpaceView(Qt.QMainWindow):
self.__fitWidget = FitWidget(self.__qspaceH5.filename)
self.__fitWidget.roiWidget().sigRoiChanged.connect(self.__slotRoiChanged)
self.__fitWidget.roiWidget().sigRoiToggled.connect(self.__slotRoiToggled)
self.__fitWidget.roiWidget().toggled.connect(self.__slotRoiToggled)
self.__fitWidget.sigProcessStarted.connect(self.__slotFitProcessStarted)
self.__fitWidget.sigProcessDone.connect(self.__slotFitProcessDone)
self.__fitWidget.sigFitTypeChanged.connect(self.__nextFitFile)
......@@ -492,6 +492,10 @@ class QSpaceView(Qt.QMainWindow):
# For spherical, swap from (qr, qincl, qazim) to (qazim, qincl, qr).
qspace = qspace.swapaxes(0, 2)
for widget, label in zip(self.__fitWidget.roiWidget().roiAxisWidgets(),
axisNames):
widget.setText(label)
if self.__view3d is not None:
# swap scale, transition, labels as it is follows x, y, z convention
self.__view3d.setScale(*binSteps)
......@@ -576,7 +580,7 @@ class QSpaceView(Qt.QMainWindow):
"""Update display of ROI on StackView"""
legend = "__QSpaceView_ROI__"
if self.__fitWidget.roiWidget().isActive():
if self.__fitWidget.roiWidget().isChecked():
# Get ROI range for currently displayed axes
roiSliders = tuple(reversed(self.__fitWidget.roiWidget().sliders()))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment