Reshaping

Yomguithereal · Yomguithereal · commit 386b1816fa39 · 2016-11-11T15:57:23.000+01:00
diff --git a/examples/basic.js b/examples/basic.js
@@ -3,7 +3,8 @@ import Sigma from '../src/sigma';
 import CanvasRenderer from '../src/renderers/canvas';
 
 const graph = new Graph();
-graph.addNode('John');
+graph.addNode('John', {x: 50, y: 50, color: 'blue', size: 10});
+graph.addNode('Martha', {x: 100, y: 100, color: 'red', size: 10});
 
 const renderer = new CanvasRenderer(document.getElementById('container'));
 
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "bugs": "http://github.com/jacomyal/sigma.js/issues",
   "main": "dist/sigma.js",
   "scripts": {
-    "examples": "webpack-dev-server --config ./examples/webpack.config.js --port 8000",
+    "examples": "webpack-dev-server --config ./examples/webpack.config.js --port 8000 --progress",
     "lint": "eslint examples src test",
     "test": "mocha --compilers js:babel-core/register ./test/endpoint.js"
   },
@@ -31,14 +31,19 @@
     "babel-loader": "^6.2.5",
     "babel-preset-es2015": "^6.14.0",
     "eslint": "^3.5.0",
-    "graphology": "0.0.4",
+    "graphology": "0.4.1",
     "html-webpack-plugin": "^2.22.0",
     "mocha": "^3.0.2",
     "webpack": "^1.13.2",
     "webpack-dev-server": "^1.15.1"
   },
   "keywords": [
-    "graph"
+    "graph",
+    "graphology",
+    "renderer",
+    "canvas",
+    "webgl",
+    "svg"
   ],
   "babel": {
     "presets": [
@@ -47,5 +52,8 @@
   },
   "eslintConfig": {
     "extends": "@yomguithereal/eslint-config/es6"
+  },
+  "dependencies": {
+    "graphology-utils": "^1.1.1"
   }
 }
diff --git a/src/reducers.js b/src/reducers.js
@@ -15,9 +15,9 @@
  */
 export function internalNodeReducer(controller, graph, node) {
   return {
-    x: 50,
-    y: 50,
-    size: 15,
-    color: 'red'
+    x: graph.getNodeAttribute(node, 'x') || 1,
+    y: graph.getNodeAttribute(node, 'y') || 1,
+    size: graph.getNodeAttribute(node, 'size') || 1,
+    color: graph.getNodeAttribute(node, 'color') || 'black'
   };
 }
diff --git a/src/renderers/canvas/index.js b/src/renderers/canvas/index.js
@@ -44,11 +44,9 @@ export default class CanvasRenderer extends Renderer {
    * @return {CanvasRenderer}       - Returns itself for chaining.
    */
   initialize(graph) {
-    const map = graph.map;
 
-    this.map = map;
-    this.nodesIndex = map ? new Map() : {};
-    this.edgesIndex = map ? new Map() : {};
+    this.nodesIndex = Object.create(null);
+    this.edgesIndex = Object.create(null);
 
     return this;
   }
@@ -63,10 +61,7 @@ export default class CanvasRenderer extends Renderer {
   updateNodeDisplayInformation(node, data) {
 
     // TODO: for now, this is only saving raw
-    if (this.map)
-      this.nodesIndex.set(node, data);
-    else
-      this.nodesIndex[node] = data;
+    this.nodesIndex[node] = data;
 
     return this;
   }
@@ -79,7 +74,6 @@ export default class CanvasRenderer extends Renderer {
   render() {
 
     // Rendering nodes
-    // TODO: handle maps
     for (const k in this.nodesIndex) {
       const displayInformation = this.nodesIndex[k];
 
diff --git a/src/sigma.js b/src/sigma.js
@@ -5,10 +5,12 @@
  * Core class holding state for the bound graph and using a combination of
  * a renderer & camera to display the bound graph on screen.
  */
+import isGraph from 'graphology-utils/is-graph';
+
 import Camera from './camera';
 import Renderer from './renderer';
 import {internalNodeReducer} from './reducers';
-import {assign, isGraph} from './utils';
+import {assign} from './utils';
 
 // TODO: possibility to pass a camera
 // TODO: distinguish with events, full refresh vs. draw
@@ -38,7 +40,6 @@ export default class Sigma {
 
     // Properties
     this.graph = graph;
-    this.map = this.graph.map;
     this.camera = new Camera();
     this.renderer = renderer;
 
diff --git a/src/utils.js b/src/utils.js
@@ -25,18 +25,3 @@ export function assign(target, ...objects) {
 
   return target;
 }
-
-/**
- * Function returning whether the given value is a graphology Graph instance.
- *
- * @param  {any} value - Target value.
- * @return {boolean}
- */
-export function isGraph(value) {
-  return (
-    value &&
-    typeof value === 'object' &&
-    typeof value.addUndirectedEdgeWithKey === 'function' &&
-    typeof value.dropNodes === 'function'
-  );
-}
