d3graph 2.6.1__tar.gz → 2.7.0__tar.gz

{d3graph-2.6.1/d3graph.egg-info → d3graph-2.7.0}/PKG-INFO

@@ -1,49 +1,19 @@
 Metadata-Version: 2.4
 Name: d3graph
-Version: 2.6.1
+Version: 2.7.0
 Summary: Python package to create interactive network based on d3js.
 Author-email: Erdogan Taskesen <erdogant@gmail.com>
-License: d3graph is distributed with the 3-clause BSD license.
-        
-        ::
-        
-           Copyright (C) 2000-2022,
-           Erdogan Taskesen <erdogant@gmail.com>
-           All rights reserved.
-        
-           Redistribution and use in source and binary forms, with or without
-           modification, are permitted provided that the following conditions are
-           met:
-        
-             * Redistributions of source code must retain the above copyright
-               notice, this list of conditions and the following disclaimer.
-        
-             * Redistributions in binary form must reproduce the above
-               copyright notice, this list of conditions and the following
-               disclaimer in the documentation and/or other materials provided
-               with the distribution.
-        
-             * Neither the name of the d3graph nor the names of its
-               contributors may be used to endorse or promote products derived
-               from this software without specific prior written permission.
-        
-           THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-           "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-           LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-           A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-           OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-           SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-           LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-           DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-           (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://erdogant.github.io/d3graph
 Project-URL: Download, https://github.com/erdogant/d3graph/archive/{version}.tar.gz
-Keywords: Python,
+Keywords: Python,network,graph,network analysis,visualization,interactive,d3js,d3graph,data visualization,web,modular,customizable
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/__init__.py

@@ -15,7 +15,7 @@ from d3graph.d3graph import (
 
 __author__ = 'Erdogan Tasksen'
 __email__ = 'erdogant@gmail.com'
-__version__ = '2.6.1'
+__version__ = '2.7.0'
 
 # Setup root logger
 _logger = logging.getLogger('d3graph')
@@ -63,7 +63,6 @@ Examples
 References
 ----------
 * D3Graph: erdogant.medium.com
-* D3Blocks: https://medium.com/data-science-collective/d3blocks-the-python-library-to-create-interactive-standalone-and-beautiful-d3-js-charts-ef8c65286e86
 * Github : https://github.com/erdogant/d3graph
 * Documentation: https://erdogant.github.io/d3graph/
 

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/d3graph.py

@@ -12,7 +12,7 @@ import webbrowser
 from json import dumps
 from pathlib import Path
 from sys import platform
-from tempfile import TemporaryDirectory, gettempdir
+from tempfile import gettempdir
 from unicodedata import normalize
 import uuid
 
@@ -27,9 +27,6 @@ from packaging import version
 import datazets as dz
 
 logger = logging.getLogger(__name__)
-if not logger.hasHandlers():
-    logging.basicConfig(level=logging.INFO, format='[{asctime}] [{name}] [{levelname}] {msg}', style='{', datefmt='%d-%m-%Y %H:%M:%S')
-
 
 # %%
 class d3graph:
@@ -58,8 +55,7 @@ class d3graph:
 
     References
     ----------
-    * D3Graph: https://erdogant.medium.com/
-    * D3Blocks: https://medium.com/data-science-collective/d3blocks-the-python-library-to-create-interactive-standalone-and-beautiful-d3-js-charts-ef8c65286e86
+    * Medium: https://erdogant.medium.com/
     * Github : https://github.com/erdogant/d3graph
     * Documentation: https://erdogant.github.io/d3graph/
 
@@ -70,8 +66,17 @@ class d3graph:
                  charge: int = 600,
                  slider=None,
                  support: str = 'text',
+                 link_tension: float = 1,
+                 sticky: bool = True,
                  verbose: int = 20) -> None:
-        """Initialize d3graph."""
+        """Initialize d3graph.
+
+        Parameters (additional to existing)
+        ------------------------------------
+        sticky : bool, (default: False)
+            When True, nodes stay fixed in place after being dragged.
+            Right-click a fixed node to release it back into the simulation.
+        """
         if slider is None: slider = [None, None]
         # Cleaning
         self._clean()
@@ -85,6 +90,8 @@ class d3graph:
         self.config['charge'] = -abs(charge)
         self.config['slider'] = slider
         self.config['support'] = get_support(support)
+        self.config['link_tension'] = link_tension
+        self.config['sticky'] = sticky
         # Set paths
         self.config['curpath'] = os.path.dirname(os.path.abspath(__file__))
         self.config['d3_library'] = os.path.abspath(os.path.join(self.config['curpath'], 'd3js/d3.v3.js'))
@@ -110,6 +117,8 @@ class d3graph:
              dark_mode = False,
              notebook: bool = False,
              save_button: bool = True,
+             link_tension: float = None,
+             sticky: bool = None,
              ) -> None:
         """Build and show the graph.
 
@@ -150,6 +159,11 @@ class d3graph:
         save_button : bool, (default: True)
             True: Save button is shown in the HTML to save the image in svg.
             False: No save button is shown in the HTML.
+        sticky : bool, (default: None)
+            When True, nodes stay fixed in place after being dragged (overrides the value set in __init__).
+            When False, nodes are released after dragging (default simulation behaviour).
+            When None, the value set in __init__ is used.
+            Right-click a fixed node to release it back into the simulation.
 
         Returns
         -------
@@ -171,6 +185,12 @@ class d3graph:
         self.config['save_button'] = save_button
         self.config['background_color'] = background_color
         self.config['dark_mode'] = dark_mode
+        # Allow show() to override the link_tension set at __init__ time
+        if link_tension is not None:
+            self.config['link_tension'] = link_tension
+        # Override sticky only when explicitly passed
+        if sticky is not None:
+            self.config['sticky'] = sticky
         # if self.config.get('filepath', None) != 'd3graph.html':
         self.config['filepath'] = self.set_path(filepath)
 
@@ -308,6 +328,10 @@ class d3graph:
         self.config['label'] = label
         self.config['label_color'] = label_color
         self.config['label_fontsize'] = label_fontsize
+        
+        if not hasattr(self, 'adjmat'):
+            logger.error('adjmat is missing. Initialize first with d3 = d3graph(adjmat)')
+            return
 
         if (not directed) and (marker_end is not None) or (marker_start is not None):
             logger.info('Set directed=True to see the markers!')
@@ -447,6 +471,10 @@ class d3graph:
                 'edge_color': edge_color of the node
 
         """
+        if not hasattr(self, 'adjmat'):
+            logger.error('adjmat is missing. Initialize first with d3 = d3graph(adjmat)')
+            return
+
         if minmax is None: minmax = [8, 13]
         node_names = self.adjmat.columns.astype(str)
         nodecount = self.adjmat.shape[0]
@@ -763,6 +791,8 @@ class d3graph:
                    'max_slider': self.config['slider'][1],
                    'directed': self.config['directed'],
                    'collision': self.config['collision'],
+                   'link_tension': self.config.get('link_tension', 1.0),
+                   'sticky': self.config.get('sticky', False),
                    'CLICK_COMMENT': CLICK_COMMENT,
                    'CLICK_FILL': click_properties['fill'],
                    'CLICK_STROKE': click_properties['stroke'],
@@ -823,10 +853,10 @@ class d3graph:
             dirname = os.path.join(gettempdir(), 'd3graph')
         else:
             dirname, filename = os.path.split(filepath)
-    
+
             if filename in (None, ''):
                 filename = 'd3graph.html'
-    
+
             if dirname in (None, ''):
                 dirname = os.path.join(gettempdir(), 'd3graph')
 
@@ -1009,6 +1039,7 @@ def json_create(G: nx.Graph) -> str:
         links[i]['label'] = links[i]['label']
         links[i]['label_color'] = links[i]['label_color']
         links[i]['label_fontsize'] = links[i]['label_fontsize']
+        links[i]['tooltip'] = links[i]['tooltip']
         links_new.append(links[i])
 
     # Set node properties
@@ -1125,6 +1156,7 @@ def adjmat2dict(adjmat: pd.DataFrame,
             'label': Text label for the edge.
             'label_color': color of the label.
             'label_fontsize': fontsize of the label.
+            'tooltip': Text that is shown when hovering over the edge.
 
     """
     # Convert adjacency matrix into vector
@@ -1191,16 +1223,10 @@ def adjmat2dict(adjmat: pd.DataFrame,
     df['label_color']=label_color
     df['label_fontsize']=label_fontsize
     df['edge_style']=edge_style
+    df['edge_color']=edge_color
     df['edge_opacity'] = edge_opacity
+    df['tooltip'] = df['weight'].astype(str)
 
-    # Handle node_source edge color
-    if edge_color == 'node_source' and node_color_map is not None:
-        df['edge_color'] = df['source'].map(node_color_map)
-    elif edge_color == 'node_target' and node_color_map is not None:
-        df['edge_color'] = df['target'].map(node_color_map)
-    else:
-        df['edge_color'] = edge_color
-        
     # Creation dictionary
     source_target = list(zip(df['source'], df['target']))
     if len(source_target)==0:
@@ -1218,6 +1244,7 @@ def adjmat2dict(adjmat: pd.DataFrame,
                    'label': df['label'].iloc[i],
                    'label_color': df['label_color'].iloc[i],
                    'label_fontsize': df['label_fontsize'].iloc[i],
+                   'tooltip': df['tooltip'].iloc[i]
                    } for
             i, edge in enumerate(source_target)}
 
@@ -1294,6 +1321,7 @@ def edges2G(edge_properties: dict, G: nx.Graph = None) -> nx.Graph:
                    label=edge_properties[edge]['label'],
                    label_color=edge_properties[edge]['label_color'],
                    label_fontsize=edge_properties[edge]['label_fontsize'],
+                   tooltip=edge_properties[edge]['tooltip']
                    )
     return G
 
@@ -1360,6 +1388,7 @@ def _normalize_size(getsizes, minscale=0.5, maxscale=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.
 
+    getsizes = getsizes.copy()
     # Set sizes to 0 if not available
     getsizes[np.isinf(getsizes)]=0
     getsizes[np.isnan(getsizes)]=0
@@ -1737,4 +1766,4 @@ def get_support(support):
         script = script + '\n' + "<div data-ea-publisher='erdogantgithubio' data-ea-type='{TYPE}' data-ea-style='stickybox'></div>".replace('{TYPE}', support)
 
     # Return
-    return script
+    return script

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/d3js/d3graphscript.js

@@ -1,4 +1,3 @@
-
 function d3graphscript(config = {
     // Default values
     width: 800,
@@ -7,6 +6,8 @@ function d3graphscript(config = {
     distance: 0,
     directed: false,
     collision: 0.5,
+    link_tension: 1,
+    sticky: false,
     background_color: '#FFFFFF'
     }) {
 
@@ -14,6 +15,7 @@ function d3graphscript(config = {
   var width = config.width;
   var height = config.height;
   var background_color = config.background_color || '#FFFFFF';
+  var sticky = config.sticky || false;
 
   // Set the body background color
   document.body.style.backgroundColor = background_color;
@@ -25,20 +27,42 @@ function d3graphscript(config = {
     .charge(config.charge)
     .linkDistance((d) => d.edge_distance || config.distance)
     //.linkDistance((d) => config.distance > 0 ? config.distance : d.edge_weight)
+    .linkStrength(config.link_tension !== undefined ? config.link_tension : 1)
     .size([width, height]);
 
-  // DRAGGING START
+  // ---- DRAGGING ----
+  // Sticky mode: dragstart fixes the node so the simulation stops pulling it.
+  //   dragend keeps it pinned (dashed stroke indicator).
+  //   Right-click a pinned node to release it back into the simulation.
+  // Normal mode: standard free-drag behaviour is preserved.
+
   function dragstarted(d) {
     d3.event.sourceEvent.stopPropagation();
     d3.select(this).classed("dragging", true);
+    if (sticky) {
+      d.fixed = true;
+      force.start();
+    }
   }
 
   function dragged(d) {
-    d3.select(this).attr("cx", d.x = d3.event.x).attr("cy", d.y = d3.event.y);
+    if (sticky) {
+      d.x = d.px = d3.event.x;
+      d.y = d.py = d3.event.y;
+    } else {
+      d3.select(this).attr("cx", d.x = d3.event.x).attr("cy", d.y = d3.event.y);
+    }
   }
 
   function dragended(d) {
     d3.select(this).classed("dragging", false);
+    if (sticky) {
+      // Keep the node fixed and apply a visual "pinned" cue (dashed border)
+      d.fixed = true;
+      d3.select(this).select("circle")
+        .style("stroke-dasharray", "4,2")
+        .style("stroke-width", function(d) { return Math.max(parseFloat(d.node_size_edge) || 1, 2); });
+    }
   }
 
   var drag = force.drag()
@@ -47,7 +71,7 @@ function d3graphscript(config = {
     .on("drag", dragged)
     .on("dragend", dragended);
 
-  // DRAGGING STOP
+  // ---- END DRAGGING ----
 
   //Append a SVG to the body of the html page. Assign this SVG as an object to svg
   var svg = d3.select("body").append("svg")
@@ -58,8 +82,6 @@ function d3graphscript(config = {
     .on("dblclick.zoom", null)
     .append("g")
 
-  //.on("dblclick", threshold); // EXPLODE ALL CONNECTED POINTS
-
   graphRec = JSON.parse(JSON.stringify(graph));
 
   //Creates the graph data structure out of the json data
@@ -67,31 +89,31 @@ 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")
     .attr("class", "link")
     .attr('marker-start', function(d){ return 'url(#marker_' + d.marker_start + ')' })
-	.attr("marker-end", function(d) {
-    	if (config.directed) {return 'url(#marker_' + d.marker_end + ')' }})
+    .attr("marker-end", function(d) {
+      if (config.directed) {return 'url(#marker_' + d.marker_end + ')' }})
     .style("stroke-width", function(d) {return d.edge_width;})          // LINK-WIDTH
     .style("stroke", function(d) {return d.edge_color;})                 // EDGE-COLORS
     .style("stroke-dasharray", function(d) {return d.edge_style;})      // EDGE-STYLE
     .style("opacity", function(d) {return d.edge_opacity;})             // EDGE-OPACITY
-//  .style("stroke-width", 1); // WIDTH OF THE LINKS
   ;
 
+  link.append("title").text(function(d) { return d.tooltip; });
+
   // 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; });
+  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")
+    .text(function(d) { return d.label; });
 
   //Do the same with the circles for the nodes
   var node = svg.selectAll(".node")
@@ -101,26 +123,37 @@ function d3graphscript(config = {
     .call(drag)
     .on('dblclick', connectedNodes); // HIGHLIGHT ON/OFF
 
+  // Right-click handler: release a pinned node back into the simulation (sticky mode only)
+  if (sticky) {
+    node.on('contextmenu', function(d) {
+      d3.event.preventDefault();
+      d.fixed = false;
+      // Remove pinned visual cue
+      d3.select(this).select("circle")
+        .style("stroke-dasharray", null)
+        .style("stroke-width", function(d) { return d.node_size_edge; });
+      force.resume();
+    });
+  }
+
   {{ CLICK_COMMENT }} node.on('click', color_on_click); // ON CLICK HANDLER
 
 
   node.append("circle")
-    .attr("r", function(d) { return d.node_size; })					// NODE SIZE
-    .style("fill", function(d) {return d.node_color;})				// NODE-COLOR
-    .style("opacity", function(d) {return d.node_opacity;}) 	    // NODE-OPACITY
-    .style("stroke-width", function(d) {return d.node_size_edge;})	// NODE-EDGE-SIZE
-    .style("stroke", function(d) {return d.node_color_edge;})		// NODE-COLOR-EDGE
-  //  .style("stroke", '#000')										// NODE-EDGE-COLOR (all black)
+    .attr("r", function(d) { return d.node_size; })                 // NODE SIZE
+    .style("fill", function(d) {return d.node_color;})              // NODE-COLOR
+    .style("opacity", function(d) {return d.node_opacity;})         // NODE-OPACITY
+    .style("stroke-width", function(d) {return d.node_size_edge;})  // NODE-EDGE-SIZE
+    .style("stroke", function(d) {return d.node_color_edge;})       // NODE-COLOR-EDGE
 
   // Text in nodes
   node.append("text")
     .attr("dx", 10)
     .attr("dy", ".35em")
-    .text(function(d) {return d.node_name}) // NODE-TEXT
-    .style("font-size", function(d) {return d.node_fontsize + "px";}) // set font size equal to node edge size
-	.style("fill", function(d) {return d.node_fontcolor;}) // set the text fill color to the same as node color
-	.style("font-family", "monospace");
-//  .style("stroke", "gray");
+    .text(function(d) {return d.node_name})                               // NODE-TEXT
+    .style("font-size", function(d) {return d.node_fontsize + "px";})     // NODE FONT SIZE
+    .style("fill", function(d) {return d.node_fontcolor;})                // NODE FONT COLOR
+    .style("font-family", "monospace");
 
   let showInHover = ["node_tooltip"]; // Tooltip
   node.append("title")
@@ -140,10 +173,9 @@ function d3graphscript(config = {
       .attr("cy", function(d) { return d.y; });
     d3.selectAll("text").attr("x", function(d) { return d.x; })
       .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)
+    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)
 
@@ -158,8 +190,6 @@ function d3graphscript(config = {
   , { id: 3, name: 'stub', path: 'M 0,0 m -1,-5 L 1,-5 L 1,5 L -1,5 Z', viewbox: '-1 -5 2 10' }
   ]
 
-  //console.log(JSON.stringify(link))
-
   svg.append("defs").selectAll("marker")
     .data(data_marker)
     .enter()
@@ -167,17 +197,13 @@ function d3graphscript(config = {
       .attr('id', function(d){ return 'marker_' + d.name})
       .attr('markerHeight', 10)
       .attr('markerWidth', 10)
-      //.attr('markerUnits', 'strokeWidth')
       .attr("markerUnits", "userSpaceOnUse")                   // Fix marker width
       .attr('orient', 'auto')
-      //.attr('refX', -15)                                     // Offset marker-start
       .attr('refX', 15)                                        // Offset marker-end
       .attr('refY', 0)
       .attr('viewBox', function(d){ return d.viewbox })
       .append('svg:path')
-	    //.attr("transform", "rotate(180)")                    // Marker-start mirrored
         .attr('d', function(d){ return d.path })               // Marker type
-        //.style("fill", function(d) {return d.marker_color;}) // Marker color
         .style("fill", '#808080')                              // Marker color
         .style("stroke", '#808080')                            // Marker edge-color
         .style("opacity", 0.95)                                // Marker opacity
@@ -219,7 +245,7 @@ function d3graphscript(config = {
   // collision detection end
 
 
-  //Toggle stores whether the highlighting is on **********************
+  //Toggle stores whether the highlighting is on
   var toggle = 0;
   //Create an array logging what is connected to what
   var linkedByIndex = {};
@@ -235,25 +261,27 @@ function d3graphscript(config = {
   }
 
 
-    // COLOR ON CLICK
-	function color_on_click() {
-		// Give the original color back
-		d3.selectAll(".node")
-		.select("circle")
-		.style("fill", function(d) {return d.node_color;})
-		.style("opacity", function(d) {return d.node_opacity;})
-		.style("stroke", function(d) {return d.node_color_edge;})
-		.style("stroke-width", function(d) {return d.edge_width;})
-		.attr("r", function(d) { return d.node_size; })
-		;
+  // COLOR ON CLICK
+  function color_on_click() {
+    // Give the original color back to all nodes
+    d3.selectAll(".node")
+    .select("circle")
+    .style("fill", function(d) {return d.node_color;})
+    .style("opacity", function(d) {return d.node_opacity;})
+    .style("stroke", function(d) {return d.node_color_edge;})
+    .style("stroke-width", function(d) {return d.node_size_edge;})
+    // Restore pinned cue on still-fixed nodes
+    .style("stroke-dasharray", function(d) { return (sticky && d.fixed) ? "4,2" : null; })
+    .attr("r", function(d) { return d.node_size; })
+    ;
 
-		// Set the color on click
-		d3.select(this).select("circle")
-		.style("fill", {{ CLICK_FILL }})
-		.style("stroke", "{{ CLICK_STROKE }}")
-		.style("stroke-width", {{ CLICK_STROKEW }})
-		.attr("r", function(d) { return d.node_size*{{ CLICK_SIZE }}; })
-		;}
+    // Set the color on the clicked node
+    d3.select(this).select("circle")
+    .style("fill", {{ CLICK_FILL }})
+    .style("stroke", "{{ CLICK_STROKE }}")
+    .style("stroke-width", {{ CLICK_STROKEW }})
+    .attr("r", function(d) { return d.node_size*{{ CLICK_SIZE }}; })
+    ;}
 
 
 
@@ -267,7 +295,6 @@ function d3graphscript(config = {
       link.style("opacity", function(o) {
         return d.index == o.source.index | d.index == o.target.index ? 1 : 0.1;
       });
-      //Reduce the op
       toggle = 1;
     } else {
       //Put them back to opacity=1
@@ -277,14 +304,12 @@ function d3graphscript(config = {
       toggle = 0;
     }
   }
-  //*************************************************************
 
 
   //adjust threshold
   function threshold() {
     let thresh = this.value;
 
-    // console.log('Setting threshold', thresh)
     graph.links.splice(0, graph.links.length);
     linkText = linkText.data([]);   // CLEAR EDGE-LABELS: Clear the linkText selection
     linkText.exit().remove();       // CLEAR EDGE-LABELS: Clear the linkText elements from the DOM
@@ -312,12 +337,11 @@ function d3graphscript(config = {
     link.exit().remove();
     link.enter().insert("line", ".node").attr("class", "link");
     link.style("stroke-width", function(d) {return d.edge_width;});           // LINK-WIDTH AFTER BREAKING WITH SLIDER
-    //link.style('marker-start', function(d){ return 'url(#marker_' + d.marker_start  + ')' })
-	link.style("marker-end", function(d) {                                    // Include the markers.
-		if (config.directed) {return 'url(#marker_' + d.marker_end + ')' }})
-    link.style("stroke", function(d) {return d.edge_color;});                      // EDGE-COLOR AFTER BREAKING WITH SLIDER
-    link.style("stroke-dasharray", function(d) {return d.edge_style;})      // EDGE-STYLE
-    link.style("opacity", function(d) {return d.edge_opacity;});             // EDGE-OPACITY AFTER BREAKING WITH SLIDER
+    link.style("marker-end", function(d) {                                    // Include the markers.
+      if (config.directed) {return 'url(#marker_' + d.marker_end + ')' }})
+    link.style("stroke", function(d) {return d.edge_color;});                 // EDGE-COLOR AFTER BREAKING WITH SLIDER
+    link.style("stroke-dasharray", function(d) {return d.edge_style;})        // EDGE-STYLE
+    link.style("opacity", function(d) {return d.edge_opacity;});              // EDGE-OPACITY AFTER BREAKING WITH SLIDER
 
     // Update EDGE-LABELS
     linkText = linkText.data(graph.links);
@@ -334,4 +358,4 @@ function d3graphscript(config = {
     force.start();
   }
 
-}
+}

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/d3js/index.html.j2

@@ -126,6 +126,8 @@
                 distance: {{ edge_distance }},
                 directed: {{ directed | lower }},
                 collision: {{ collision }},
+                link_tension: {{ link_tension }},
+                sticky: {{ sticky | lower }},
                 background_color: '{{ background_color }}'
             })
         });

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/d3js/style.css

@@ -16,4 +16,10 @@ h3 {
   font-style: italic;
   font-size: 14px;
   font-family: "Helvetica";
+}
+
+/* Sticky / fixed node indicator: dashed outline ring */
+circle.node-fixed {
+  stroke-dasharray: 4, 2;
+  stroke-width: 2.5px;
 }

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph/examples.py

@@ -1,6 +1,108 @@
 # Import library
 from d3graph import d3graph, vec2adjmat
 
+# Initialize with default settings
+d3 = d3graph(link_tension=0.2)
+
+# Load example data
+df = d3.import_example('stormofswords')
+adjmat = vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
+
+
+# sticky=True (default) — drag to pin, right-click to release
+d3 = d3graph(adjmat, sticky=True)
+d3.show()
+
+# sticky=False — classic spring-back behaviour
+d3 = d3graph(adjmat, sticky=False)
+d3.show()
+
+# Can also be overridden per-render:
+d3.show(adjmat, sticky=False)
+d3.show()
+
+
+# %%
+
+
+# Import library
+from d3graph import d3graph, vec2adjmat
+
+# Initialize with default settings
+d3 = d3graph(sticky=True, link_tension=0.2, collision=1)
+
+# Load example data
+df = d3.import_example('stormofswords')
+
+# Convert df to adjmat
+adjmat = vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
+# adjmat = np.exp(adjmat)
+# adjmat = adjmat-1
+
+# Create the network
+d3.graph(adjmat)
+
+# Set Node properties
+d3.set_node_properties(edge_color='#000000', cmap='Blues', minmax=[5, 13], fontcolor='#808080')
+# Show the graph
+# d3.show()
+
+# d3.set_edge_properties(directed=False, marker_end='arrow', edge_color='#ff0000', edge_opacity=[0.1, 0.2])
+
+# Set edge properties
+d3.set_edge_properties(directed=True, marker_end='arrow')
+d3.show()
+
+
+
+
+# Import library
+# from d3graph import d3graph, vec2adjmat
+
+# Initialize with default settings
+# d3 = d3graph(support=None)
+
+# Load example data
+# df = d3.import_example('stormofswords')
+
+# Convert df to adjmat
+# adjmat = vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
+# adjmat = np.exp(adjmat)
+# adjmat = adjmat-1
+
+# Create the network
+# d3.graph(adjmat)
+
+# # Set Node properties
+# # d3.set_node_properties(edge_color='#000000', cmap='Blues', minmax=[5, 13], fontcolor='#808080')
+# d3.set_edge_properties(edge_color='#FF0000')
+
+# # Show the graph
+# d3.show()
+
+# # %%
+
+
+# %% opacity
+from d3graph import d3graph, adjmat2vec, vec2adjmat
+# intialize to load example dataset
+d3 = d3graph()
+# 
+df = d3.import_example(data='energy')
+df=vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
+# d3.graph(df, size='degree', opacity='degree', color='cluster', scaler='zscore')
+d3.graph(df)
+
+# d3.set_node_properties(opacity='centrality')
+d3.show(filepath='c://temp/network.html')
+
+
+# %%
+
+
+# Import library
+from d3graph import d3graph, vec2adjmat
+
 # Initialize with default settings
 d3 = d3graph(support=None)
 
@@ -74,7 +176,7 @@ df_edges_c['isin']=0
 
 for index, edge in df_edges.iterrows():
     Iloc = np.sum(edge==df_edges_c[df_edges.columns], axis=1)==len(df_edges.columns)
-    df_edges_c['isin'][Iloc]=1
+    df_edges_c.loc[Iloc, 'isin'] = 1
 
 assert df_edges_c['isin'].sum()==df_edges.shape[0]
 
@@ -162,19 +264,6 @@ d3.set_node_properties(marker=['circle', 'circle', 'circle', 'rect', 'rect', 're
 d3.show(filepath=r'c:\temp\\d3graph\circle.html', set_slider=5, save_button=False)
 
 
-# %% opacity
-from d3graph import d3graph, adjmat2vec
-# intialize to load example dataset
-d3 = d3graph()
-# 
-df = d3.import_example(data='energy')
-df=vec2adjmat(source=df['source'], target=df['target'], weight=df['weight'])
-# d3.graph(df, size='degree', opacity='degree', color='cluster', scaler='zscore')
-d3.graph(df)
-
-# d3.set_node_properties(opacity='centrality')
-d3.show(filepath='c://temp/network.html')
-
 
 # %% Edge distance
 

{d3graph-2.6.1 → d3graph-2.7.0/d3graph.egg-info}/PKG-INFO

@@ -1,49 +1,19 @@
 Metadata-Version: 2.4
 Name: d3graph
-Version: 2.6.1
+Version: 2.7.0
 Summary: Python package to create interactive network based on d3js.
 Author-email: Erdogan Taskesen <erdogant@gmail.com>
-License: d3graph is distributed with the 3-clause BSD license.
-        
-        ::
-        
-           Copyright (C) 2000-2022,
-           Erdogan Taskesen <erdogant@gmail.com>
-           All rights reserved.
-        
-           Redistribution and use in source and binary forms, with or without
-           modification, are permitted provided that the following conditions are
-           met:
-        
-             * Redistributions of source code must retain the above copyright
-               notice, this list of conditions and the following disclaimer.
-        
-             * Redistributions in binary form must reproduce the above
-               copyright notice, this list of conditions and the following
-               disclaimer in the documentation and/or other materials provided
-               with the distribution.
-        
-             * Neither the name of the d3graph nor the names of its
-               contributors may be used to endorse or promote products derived
-               from this software without specific prior written permission.
-        
-           THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-           "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-           LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-           A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-           OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-           SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-           LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-           DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-           (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://erdogant.github.io/d3graph
 Project-URL: Download, https://github.com/erdogant/d3graph/archive/{version}.tar.gz
-Keywords: Python,
+Keywords: Python,network,graph,network analysis,visualization,interactive,d3js,d3graph,data visualization,web,modular,customizable
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE

{d3graph-2.6.1 → d3graph-2.7.0}/d3graph.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-setup.cfg
 d3graph/__init__.py
 d3graph/d3graph.py
 d3graph/examples.py
@@ -15,5 +14,4 @@ d3graph.egg-info/top_level.txt
 d3graph/d3js/d3.v3.js
 d3graph/d3js/d3graphscript.js
 d3graph/d3js/index.html.j2
-d3graph/d3js/style.css
-tests/test_d3graph.py
+d3graph/d3js/style.css

{d3graph-2.6.1 → d3graph-2.7.0}/pyproject.toml

@@ -9,12 +9,29 @@ authors = [{ name = "Erdogan Taskesen", email = "erdogant@gmail.com" },]
 description = "Python package to create interactive network based on d3js."
 readme = "README.md"
 requires-python = ">=3"
-license = { file = "LICENSE" }
-keywords = ["Python", ""]
+license = "BSD-3-Clause"
+keywords = [
+    "Python",
+    "network",
+    "graph",
+    "network analysis",
+    "visualization",
+    "interactive",
+    "d3js",
+    "d3graph",
+    "data visualization",
+    "web",
+    "modular",
+    "customizable"
+]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
+    "Intended Audience :: Education",
+    "Intended Audience :: Science/Research",
+    "Operating System :: Unix",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: MacOS",
 ]
 dependencies = [
     'pandas',

d3graph-2.7.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

d3graph-2.6.1/setup.cfg

@@ -1,10 +0,0 @@
-[metadata]
-name = d3graph
-
-[options]
-packages = find:
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

d3graph-2.6.1/tests/test_d3graph.py

@@ -1,39 +0,0 @@
-from copy import deepcopy
-import numpy as np
-import pandas as pd
-from d3graph import d3graph, adjmat2vec, vec2adjmat
-
-
-def test_instantiate_d3graph_no_args() -> None:
-    """Test instantiation works with defaults"""
-    d3 = d3graph()
-    assert isinstance(d3, type(d3graph()))
-
-
-def test_clean(d3, helpers) -> None:
-    """Test _clean method deletes the attributes in clean_fields"""
-    clean_fields: tuple = ('adjmat', 'config', 'edge_properties', 'G', 'node_properties')
-
-    # Set attrs to dummy value (i.e., 0) and assert they exist in the object
-    original_attrs = {field: 0 for field in clean_fields}
-
-# Convert the array to a DataFrame for comparison
-def test_adjmat2vec_and_back() -> None:
-    edges  = np.array([('Cloudy', 'Sprinkler'), ('Cloudy', 'Rain'), ('Sprinkler', 'Wet_Grass'), ('Rain', 'Wet_Grass')])
-    weight = [1,2,3,4]
-    df_edges = pd.DataFrame(edges, columns=['source', 'target'])
-    df_edges['weight']=weight
-
-    df_edges_c = adjmat2vec(vec2adjmat(source=df_edges['source'], target=df_edges['target'], weight=df_edges['weight']))
-    adjmat = vec2adjmat(source=df_edges_c['source'], target=df_edges_c['target'], weight=df_edges_c['weight'])
-    df_edges_c = adjmat2vec(adjmat)
-
-    df_edges_c = df_edges_c.sort_values(by='weight')
-    df_edges_c['isin']=0
-
-    for index, edge in df_edges.iterrows():
-        Iloc = np.sum(edge==df_edges_c[df_edges.columns], axis=1)==len(df_edges.columns)
-        df_edges_c['isin'][Iloc]=1
-
-    assert df_edges_c['isin'].sum()==df_edges.shape[0]
-