d3graph 2.4.3__tar.gz → 2.4.4__tar.gz

{d3graph-2.4.3/d3graph.egg-info → d3graph-2.4.4}/PKG-INFO

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: d3graph
-Version: 2.4.3
+Version: 2.4.4
 Summary: Python package to create interactive network based on d3js.
 Home-page: https://erdogant.github.io/d3graph
-Download-URL: https://github.com/erdogant/d3graph/archive/2.4.3.tar.gz
+Download-URL: https://github.com/erdogant/d3graph/archive/2.4.4.tar.gz
 Author: Erdogan Taskesen
 Author-email: erdogant@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
@@ -121,5 +119,3 @@ Please cite d3graph in your publications if this is useful for your research. Se
 * Erdogan Taskesen, github: [erdogant](https://github.com/erdogant)
 * Contributions are welcome.
 * If you wish to buy me a <a href="https://erdogant.github.io/donate/?currency=USD&amount=5">Coffee</a> for this work, it is very appreciated :)
-
-

{d3graph-2.4.3 → d3graph-2.4.4}/d3graph/__init__.py

@@ -12,7 +12,7 @@ from d3graph.d3graph import (
 
 __author__ = 'Erdogan Tasksen'
 __email__ = 'erdogant@gmail.com'
-__version__ = '2.4.3'
+__version__ = '2.4.4'
 
 
 # module level doc-string

{d3graph-2.4.3 → d3graph-2.4.4}/d3graph/d3graph.py

@@ -193,7 +193,17 @@ class d3graph:
             if os.path.isfile(file_location):
                 webbrowser.open(file_location, new=2)
 
-    def set_edge_properties(self, edge_distance: int = None, scaler: str = 'zscore', minmax: List[float] = None, directed: bool = False, marker_start=None, marker_end='arrow', marker_color='#808080', label='') -> dict:
+    def set_edge_properties(self,
+                            edge_distance: int = None,
+                            scaler: str = 'zscore',
+                            minmax: List[float] = None,
+                            directed: bool = False,
+                            marker_start=None,
+                            marker_end='arrow',
+                            marker_color='#808080',
+                            label: str = None,
+                            label_color = '#808080',
+                            label_fontsize : int = 8) -> dict:
         """Edge properties.
 
         Parameters
@@ -219,6 +229,15 @@ class d3graph:
         marker_end : (list of) str, (default: 'arrow')
             The end of the edge can be one of the following markers:
             'arrow','square','circle','stub',None or ''
+        marker_color : str, (default: '#808080')
+            The label color in hex.
+        label : str, (default: '')
+            The edge label.
+        label_color : str, (default: None)
+            The label color in hex.
+            None : Inherits the color from marker_color.
+        label_fontsize : int, (default: 8)
+            The fontsize of the label.
 
         Returns
         -------
@@ -229,8 +248,7 @@ class d3graph:
                 'color': color of the edge
 
         """
-        if minmax is None:
-            minmax = [0.5, 15.0]
+        if minmax is None: minmax = [0.5, 15.0]
         self.config['directed'] = directed
         self.config['edge_distance'] = 30 if edge_distance is None else edge_distance
         self.config['minmax'] = minmax
@@ -239,6 +257,8 @@ class d3graph:
         self.config['marker_end'] = marker_end
         self.config['marker_color'] = marker_color
         self.config['label'] = label
+        self.config['label_color'] = label_color
+        self.config['label_fontsize'] = label_fontsize
 
         if (not directed) and (marker_end is not None) or (marker_start is not None):
             logger.info('Set directed=True to see the markers!')
@@ -253,6 +273,8 @@ class d3graph:
                                            marker_end=self.config['marker_end'],
                                            marker_color=self.config['marker_color'],
                                            label=self.config['label'],
+                                           label_color=self.config['label_color'],
+                                           label_fontsize=self.config['label_fontsize'],
                                            )
 
         logger.debug('Number of edges: %.0d', len(self.edge_properties.keys()))
@@ -796,6 +818,8 @@ def json_create(G: nx.Graph) -> str:
         links[i]['marker_end'] = links[i]['marker_end']
         links[i]['marker_color'] = links[i]['marker_color']
         links[i]['label'] = links[i]['label']
+        links[i]['label_color'] = links[i]['label_color']
+        links[i]['label_fontsize'] = links[i]['label_fontsize']
         links_new.append(links[i])
     nodes = pd.DataFrame([*G.nodes.values()]).T.to_dict()
     nodes_new = [None] * len(nodes)
@@ -816,7 +840,17 @@ def json_create(G: nx.Graph) -> str:
 
 
 # %%  Convert adjacency matrix to vector
-def adjmat2dict(adjmat: pd.DataFrame, min_weight: float = 0.0, scaler: str = 'zscore', minmax=None, marker_start=None, marker_end='arrow', marker_color='#808080', label='') -> dict:
+def adjmat2dict(adjmat: pd.DataFrame,
+                min_weight: float = 0.0,
+                scaler: str = 'zscore',
+                minmax=None,
+                marker_start=None,
+                marker_end='arrow',
+                marker_color='#808080',
+                label=None,
+                label_color='#808080',
+                label_fontsize: int = 8,
+                ) -> dict:
     """Convert adjacency matrix into vector with source and target.
 
     Parameters
@@ -833,6 +867,21 @@ def adjmat2dict(adjmat: pd.DataFrame, min_weight: float = 0.0, scaler: str = 'zs
     minmax : tuple(int,int), (default: [0.5, 15])
         Weights are normalized between minimum and maximum
         * [0.5, 15]
+    marker_start : (list of) str, (default: 'arrow')
+        The start of the edge can be one of the following markers:
+        'arrow','square','circle','stub',None or ''
+    marker_end : (list of) str, (default: 'arrow')
+        The end of the edge can be one of the following markers:
+        'arrow','square','circle','stub',None or ''
+    marker_color : str, (default: '#808080')
+        The label color in hex.
+    label : str, (default: None)
+        The edge label.
+    label_color : str, (default: None)
+        The label color in hex.
+        None : Inherits the color from marker_color.
+    label_fontsize : int, (default: 8)
+        The fontsize of the label.
 
     Returns
     -------
@@ -845,11 +894,12 @@ def adjmat2dict(adjmat: pd.DataFrame, min_weight: float = 0.0, scaler: str = 'zs
             'marker_end': '', 'circle', 'square', 'arrow', 'stub'
             'marker_color': hex color of the marker.
             'label': Text label for the edge.
+            'label_color': color of the label.
+            'label_fontsize': fontsize of the label.
 
     """
     # Convert adjacency matrix into vector
-    if minmax is None:
-        minmax = [0.5, 15]
+    if minmax is None: minmax = [0.5, 15]
     df = adjmat.stack().reset_index()
     # Set columns
     df.columns = ['source', 'target', 'weight']
@@ -873,10 +923,14 @@ def adjmat2dict(adjmat: pd.DataFrame, min_weight: float = 0.0, scaler: str = 'zs
     if marker_start is None: marker_start=''
     if marker_end is None: marker_end=''
     if label is None: label=''
+
+    # Store in dataframe
     df['marker_start']=marker_start
     df['marker_end']=marker_end
     df['marker_color']=marker_color
     df['label']=label
+    df['label_color']=label_color
+    df['label_fontsize']=label_fontsize
 
     # Creation dictionary
     source_target = list(zip(df['source'], df['target']))
@@ -886,7 +940,10 @@ def adjmat2dict(adjmat: pd.DataFrame, min_weight: float = 0.0, scaler: str = 'zs
                    'color': '#808080', 'marker_start': df['marker_start'].iloc[i],
                    'marker_end': df['marker_end'].iloc[i],
                    'marker_color': df['marker_color'].iloc[i],
-                   'label': df['label'].iloc[i]} for
+                   'label': df['label'].iloc[i],
+                   'label_color': df['label_color'].iloc[i],
+                   'label_fontsize': df['label_fontsize'].iloc[i],
+                   } for
             i, edge in enumerate(source_target)}
 
 
@@ -920,6 +977,8 @@ def edges2G(edge_properties: dict, G: nx.Graph = None) -> nx.Graph:
                    weight=np.abs(edge_properties[edge]['weight']),
                    color=edge_properties[edge]['color'],
                    label=edge_properties[edge]['label'],
+                   label_color=edge_properties[edge]['label_color'],
+                   label_fontsize=edge_properties[edge]['label_fontsize'],
                    )
     return G
 
@@ -985,6 +1044,11 @@ def make_graph(node_properties: dict, edge_properties: dict) -> dict:
 def _normalize_size(getsizes, minscale: Union[int, float] = 0.5, maxscale: Union[int, float] = 4, scaler: str = 'zscore'):
     # Instead of Min-Max scaling, that shrinks any distribution in the [0, 1] interval, scaling the variables to
     # Z-scores is better. Min-Max Scaling is too sensitive to outlier observations and generates unseen problems,
+
+    # Set sizes to 0 if not available
+    getsizes[np.isinf(getsizes)]=0
+    getsizes[np.isnan(getsizes)]=0
+
     # out-of-scale datapoints.
     if scaler == 'zscore' and len(np.unique(getsizes)) > 3:
         getsizes = (getsizes.flatten() - np.mean(getsizes)) / np.std(getsizes)

{d3graph-2.4.3 → d3graph-2.4.4}/d3graph/d3js/d3graphscript.js

@@ -64,7 +64,7 @@ function d3graphscript(config = {
     .links(graph.links)
     .start();
 
-  // Create all the line svgs but without locations yet
+ // Create all the line svgs but without locations yet
   var link = svg.selectAll(".link")
     .data(graph.links)
     .enter().append("line")
@@ -77,6 +77,18 @@ function d3graphscript(config = {
 //  .style("stroke-width", 1); // WIDTH OF THE LINKS
   ;
 
+  // ADD TEXT ON THE EDGES (PART 1/2)
+   var linkText = svg.selectAll(".link-text")
+     .data(graph.links)
+     .enter().append("text")
+     .attr("class", "link-text")
+     .attr("font-size", function(d) {return d.label_fontsize + "px";})
+     .style("fill", function(d) {return d.label_color;})
+     .style("font-family", "Arial")
+     //.attr("transform", "rotate(90)")
+     .text(function(d) { return d.label; });
+
+
   //Do the same with the circles for the nodes
   var node = svg.selectAll(".node")
     .data(graph.nodes)
@@ -121,7 +133,11 @@ function d3graphscript(config = {
     d3.selectAll("circle").attr("cx", function(d) { return d.x; })
       .attr("cy", function(d) { return d.y; });
     d3.selectAll("text").attr("x", function(d) { return d.x; })
-      .attr("y", function(d) { return d.y; });
+      .attr("y", function(d) { return d.y; })
+	linkText.attr("x", function(d) { return (d.source.x + d.target.x) / 2; })  // ADD TEXT ON THE EDGES (PART 2/2)
+      .attr("y", function(d) { return (d.source.y + d.target.y) / 2; })
+      .attr("text-anchor", "middle");
+      ;
 
     node.each(collide(config.collision)); //COLLISION DETECTION. High means a big fight to get untouchable nodes (default=0.5)
 

{d3graph-2.4.3 → d3graph-2.4.4}/d3graph/examples.py

@@ -6,24 +6,64 @@ from d3graph import d3graph, adjmat2vec
 
 # %% Edge link
 d3 = d3graph()
-adjmat, df = d3.import_example('bigbang')
+adjmat, df = d3.import_example('karate')
+d3.graph(adjmat, color='cluster')
+d3.show(filepath=r'c:\temp\\d3graph\d3graph1.html')
+
+# %% Edge link
+
+# Import
+from d3graph import d3graph
+# intialize to load example dataset
+d3 = d3graph()
+adjmat, _ = d3.import_example('bigbang')
+
+# Initialize with clustering colors
 d3.graph(adjmat, color='cluster')
-d3.set_edge_properties(directed=True, marker_end='square', marker_color='#000000', label='TEST')
 
+# Set all edge labels to "test"
+d3.set_edge_properties(directed=True, label='test')
+d3.show(filepath=r'c:\temp\\d3graph\edge_labels_1.html')
+
+# Set edge labels 
 d3.edge_properties
-d3.show(filepath=r'c:\temp\\d3graph\d3graph1.html')
+
+# We will first set all label properties to None and then we will adjust two of them
+d3.set_edge_properties(directed=True, marker_color='#000FFF', label=None)
+d3.edge_properties['Amy', 'Bernadette']['weight_scaled']=10
+d3.edge_properties['Amy', 'Bernadette']['label']='amy-bern'
+d3.edge_properties['Amy', 'Bernadette']['label_color']='#000FFF'
+d3.edge_properties['Amy', 'Bernadette']['label_fontsize']=8
+d3.edge_properties['Bernadette', 'Howard']['label']='bern-how'
+d3.edge_properties['Bernadette', 'Howard']['label_fontsize']=20
+d3.edge_properties['Bernadette', 'Howard']['label_color']='#000000'
+
+d3.show(filepath=r'c:\temp\\d3graph\edge_labels_2.html')
 
 # %% Change color of text
+
+# Import library
 from d3graph import d3graph
 
+# Initialize with defaults
 d3 = d3graph()
-adjmat, df = d3.import_example('bigbang')
-d3.graph(adjmat, color='cluster')
-d3.set_node_properties(color='cluster', scaler='minmax', fontcolor='node_color', fontsize=12)
-d3.show(filepath=r'c:\temp\\d3graph\d3graph.html', click={'fill': 'black'})
-d3.show(filepath=r'c:\temp\\d3graph\d3graph.html')
 
+# Load example
+adjmat, df = d3.import_example('bigbang')
+# Color on clustering
+d3.graph(adjmat)
 fontsize=np.random.randint(low=6, high=40, size=adjmat.shape[0])
+
+# Set some node properties
+d3.set_node_properties(color='cluster', scaler='minmax', fontcolor='node_color')
+
+# Set the click properties: Create green node on click with black border
+d3.show(filepath=r'c:\temp\\d3graph\click_example_1.html', click={'fill': '#00FF00', 'stroke': '#000000'})
+
+# Keep the original color but set the stroke to grey and increase both node size and stroke width
+d3.show(filepath=r'c:\temp\\d3graph\click_example_2.html', click={'fill': None, 'stroke': '#F0F0F0', 'size': 2.5, 'stroke-width': 10})
+
+
 d3.set_node_properties(color='cluster', scaler='minmax', fontcolor='node_color', fontsize=fontsize)
 d3.show(filepath=r'c:\temp\\d3graph\d3graph.html')
 

{d3graph-2.4.3 → d3graph-2.4.4/d3graph.egg-info}/PKG-INFO

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: d3graph
-Version: 2.4.3
+Version: 2.4.4
 Summary: Python package to create interactive network based on d3js.
 Home-page: https://erdogant.github.io/d3graph
-Download-URL: https://github.com/erdogant/d3graph/archive/2.4.3.tar.gz
+Download-URL: https://github.com/erdogant/d3graph/archive/2.4.4.tar.gz
 Author: Erdogan Taskesen
 Author-email: erdogant@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
@@ -121,5 +119,3 @@ Please cite d3graph in your publications if this is useful for your research. Se
 * Erdogan Taskesen, github: [erdogant](https://github.com/erdogant)
 * Contributions are welcome.
 * If you wish to buy me a <a href="https://erdogant.github.io/donate/?currency=USD&amount=5">Coffee</a> for this work, it is very appreciated :)
-
-