Allow to add singleton axes on export

Author: k-dominik

volumina/pixelpipeline/datasources/lazyflowsource.py

@@ -108,6 +108,7 @@ def __init__(self, outslot, priority=0):
         self._op5 = opReorderAxes.OpReorderAxes(
             parent=outslot.getRealOperator().parent, graph=outslot.getRealOperator().graph
         )
+        self._op5.name = "hehehe"
         self._op5.Input.connect(outslot)
         self._op5.AxisOrder.setValue("txyzc")
 

volumina/widgets/dataExportOptionsDlg.py

@@ -405,8 +405,9 @@ 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()
@@ -415,17 +416,16 @@ def validate(self, userAxes, pos):
             userSet = set(str(userAxes))
 
             # Ensure all user axes appear in the input
-            if not (userSet <= inputSet):
+            if not userSet.issubset(self._valid_axes):
                 return (QValidator.Invalid, userAxes, pos)
 
             # Ensure no repeats
             if len(userSet) != len(userAxes):
                 return (QValidator.Invalid, userAxes, pos)
 
-            # If missing non-singleton axes, maybe intermediate entry
-            # (It's okay to omit singleton axes)
-            for key in inputSet - userSet:
-                if taggedShape[key] != 1:
+            # Ensure no non-singleton axis was omitted:
+            for key in self._valid_axes - userSet:
+                if taggedShape.get(key, 1) != 1:
                     return (QValidator.Intermediate, userAxes, pos)
 
             return (QValidator.Acceptable, userAxes, pos)