Bugfix in transform (numpy.linalg.dot does not exist - it's

numpy.dot). And a few tweaks elsewhere

fsl/fslview/displaycontext.py

@@ -318,15 +318,15 @@ class ImageDisplay(props.HasProperties):
             pixdim = self.image.pixdim
             voxToDisplayMat = np.diag([pixdim[0], pixdim[1], pixdim[2], 1.0])
         elif self.transform == 'affine':
-            voxToDisplayMat = self.image.voxToWorldMat
+            voxToDisplayMat = self.voxToWorldMat
 
         voxToDisplayMat = np.array(voxToDisplayMat, dtype=np.float32)
         displayToVoxMat = transform.invert(voxToDisplayMat)
 
         # Transformation matrices for moving between the voxel
         # coordinate system and the display coordinate system
-        self.voxToDisplayMat = voxToDisplayMat.transpose()
-        self.displayToVoxMat = displayToVoxMat.transpose()
+        self.voxToDisplayMat = voxToDisplayMat
+        self.displayToVoxMat = displayToVoxMat
 
         # Matrices for moving between the display coordinate
         # system, and the image world coordinate system

fsl/fslview/views/orthopanel.py

@@ -290,10 +290,6 @@ class OrthoPanel(canvaspanel.CanvasPanel):
         for changes on its affine transformation matrix.
         """
         
-        self._refreshLabels()
-
-        if len(self._imageList) == 0: return
-
         for i, img in enumerate(self._imageList):
 
             display = img.getAttribute('display')
@@ -307,6 +303,12 @@ class OrthoPanel(canvaspanel.CanvasPanel):
                                     self._name,
                                     self._refreshLabels)
 
+        # _refreshLabels will in turn call
+        # _layoutChanged, which is needed
+        # in case the display bounds have
+        # changed
+        self._refreshLabels()
+
 
     def _onDestroy(self, ev):
         """Called when this panel is destroyed. 
@@ -585,6 +587,9 @@ class OrthoPanel(canvaspanel.CanvasPanel):
         self._zCanvasPanel.Show(self.showZCanvas)
 
         if len(canvases) == 0:
+            self.Layout()
+            self.getCanvasPanel().Layout()
+            self.Refresh() 
             return
 
         # Regardless of the layout, we use a

fsl/utils/transform.py

@@ -20,7 +20,7 @@ def invert(x):
 
 def concat(x1, x2):
     """Combines the two matrices (returns the dot product)."""
-    return linalg.dot(x1, x2)
+    return np.dot(x1, x2)
 
 
 def axisBounds(shape, xform, axis):