Merge pull request #147 from kinimesi/master

Fixes #143, close-bilkent to cose-bilkent; fixes #119, added fcose layout

Author: jackparmer

dash_cytoscape/Cytoscape.py

@@ -183,7 +183,7 @@ class attribute).
     - fit (boolean; optional):
         Whether to render the nodes in order to fit the canvas.
 
-    - name (a value equal to: 'random', 'preset', 'circle', 'concentric', 'grid', 'breadthfirst', 'cose', 'close-bilkent', 'cola', 'euler', 'spread', 'dagre', 'klay'; required):
+    - name (a value equal to: 'random', 'preset', 'circle', 'concentric', 'grid', 'breadthfirst', 'cose', 'cose-bilkent', 'fcose', 'cola', 'euler', 'spread', 'dagre', 'klay'; required):
         The layouts available by default are:   `random`: Randomly
         assigns positions.   `preset`: Assigns position based on the
         `position` key in element dictionaries.   `circle`:
@@ -199,6 +199,7 @@ class attribute).
         loading, which impacts the startup time of the app.   The
         external layouts are:
         [cose-bilkent](https://github.com/cytoscape/cytoscape.js-cose-bilkent),
+        [fcose](https://github.com/iVis-at-Bilkent/cytoscape.js-fcose),
         [cola](https://github.com/cytoscape/cytoscape.js-cola),
         [euler](https://github.com/cytoscape/cytoscape.js-dagre),
         [spread](https://github.com/cytoscape/cytoscape.js-spread),

dash_cytoscape/dash_cytoscape.dev.js

@@ -284,7 +284,11 @@
                   "computed": false
                 },
                 {
-                  "value": "'close-bilkent'",
+                  "value": "'cose-bilkent'",
+                  "computed": false
+                },
+                {
+                  "value": "'fcose'",
                   "computed": false
                 },
                 {
@@ -308,7 +312,7 @@
                   "computed": false
                 }
               ],
-              "description": "The layouts available by default are:\n  `random`: Randomly assigns positions.\n  `preset`: Assigns position based on the `position` key in element dictionaries.\n  `circle`: Single-level circle, with optional radius.\n  `concentric`: Multi-level circle, with optional radius.\n  `grid`: Square grid, optionally with numbers of `rows` and `cols`.\n  `breadthfirst`: Tree structure built using BFS, with optional `roots`.\n  `cose`: Force-directed physics simulation.\n\nSome external layouts are also included. To use them, run\n  `dash_cytoscape.load_extra_layouts()` before creating your Dash app. Be careful about\n  using the extra layouts when not necessary, since they require supplementary bandwidth\n  for loading, which impacts the startup time of the app.\n  The external layouts are:\n  [cose-bilkent](https://github.com/cytoscape/cytoscape.js-cose-bilkent),\n  [cola](https://github.com/cytoscape/cytoscape.js-cola),\n  [euler](https://github.com/cytoscape/cytoscape.js-dagre),\n  [spread](https://github.com/cytoscape/cytoscape.js-spread),\n  [dagre](https://github.com/cytoscape/cytoscape.js-dagre),\n  [klay](https://github.com/cytoscape/cytoscape.js-klay),",
+              "description": "The layouts available by default are:\n  `random`: Randomly assigns positions.\n  `preset`: Assigns position based on the `position` key in element dictionaries.\n  `circle`: Single-level circle, with optional radius.\n  `concentric`: Multi-level circle, with optional radius.\n  `grid`: Square grid, optionally with numbers of `rows` and `cols`.\n  `breadthfirst`: Tree structure built using BFS, with optional `roots`.\n  `cose`: Force-directed physics simulation.\n\nSome external layouts are also included. To use them, run\n  `dash_cytoscape.load_extra_layouts()` before creating your Dash app. Be careful about\n  using the extra layouts when not necessary, since they require supplementary bandwidth\n  for loading, which impacts the startup time of the app.\n  The external layouts are:\n  [cose-bilkent](https://github.com/cytoscape/cytoscape.js-cose-bilkent),\n  [fcose](https://github.com/iVis-at-Bilkent/cytoscape.js-fcose),\n  [cola](https://github.com/cytoscape/cytoscape.js-cola),\n  [euler](https://github.com/cytoscape/cytoscape.js-dagre),\n  [spread](https://github.com/cytoscape/cytoscape.js-spread),\n  [dagre](https://github.com/cytoscape/cytoscape.js-dagre),\n  [klay](https://github.com/cytoscape/cytoscape.js-klay),",
               "required": true
             },
             "fit": {

dash_cytoscape/dash_cytoscape.min.js

@@ -33,6 +33,7 @@
     "cytoscape-cose-bilkent": "^4.0.0",
     "cytoscape-dagre": "^2.2.2",
     "cytoscape-euler": "^1.2.1",
+    "cytoscape-fcose": "^2.1.0",
     "cytoscape-klay": "^3.1.2",
     "cytoscape-spread": "^3.0.0",
     "cytoscape-svg": "0.2.0",