fix some bugs + change view

Author: xnuinside

README.rst

@@ -22,7 +22,12 @@ Pass '-o' flag if you want only print dependencies in console and don't want gra
 
     cg /path/to/your_python_code -o
 
+If you want to change view and play with graph output - you can check 'vizualyzer.py'
+and play with matplotlib and networkX settings.
 
+In default view - red line show dependencies between entities in different modules. Green - entities in module.
+
+![Code Graph - Code there all modules linked together](/docs/img/graph_visualisation.png?raw=true "Graph visualisation")
 
 ![Code Graph - Code with not used module](/docs/img/code_with_trash_module.png?raw=true "Code with not used module")
 ![Code Graph - Code there all modules linked together](/docs/img/normal_code.png?raw=true "Code with modules that linked together")

codegraph/docs/img/graph_visualisation.png

@@ -5,21 +5,42 @@
 
 
 def draw_graph(modules_entities: Dict) -> None:
-    gr = nx.Graph()
-    module_edges = []
-    sub_edges = []
+    G = nx.DiGraph()
+    module_edges_all = []
+    sub_edges_all = []
     for module in modules_entities:
+        _module = os.path.basename(module)
+        module_edges = []
         for entity in modules_entities[module]:
-            module_edges.append((os.path.basename(module), entity))
+            sub_edges = []
+            module_edges.append((_module, entity))
             for dep in modules_entities[module][entity]:
                 if '.' in dep:
                     dep = dep.split('.')[1].replace('.', '.py')
                 sub_edges.append((entity, dep))
-        gr.add_edges_from(module_edges)
-        gr.add_edges_from(sub_edges)
-    pos = nx.spring_layout(gr)
-    nx.draw(gr, pos, font_size=12, with_labels=False)
+            G.add_edges_from(sub_edges)
+            sub_edges_all += sub_edges
+        if not modules_entities[module]:
+            G.add_node(_module)
+        G.add_edges_from(module_edges)
+        module_edges_all += module_edges
+    pos = nx.spring_layout(G)
+    module_list = [os.path.basename(module) for module in modules_entities]
+    module_list_labels = {module_name: module_name for module_name in module_list}
+
+    entities_labels = {edge[1]: edge[1] for edge in module_edges_all}
+    nx.draw_networkx_nodes(G, pos, nodelist=module_list,
+                           node_color='#009c2c', node_size=800,  node_shape="s", alpha=0.8)
+    nx.draw(G, pos, node_color='#009c2c', arrows=False,  edge_color='#ffffff',  node_shape="o", alpha=0.8)
+
+    nx.draw_networkx_labels(G, pos, labels=module_list_labels, font_weight='bold', font_size=11)
+    nx.draw_networkx_labels(G, pos, labels=entities_labels, font_weight='bold', font_family='Arial', font_size=10)
+    nx.draw_networkx_edges(G, pos, edgelist=module_edges_all,
+                           edge_color='#009c2c', width=2,
+                           arrows=False, style="dashed", node_size=50)
+    nx.draw_networkx_edges(G, pos, edgelist=sub_edges_all,
+                           edge_color='r', width=2,
+                           arrows=False, style="dashed")
     for p in pos:  # raise text positions
         pos[p][1] += 0.07
-    nx.draw_networkx_labels(gr, pos)
     plt.show()

codegraph/vizualyzer.py

@@ -20,6 +20,11 @@ pytest = "^3.0"
 [tool.poetry.scripts]
 cg = 'codegraph.main:cli'
 
+[tool.poetry-dynamic-versioning]
+enable = true
+vcs = "git"
+style = "pep440"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"