From 9b012de0dd54d47a164c93a8a5bf0b2195cf9178 Mon Sep 17 00:00:00 2001
From: Raibaz <raibaz@gmail.com>
Date: Fri, 18 May 2012 15:46:10 +0200
Subject: [PATCH] Added a new node property, 'shape', that allows to draw
 square nodes by setting it to 'square'

---
 src/core/graph.js   |  1 +
 src/core/plotter.js | 70 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/src/core/graph.js b/src/core/graph.js
index fc9d41c4c..7ee4c8aa0 100644
--- a/src/core/graph.js
+++ b/src/core/graph.js
@@ -166,6 +166,7 @@ function Graph() {
           break;
         case 'color':
         case 'label':
+        case 'shape':
           node[k] = (copy[k] || '').toString();
           break;
         default:
diff --git a/src/core/plotter.js b/src/core/plotter.js
index c86c94218..68c78da2b 100644
--- a/src/core/plotter.js
+++ b/src/core/plotter.js
@@ -104,6 +104,7 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
     // NODES:
     // ------
     defaultNodeColor: '#aaa',
+    defaultNodeShape: 'circle',
     // HOVER:
     //   Node hover color:
     //   - 'node'
@@ -278,16 +279,28 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
    */
   function drawNode(node) {
     var size = Math.round(node['displaySize'] * 10) / 10;
+    var shape = node['shape'];
+    if(!shape) {
+      shape = self.p.defaultNodeShape;
+    }
     var ctx = nodesCtx;
 
     ctx.fillStyle = node['color'];
     ctx.beginPath();
-    ctx.arc(node['displayX'],
+    switch(shape) {
+      case 'square':
+      ctx.fillRect(node['displayX'], 
             node['displayY'],
-            size,
-            0,
-            Math.PI * 2,
-            true);
+            size * 2,
+            size * 2);
+      break;
+    default:
+      ctx.arc(node['displayX'],
+              node['displayY'],
+              size,
+              0,
+              Math.PI * 2,
+              true);
 
     ctx.closePath();
     ctx.fill();
@@ -389,6 +402,11 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
   function drawHoverNode(node) {
     var ctx = hoverCtx;
 
+    var nodeShape = node['shape'];
+    if(!nodeShape) {
+      nodeShape = self.p.defaultNodeShape;
+    }
+
     var fontSize = self.p.labelSize == 'fixed' ?
                    self.p.defaultLabelSize :
                    self.p.labelSizeRatio * node['displaySize'];
@@ -434,12 +452,21 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
     ctx.fillStyle = self.p.nodeBorderColor == 'node' ?
                     (node['color'] || self.p.defaultNodeColor) :
                     self.p.defaultNodeBorderColor;
-    ctx.arc(Math.round(node['displayX']),
-            Math.round(node['displayY']),
-            node['displaySize'] + self.p.borderSize,
-            0,
-            Math.PI * 2,
-            true);
+    switch(nodeShape) {
+    case 'square':
+      ctx.strokeRect(node['displayX'],
+              node['displayY'],
+              (node['displaySize'] * 2) + self.p.borderSize,
+              (node['displaySize'] * 2) + self.p.borderSize);
+      break;
+    default:
+      ctx.arc(Math.round(node['displayX']),
+              Math.round(node['displayY']),
+              node['displaySize'] + self.p.borderSize,
+              0,
+              Math.PI * 2,
+              true);
+    }
     ctx.closePath();
     ctx.fill();
 
@@ -448,12 +475,21 @@ function Plotter(nodesCtx, edgesCtx, labelsCtx, hoverCtx, graph, w, h) {
     ctx.fillStyle = self.p.nodeHoverColor == 'node' ?
                     (node['color'] || self.p.defaultNodeColor) :
                     self.p.defaultNodeHoverColor;
-    ctx.arc(Math.round(node['displayX']),
-            Math.round(node['displayY']),
-            node['displaySize'],
-            0,
-            Math.PI * 2,
-            true);
+    switch(nodeShape) {
+    case 'square':
+      ctx.fillRect(node['displayX'],
+            node['displayY'],
+            node['displaySize'] * 2,
+            node['displaySize'] * 2);
+      break;
+    default:                    
+      ctx.arc(Math.round(node['displayX']),
+              Math.round(node['displayY']),
+              node['displaySize'],
+              0,
+              Math.PI * 2,
+              true);
+    }
 
     ctx.closePath();
     ctx.fill();