nothing

Author: yxdragon

imagepy/ipyalg/graph/sknw.py

@@ -120,14 +120,14 @@ def build_graph(nodes, edges, multi=False, full=True):
     return graph
 
 def mark_node(ske):
-    buf = np.pad(ske, (1,1), mode='constant')
+    buf = np.pad(ske, (1,1), mode='constant').astype(np.uint16)
     nbs = neighbors(buf.shape)
     acc = np.cumprod((1,)+buf.shape[::-1][:-1])[::-1]
     mark(buf, nbs)
     return buf
 
 def build_sknw(ske, multi=False, iso=True, ring=True, full=True):
-    buf = np.pad(ske, (1,1), mode='constant')
+    buf = np.pad(ske, (1,1), mode='constant').astype(np.uint16)
     nbs = neighbors(buf.shape)
     acc = np.cumprod((1,)+buf.shape[::-1][:-1])[::-1]
     mark(buf, nbs)

sciapp/object/surface.py

@@ -89,7 +89,7 @@ def set_data(self, verts=None, faces=None, colors=None, **key):
 		if not faces is None: self.faces = faces.astype(np.uint32, copy=False)
 		if not colors is None: self.colors = colors
 		if not faces is None: self.edge = None
-		if sum([i is None for i in [verts, faces, colors]])<3: self.dirty = 'geom'
+		if sum([i is None for i in [verts, faces]])<2: self.dirty = 'geom'
 		if not self.faces is None and self.faces.ndim==1: key['mode'] = 'points'
 		elif not self.faces is None and self.faces.shape[1]==2: 
 			if key.get('mode', self.mode)=='mesh': key['mode'] = 'grid'

sciwx/mesh/canvas.py

@@ -10,6 +10,20 @@
 # verts, faces, colors, mode, alpha, visible
 # light_dir, light, ambiass, background
 
+from vispy.geometry import MeshData
+
+def get_vertex_normals(self, indexed=None):
+    if self._vertex_normals is None:
+        faceNorms = self.get_face_normals()
+        self._vertex_normals = np.zeros(self._vertices.shape, dtype=np.float32)
+        np.add.at(self._vertex_normals, self._faces.T, faceNorms[None,:,:])
+        v = np.linalg.norm(self._vertex_normals, axis=1)[:,None]
+        self._vertex_normals /= np.clip(v, 1e-5, 1e5, out=v)
+    if indexed is None: return self._vertex_normals
+    elif indexed == 'faces': return self._vertex_normals[self.get_faces()]
+
+MeshData.get_vertex_normals = get_vertex_normals
+
 class MeshVisual(scene.visuals.Mesh):
     def __init__(self, *p, **key):
         scene.visuals.Mesh.__init__(self, *p, **key)
@@ -62,6 +76,7 @@ def viewmesh(mesh, view):
     if isinstance(mesh.cmap, str): cmap = mesh.cmap
     elif mesh.cmap.max()>1+1e-5: cmap = Colormap(mesh.cmap/255)
     else: cmap = Colormap(mesh.cmap)
+    if isinstance(mesh.colors, tuple): view.color = mesh.colors
     view.cmap = cmap
     view.clim = [-1, 1]
     view.visible = mesh.visible