From 1606347e24d57882cc987e0dd31f59fc659fd596 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Wed, 1 Apr 2015 23:59:57 +0300
Subject: client/layouts/concentric: consts refactor, enlarge minimal ring
 distance

---
 src/client/view/graph_view.js |  4 ++--
 src/client/view/layouts.js    | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/client/view')

diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index 88e01739..94495cab 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -476,10 +476,10 @@ function GraphView(spec) {
         function link_text__short(d) {
             var name = d.name || "";
 
-            if (temporary || name.length < 25) {
+            if (temporary || name.length < consts.link_text_short_length + 3) {
                 return name;
             }
-            return name.substring(0, 14) + "...";
+            return name.substring(0, consts.link_text_short_length) + "...";
         }
 
         link_text
diff --git a/src/client/view/layouts.js b/src/client/view/layouts.js
index ffbe1db9..ca018ee7 100644
--- a/src/client/view/layouts.js
+++ b/src/client/view/layouts.js
@@ -1,5 +1,5 @@
-define(['jquery', 'd3', 'underscore', 'rz_core'],
-function($,        d3,   _,            rz_core) {
+define(['consts', 'jquery', 'd3', 'underscore', 'rz_core'],
+function(consts,   $,        d3,   _,            rz_core) {
     function layout__d3_force(graph) {
         return d3.layout.force()
                   .distance(240)
@@ -97,6 +97,9 @@ function($,        d3,   _,            rz_core) {
     }
 
     function layout__concentric() {
+        var single_width = consts.concentric_top_width,
+            ring_distance_minimum = consts.concentric_ring_distance_minimum;
+
         var cx = $(document.body).innerWidth() / 2,
             cy = $(document.body).innerHeight() / 2,
             pi = Math.PI,
@@ -123,7 +126,7 @@ function($,        d3,   _,            rz_core) {
                 node,
                 cos = Math.cos,
                 sin = Math.sin,
-                ring_radius = Math.max(50, (Math.min.apply(null, this.wh) - 50) / (types.length + 1));
+                ring_radius = Math.max(ring_distance_minimum, (Math.min.apply(null, this.wh) - 50) / (types.length + 1));
 
             function setxy(node, angle) {
                 node.x = node.px = cx + r * cos(angle);
@@ -140,8 +143,7 @@ function($,        d3,   _,            rz_core) {
                         setxy(node, small_number_angles[nodes.length][i]);
                     });
                 } else {
-                    var single_width = 200,
-                        small_angle = Math.min(pi / 2, single_width / r),
+                    var small_angle = Math.min(pi / 2, single_width / r),
                         small_angle_half = small_angle / 2,
                         large_count = Math.floor(count / 2) - 1,
                         pi_half = pi / 2,
-- 
cgit v1.3.1