Bugfix in Nifti1.__determineTransform - a scaling matrix should be used

when both q/sforms are unknown. Otherwise should default to
nibabel. Also added method to MelodicClassification to return all labels.

fsl/data/image.py

@@ -137,7 +137,7 @@ class Nifti(object):
         # corresponds to world location (0, 0, 0).
         # This goes against the NIFTI spec - it
         # should just be a straight scaling matrix.
-        elif header['qform_code'] == 0 or header['sform_code'] == 0:
+        elif header['qform_code'] == 0 and header['sform_code'] == 0:
             pixdims       = header.get_zooms()
             voxToWorldMat = transform.scaleOffsetXform(pixdims, 0)
 

fsl/data/melodiclabels.py

@@ -163,6 +163,13 @@ class MelodicClassification(notifier.Notifier):
         return list(self.__labels[component])
 
 
+    def getAllLabels(self):
+        """Returns all labels that are currently associated with any
+        component.
+        """
+        return list(self.__components.keys())
+
+
     def hasLabel(self, component, label):
         """Returns ``True`` if the specified component has the specified label,
         ``False`` otherwise.