nothing

Author: yxdragon

imagepy/app/imagepy.py

@@ -293,7 +293,8 @@ def on_active_mesh(self, event):
 
     def on_close_mesh(self, event):
         # canvas3d = event.GetEventObject().GetPage(event.GetSelection())
-        self.close_mesh(self.meshnb.canvas().scene3d.name)
+        App.close_mesh(self, self.meshnb.canvas().scene3d.name)
+        event.Skip()
         # self.remove_mesh_win(canvas3d)
 
     def info(self, value):

imagepy/ipyalg/graph/sknw.py

@@ -35,109 +35,148 @@ def idx2rc(idx, acc):
 
 @jit(nopython=True) # fill a node (may be two or more points)
 def fill(img, p, num, nbs, acc, buf):
-    back = img[p]
     img[p] = num
     buf[0] = p
-    cur = 0; s = 1;
+    cur = 0; s = 1; iso = True;
 
     while True:
         p = buf[cur]
         for dp in nbs:
             cp = p+dp
-            if img[cp]==back:
+            if img[cp]==2:
                 img[cp] = num
                 buf[s] = cp
                 s+=1
+            if img[cp]==1: iso=False
         cur += 1
         if cur==s:break
-    return idx2rc(buf[:s], acc)
+    return iso, idx2rc(buf[:s], acc)
 
 @jit(nopython=True) # trace the edge and use a buffer, then buf.copy, if use [] numba not works
 def trace(img, p, nbs, acc, buf):
     c1 = 0; c2 = 0;
     newp = 0
-    cur = 0
-
+    cur = 1
     while True:
         buf[cur] = p
         img[p] = 0
         cur += 1
         for dp in nbs:
             cp = p + dp
             if img[cp] >= 10:
-                if c1==0:c1=img[cp]
-                else: c2 = img[cp]
+                if c1==0:
+                    c1 = img[cp]
+                    buf[0] = cp
+                else:
+                    c2 = img[cp]
+                    buf[cur] = cp
             if img[cp] == 1:
                 newp = cp
         p = newp
         if c2!=0:break
-    return (c1-10, c2-10, idx2rc(buf[:cur], acc))
+    return (c1-10, c2-10, idx2rc(buf[:cur+1], acc))
 
 @jit(nopython=True) # parse the image then get the nodes and edges
-def parse_struc(img, pts, nbs, acc):
+def parse_struc(img, nbs, acc, iso, ring):
     img = img.ravel()
     buf = np.zeros(131072, dtype=np.int64)
     num = 10
     nodes = []
-    for p in pts:
+    for p in range(len(img)):
         if img[p] == 2:
-            nds = fill(img, p, num, nbs, acc, buf)
+            isiso, nds = fill(img, p, num, nbs, acc, buf)
+            if isiso and not iso: continue
             num += 1
             nodes.append(nds)
-
     edges = []
-    for p in pts:
+    for p in range(len(img)):
+        if img[p] <10: continue
+        for dp in nbs:
+            if img[p+dp]==1:
+                edge = trace(img, p+dp, nbs, acc, buf)
+                edges.append(edge)
+    if not ring: return nodes, edges
+    for p in range(len(img)):
+        if img[p]!=1: continue
+        img[p] = num; num += 1
+        nodes.append(idx2rc([p], acc))
         for dp in nbs:
             if img[p+dp]==1:
                 edge = trace(img, p+dp, nbs, acc, buf)
                 edges.append(edge)
     return nodes, edges
 
 # use nodes and edges build a networkx graph
-def build_graph(nodes, edges, multi=False):
+def build_graph(nodes, edges, multi=False, full=True):
+    os = np.array([i.mean(axis=0) for i in nodes])
+    if full: os = os.round().astype(np.uint16)
     graph = nx.MultiGraph() if multi else nx.Graph()
     for i in range(len(nodes)):
-        graph.add_node(i, pts=nodes[i], o=nodes[i].mean(axis=0))
+        graph.add_node(i, pts=nodes[i], o=os[i])
     for s,e,pts in edges:
+        if full: pts[[0,-1]] = os[[s,e]]
         l = np.linalg.norm(pts[1:]-pts[:-1], axis=1).sum()
         graph.add_edge(s,e, pts=pts, weight=l)
     return graph
 
-def buffer(ske):
-    buf = np.zeros(tuple(np.array(ske.shape)+2), dtype=np.uint16)
-    buf[tuple([slice(1,-1)]*buf.ndim)] = ske
+def mark_node(ske):
+    buf = np.pad(ske, (1,1), mode='constant')
+    nbs = neighbors(buf.shape)
+    acc = np.cumprod((1,)+buf.shape[::-1][:-1])[::-1]
+    mark(buf, nbs)
     return buf
-
-def build_sknw(ske, multi=False):
-    buf = buffer(ske)
+    
+def build_sknw(ske, multi=False, iso=True, ring=True, full=True):
+    buf = np.pad(ske, (1,1), mode='constant')
     nbs = neighbors(buf.shape)
     acc = np.cumprod((1,)+buf.shape[::-1][:-1])[::-1]
     mark(buf, nbs)
-    pts = np.array(np.where(buf.ravel()==2))[0]
-    nodes, edges = parse_struc(buf, pts, nbs, acc)
-    return build_graph(nodes, edges, multi)
+    nodes, edges = parse_struc(buf, nbs, acc, iso, ring)
+    return build_graph(nodes, edges, multi, full)
 
 # draw the graph
 def draw_graph(img, graph, cn=255, ce=128):
     acc = np.cumprod((1,)+img.shape[::-1][:-1])[::-1]
     img = img.ravel()
+    for (s, e) in graph.edges():
+        eds = graph[s][e]
+        if isinstance(graph, nx.MultiGraph):
+            for i in eds:
+                pts = eds[i]['pts']
+                img[np.dot(pts, acc)] = ce
+        else: img[np.dot(eds['pts'], acc)] = ce
     for idx in graph.nodes():
         pts = graph.nodes[idx]['pts']
         img[np.dot(pts, acc)] = cn
-    for (s, e) in graph.edges():
-        eds = graph[s][e]
-        for i in eds:
-            pts = eds[i]['pts']
-            img[np.dot(pts, acc)] = ce
 
 if __name__ == '__main__':
-    g = nx.MultiGraph()
-    g.add_nodes_from([1,2,3,4,5])
-    g.add_edges_from([(1,2),(1,3),(2,3),(4,5),(5,4)])
-    print(g.nodes())
-    print(g.edges())
-    a = g.subgraph(1)
-    print('d')
-    print(a)
-    print('d')
-    
+    import matplotlib.pyplot as plt
+
+    img = np.array([
+        [0,0,0,1,0,0,0,0,0],
+        [0,0,0,1,0,0,0,1,0],
+        [0,0,0,1,0,0,0,0,0],
+        [1,1,1,1,0,0,0,0,0],
+        [0,0,0,0,1,0,0,0,0],
+        [0,1,0,0,0,1,0,0,0],
+        [1,0,1,0,0,1,1,1,1],
+        [0,1,0,0,1,0,0,0,0],
+        [0,0,0,1,0,0,0,0,0]])
+
+    node_img = mark_node(img)
+    graph = build_sknw(img, False, iso=True, ring=True)
+    plt.imshow(node_img[1:-1,1:-1], cmap='gray')
+
+    # draw edges by pts
+    for (s,e) in graph.edges():
+        ps = graph[s][e]['pts']
+        plt.plot(ps[:,1], ps[:,0], 'green')
+        
+    # draw node by o
+    nodes = graph.nodes()
+    ps = np.array([nodes[i]['o'] for i in nodes])
+    plt.plot(ps[:,1], ps[:,0], 'r.')
+
+    # title and show
+    plt.title('Build Graph')
+    plt.show()

imagepy/menus/Process/Hydrology/hydrology_plgs.py

@@ -217,7 +217,7 @@ def run(self, ips, snap, img, para = None):
         if not para['ud']:img[:] = 255-img
         mark = watershed(img, markers, line=True, conn=para['con']+1)
         mark = np.multiply((mark==0), 255, dtype=np.uint8)
-
+        
         if para['type'] == 'white line':
             img[:] = mark
         if para['type'] == 'gray line':

sciapp/app.py

@@ -62,7 +62,7 @@ def show_table(self, tab, name):
         if not isinstance(tab, Table): 
             tab = Table(tab, name)
         tab.name = self.tab_manager.name(name)
-        self.tab_manager.add(name, tab)
+        self.tab_manager.add(tab.name, tab)
         print(tab.info)
 
     def close_table(self, name): 

sciapp/object/image.py

@@ -46,14 +46,15 @@ class Image:
     def __init__(self, imgs=None, name='Image'):
         self.name = name
         self.cur = 0
+        self.rg = [(0, 255)]
         self.set_imgs(imgs)
         self.roi = None
         self.mark = None
         self.unit = 1, 'pix'
         self.msk = None
         self.pos = (0,0)
         self.cn = 0
-        self.rg = [(0,255)]
+        
         self.lut = default_lut
         self.log = False
         self.mode = 'set'

sciapp/object/surface.py

@@ -78,7 +78,7 @@ def __init__(self, verts=None, faces=None, colors=None, cmap=None, **key):
 		self.faces = faces.astype(np.uint32, copy=False) if not faces is None else None
 		self.colors = colors
 		self.mode, self.visible, self.dirty = 'mesh', True, 'geom'
-		self.alpha = 1; self.edges = None
+		self.alpha = 1; self.edges = None; self.shiness = 60
 		self.high_light = False; self.cmap = 'gray' if cmap is None else cmap
 		self.set_data(**key)
 
@@ -98,6 +98,7 @@ def set_data(self, verts=None, faces=None, colors=None, **key):
 		self.visible = key.get('visible', self.visible)
 		self.alpha = key.get('alpha', self.alpha)
 		self.high_light = key.get('high_light', False)
+		self.shiness = key.get('shiness', self.shiness)
 		self.cmap = key.get('cmap', self.cmap)
 		self.dirty = self.dirty or True
 
@@ -116,7 +117,7 @@ def __init__(self, texts=None, verts=None, colors=(1,1,1), size=12, **key):
 		self.texts, self.verts, self.size, self.colors = texts, verts, size, colors
 		self.visible, self.dirty = True, 'geom'
 		self.alpha = 1; self.edges = None
-		self.high_light = False;
+		self.high_light = False; self.shiness = 0
 		self.set_data(**key)
 
 	def set_data(self, texts=None, verts=None, colors=None, size=None, **key):
@@ -128,6 +129,7 @@ def set_data(self, texts=None, verts=None, colors=None, size=None, **key):
 		self.visible = key.get('visible', self.visible)
 		self.alpha = key.get('alpha', self.alpha)
 		self.high_light = key.get('high_light', False)
+		self.shiness = key.get('shiness', self.shiness)
 		self.dirty = self.dirty or True
 
 class Surface2d(Mesh):
@@ -171,7 +173,7 @@ def __init__(self, imgs=None, level=0.25, sample=1, step=1, cmap=None, **key):
 		self.imgs, self.level, self.sample, self.step = imgs, level, sample, step
 		self.visible, self.dirty = True, 'geom'
 		self.cmap = 'gray' if cmap is None else cmap
-		self.alpha = 1
+		self.alpha = 1; self.shiness = 0
 		self.high_light = False;
 		self.set_data(**key)
 
@@ -184,5 +186,6 @@ def set_data(self, imgs=None, level=None, step=None, **key):
 		self.visible = key.get('visible', self.visible)
 		self.alpha = key.get('alpha', self.alpha)
 		self.high_light = key.get('high_light', False)
+		self.shiness = key.get('shiness', self.shiness)
 		self.cmap = key.get('cmap', self.cmap)
 		self.dirty = self.dirty or True

sciwx/demo/mesh1_demo.py

@@ -10,10 +10,12 @@
 verts, faces = meshutil.create_ball((0,0,0), 1)
 ball = Mesh(verts=verts, faces=faces, colors=verts[:,2], cmap='jet')
 ball2 = Mesh(verts=verts, faces=faces, colors=verts[:,2], mode='grid')
+ball3 = Mesh(verts=verts, faces=faces, colors=verts[:,2], mode='grid')
 
 def canvas3d_test():
     frame = wx.Frame(None, title='Canvas3D')
-    canvas3d = Canvas3D(frame)
+    canvas3d = Canvas3D(parent=frame)
+    canvas3d.SetBackgroundColour((255,0,0))
     canvas3d.add_obj('ball', ball)
     frame.Show()
 
@@ -35,17 +37,21 @@ def canvas3d_note_book():
     canvas1.add_obj('ball', ball)
     canvas2 = cnb.add_canvas()
     canvas2.add_obj('ball2', ball2)
+    canvas3 = cnb.add_canvas()
+    canvas3.add_obj('ball3', ball3)
     frame.Show()
 
 def canvas3d_note_frame():
     cnf = Canvas3DNoteFrame(None)
     canvas1 = cnf.add_canvas()
-    canvas1.add_obj('ball', ball)
+    canvas1.add_obj('ball1', ball)
+    canvas2 = cnf.add_canvas()
+    canvas2.add_obj('ball2', ball2)
     canvas2 = cnf.add_canvas()
-    canvas2.add_obj('ball', ball2)
+    canvas2.add_obj('ball3', ball3)
     cnf.Show()
 
 if __name__ == '__main__':
     app = wx.App()
-    canvas3d_note_frame()
+    canvas3d_note_book()
     app.MainLoop()