fixup! source axistags from input, allow for singleton axes when changing order

Author: k-dominik

volumina/widgets/dataExportOptionsDlg.py

@@ -374,7 +374,9 @@ def _handleAxisOrderChecked(checked):
 
         self.outputAxisOrderEdit.editingFinished.connect(_handleNewAxisOrder)
         self.outputAxisOrderEdit.textChanged.connect(partial(self._updateAxisOrderColor, True))
-        self.outputAxisOrderEdit.setValidator(DataExportOptionsDlg._AxisOrderValidator(self, self._opDataExport.Input))
+        self.outputAxisOrderEdit.setValidator(
+            DataExportOptionsDlg._AxisOrderValidator(self, self._opDataExport.ConvertedImage)
+        )
         self.outputAxisOrderEdit.installEventFilter(DataExportOptionsDlg._AxisOrderEventFilter(self))
         self.axisOrderCheckbox.toggled.connect(_handleAxisOrderChecked)
 
@@ -403,18 +405,18 @@ def eventFilter(self, watched, event):
 
     class _AxisOrderValidator(QValidator):
         def __init__(self, parent, inputSlot):
-            super(DataExportOptionsDlg._AxisOrderValidator, self).__init__(parent)
+            super().__init__(parent)
             self._inputSlot = inputSlot
+            self._valid_axes = set("tzyxc")
 
         def validate(self, userAxes, pos):
             taggedShape = self._inputSlot.meta.getTaggedShape()
-            originalAxes = self._inputSlot.meta.getOriginalAxisKeys()
-            inputAxes = list(originalAxes)
+            inputAxes = list(taggedShape.keys())
             inputSet = set(inputAxes)
             userSet = set(str(userAxes))
 
             # Ensure all user axes appear in the input
-            if not (userSet <= inputSet):
+            if not inputSet.issubset(self._valid_axes):
                 return (QValidator.Invalid, userAxes, pos)
 
             # Ensure no repeats