networkx upgrade

Author: yxdragon

imagepy/__init__.py

@@ -29,7 +29,7 @@ def show(ui = True):
 		AS.AS_SHADOW_BITMAP,
 		shadowcolour=shadow)
 
-	ImagePy(None).Show()	
+	ImagePy(None).Show()
 	app.MainLoop()
 
 

imagepy/core/myvi/manager.py

@@ -221,7 +221,8 @@ def draw(self):
 		self.ctx.enable(moderngl.DEPTH_TEST)
 		#self.ctx.enable(ModernGL.CULL_FACE)
 		self.ctx.enable(moderngl.BLEND)
-		for i in self.objs.values(): i.draw(self.mvp, self.light, self.bright, self.scatter)
+		for i in self.objs.values():
+                    i.draw(self.mvp, self.light, self.bright, self.scatter)
 
 	def count_box(self):
 		minb = np.array([i.box[0] for i in self.objs.values() if not i.box is None]).min(axis=0)
@@ -283,4 +284,4 @@ def show(self, title='Myvi'):
 
 if __name__ == '__main__':
 	img = imread('gis.png')
-	build_surf2d(img)
+	build_surf2d(img)

imagepy/ipyalg/graph/sknw.py

@@ -122,7 +122,7 @@ def draw_graph(img, graph, cn=255, ce=128):
     acc = np.cumprod((1,)+img.shape[::-1][:-1])[::-1]
     img = img.ravel()
     for idx in graph.nodes():
-        pts = graph.node[idx]['pts']
+        pts = graph.nodes[idx]['pts']
         img[np.dot(pts, acc)] = cn
     for (s, e) in graph.edges():
         eds = graph[s][e]

imagepy/menus/Analysis/Region Analysis/regionprops_plgs.py

@@ -62,7 +62,7 @@ def run(self, ips, imgs, para = None):
             texts = [(i.centroid[::-1])+('id=%d'%n,) for i,n in zip(ls,range(len(ls)))]
             layer['body'].append({'type':'texts', 'body':texts})
             if para['cov']:
-                ellips = [i.centroid[::-1] + (i.major_axis_length/2,i.minor_axis_length/2,i.orientation) for i in ls]
+                ellips = [i.centroid[::-1] + (i.major_axis_length/2,i.minor_axis_length/2, i.orientation+np.pi/2) for i in ls]
                 layer['body'].append({'type':'ellipses', 'body':ellips})
             mark['body'][i] = layer
 

imagepy/menus/Analysis/Skeleton Network/graph_plgs.py

@@ -20,7 +20,7 @@ def draw(self, dc, f, **key):
         dc.SetFont(font)
 
         ids = self.graph.nodes()
-        pts = [self.graph.node[i]['o'] for i in ids]
+        pts = [self.graph.nodes[i]['o'] for i in ids]
         pts = [f(i[1], i[0]) for i in pts]
         dc.DrawPointList(pts)
         dc.DrawTextList([str(i) for i in ids], pts)
@@ -53,7 +53,7 @@ def run(self, ips, imgs, para = None):
         comid = 0
         for g in nx.connected_component_subgraphs(ips.data, False):
             for idx in g.nodes():
-                o = g.node[idx]['o']
+                o = g.nodes[idx]['o']
                 print(idx, g.degree(idx))
                 nodes.append([comid, idx, g.degree(idx), round(o[1]*k,2), round(o[0]*k,2)])
             for (s, e) in g.edges():
@@ -166,8 +166,8 @@ def run(self, ips, imgs, para = None):
                 if len(e1)!=1 or len(e2)!=1: continue
                 e1, e2 = e1[0], e2[0]
             l1, l2 = e1['pts'], e2['pts']
-            d1 = norm(l1[0]-g.node[n]['o']) > norm(l1[-1]-g.node[n]['o'])
-            d2 = norm(l2[0]-g.node[n]['o']) < norm(l2[-1]-g.node[n]['o'])
+            d1 = norm(l1[0]-g.nodes[n]['o']) > norm(l1[-1]-g.nodes[n]['o'])
+            d2 = norm(l2[0]-g.nodes[n]['o']) < norm(l2[-1]-g.nodes[n]['o'])
             pts = np.vstack((l1[::[-1,1][d1]], l2[::[-1,1][d2]]))
             l = np.linalg.norm(pts[1:]-pts[:-1], axis=1).sum()
             g.remove_node(n)

imagepy/menus/Kit3D/Network 3D/toolkit3d_plgs.py

@@ -49,12 +49,12 @@ def run(self, ips, imgs, para = None):
 		balls, ids, rs, graph = [], [], [], ips.data
 		for idx in graph.nodes():
 			ids.append(idx)
-			balls.append(graph.node[idx]['o'])
+			balls.append(graph.nodes[idx]['o'])
 		xs, ys, zs = [], [], []
 		lxs, lys, lzs = [], [], []
 		for (s, e) in graph.edges():
 			eds = graph[s][e]
-			st, ed = graph.node[s]['o'], graph.node[e]['o']
+			st, ed = graph.nodes[s]['o'], graph.nodes[e]['o']
 			lxs.append([st[0],ed[0]])
 			lys.append([st[1],ed[1]])
 			lzs.append([st[2],ed[2]])
@@ -102,14 +102,14 @@ def run(self, ips, imgs, para = None):
 		balls, ids, rs, graph = [], [], [], ips.data
 		for idx in graph.nodes():
 			ids.append(idx)
-			balls.append(graph.node[idx]['o'])
+			balls.append(graph.nodes[idx]['o'])
 
 
 		xs, ys, zs = [], [], []
 		v1s, v2s = [], []
 		for (s, e) in graph.edges():
 			eds = graph[s][e]
-			st, ed = graph.node[s]['o'], graph.node[e]['o']
+			st, ed = graph.nodes[s]['o'], graph.nodes[e]['o']
 			v1s.append(st)
 			v2s.append(ed)
 			for i in eds:
@@ -157,13 +157,13 @@ def run(self, ips, imgs, para = None):
 		comid = 0
 		for g in nx.connected_component_subgraphs(ips.data, False):
 			for idx in g.nodes():
-				o = g.node[idx]['o']
+				o = g.nodes[idx]['o']
 				nodes.append([comid, idx, g.degree(idx), round(o[1]*k,2), round(o[0]*k,2), round(o[2])])
 			for (s, e) in g.edges():
 				eds = g[s][e]
 				for i in eds:
 					l = round(eds[i]['weight']*k, 2)
-					dis = round(np.linalg.norm(g.node[s]['o']-g.node[e]['o'])*k, 2)
+					dis = round(np.linalg.norm(g.nodes[s]['o']-g.nodes[e]['o'])*k, 2)
 					edges.append([comid, s, e, l, dis])
 			comid += 1
 
@@ -215,7 +215,7 @@ def run(self, ips, imgs, para = None):
 		graph = ips.data
 		datas = []
 		for s in graph.nodes():
-			o = graph.node[s]['o']
+			o = graph.nodes[s]['o']
 			x = graph[s]
 			if len(x)<=1: continue
 			rst = []
@@ -302,8 +302,8 @@ def run(self, ips, imgs, para = None):
                 if len(e1)!=1 or len(e2)!=1: continue
                 e1, e2 = e1[0], e2[0]
             l1, l2 = e1['pts'], e2['pts']
-            d1 = norm(l1[0]-g.node[n]['o']) > norm(l1[-1]-g.node[n]['o'])
-            d2 = norm(l2[0]-g.node[n]['o']) < norm(l2[-1]-g.node[n]['o'])
+            d1 = norm(l1[0]-g.nodes[n]['o']) > norm(l1[-1]-g.nodes[n]['o'])
+            d2 = norm(l2[0]-g.nodes[n]['o']) < norm(l2[-1]-g.nodes[n]['o'])
             pts = np.vstack((l1[::[-1,1][d1]], l2[::[-1,1][d2]]))
             l = np.linalg.norm(pts[1:]-pts[:-1], axis=1).sum()
             g.remove_node(n)

imagepy/menus/Plugins/Games/drawstep_plg.py

@@ -41,8 +41,8 @@ def build_graph(graph, dis, step=True):
         for i in eds:
             if step:ls.append(ls[-1].copy())
             pts = eds[i]['pts']
-            ptss = graph.node[s]['pts']
-            ptse = graph.node[e]['pts']
+            ptss = graph.nodes[s]['pts']
+            ptse = graph.nodes[e]['pts']
             pts = np.vstack((ptss,pts,ptse))
             draw_edge(ls[-1], dis, pts)
     return ls if step else ls[0]