From af574f26e80e2cdb941b3fcec92cb2c3fedf7c35 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 21 Jan 2018 18:13:15 +0000
Subject: [PATCH] Duh, Mesh.init(fixWinding) was not being passed through. Use
absolute data file path for vertex data key.
---
fsl/data/mesh.py | 7 ++++---
fsl/data/vtk.py | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fsl/data/mesh.py b/fsl/data/mesh.py
index 580f535c3..d74e89e31 100644
--- a/fsl/data/mesh.py
+++ b/fsl/data/mesh.py
@@ -214,7 +214,7 @@ class Mesh(notifier.Notifier, meta.Meta):
# Add initial vertex
# set if provided
if vertices is not None:
- self.addVertices(vertices)
+ self.addVertices(vertices, fixWinding=fixWinding)
def __repr__(self):
@@ -417,8 +417,9 @@ class Mesh(notifier.Notifier, meta.Meta):
nvertices = self.vertices.shape[0]
- if vdata.shape[0] != nvertices:
- raise ValueError('Incompatible vertex data size: {}'.format(key))
+ if vdata.ndim not in (1, 2) or vdata.shape[0] != nvertices:
+ raise ValueError('{}: incompatible vertex data '
+ 'shape: {}'.format(key, vdata.shape))
self.__vertexData[key] = vdata.reshape(nvertices, -1)
diff --git a/fsl/data/vtk.py b/fsl/data/vtk.py
index 24835e7a3..f39a868ef 100644
--- a/fsl/data/vtk.py
+++ b/fsl/data/vtk.py
@@ -71,8 +71,8 @@ class VTKMesh(fslmesh.Mesh):
fslmesh.Mesh.__init__(self,
indices,
- name,
- dataSource,
+ name=name,
+ dataSource=dataSource,
vertices=data,
fixWinding=fixWinding)
--
GitLab