domain setting in size.coffee

d3plus · May 24, 2016 · 5a6779f · 5a6779f
1 parent 29a4c8e
commit 5a6779f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 14 deletions.
diff --git a/src/viz/methods/size.coffee b/src/viz/methods/size.coffee
@@ -8,13 +8,21 @@ module.exports =
   scale:
     accepted:   [Function]
     deprecates: "size_scale"
-    max:
-      accepted: [Function, Number]
-      value:    (vars) ->
-        Math.floor d3.max [d3.min([vars.width.viz,vars.height.viz])/15, 6]
-    min:
-      accepted: [Function, Number]
-      value:    3
+    domain:
+      min:
+        accepted: [false, Number]
+        value: false
+      max:
+        accepted: [false, Number]
+        value: false
+    range:
+      max:
+        accepted: [Function, Number]
+        value:    (vars) ->
+          Math.floor d3.max [d3.min([vars.width.viz,vars.height.viz])/15, 6]
+      min:
+        accepted: [Function, Number]
+        value:    3
     value:      d3.scale.sqrt()
   solo:       filter(true)
   threshold:

diff --git a/src/viz/types/bubbles.coffee b/src/viz/types/bubbles.coffee
@@ -27,10 +27,21 @@ bubbles = (vars) ->
 
   # Define size scale
   if vars.size.value
-    domainMin = d3.min vars.data.viz, (d) ->
-      fetchValue vars, d, vars.size.value, vars.id.value, "min"
-    domainMax = d3.max vars.data.viz, (d) ->
-      fetchValue vars, d, vars.size.value, vars.id.value
+    userDomainMin = vars.size.scale.domain.min.value
+    userDomainMax = vars.size.scale.domain.max.value
+
+    if typeof userDomainMin is 'number'
+      domainMin = userDomainMin
+    else
+      domainMin = d3.min vars.data.viz, (d) ->
+        fetchValue vars, d, vars.size.value, vars.id.value, "min"
+
+    if typeof userDomainMax is 'number'
+      domainMax = userDomainMax
+    else
+      domainMax = d3.max vars.data.viz, (d) ->
+        fetchValue vars, d, vars.size.value, vars.id.value
+
     domain = [domainMin, domainMax]
   else
     domain = [0, 0]
@@ -39,7 +50,7 @@ bubbles = (vars) ->
   size_max = (d3.min([column_width, column_height]) / 2) - (padding * 2)
   labelHeight = if vars.labels.value and not vars.small and size_max >= 40 then d3.max([20, d3.min [size_max * 0.25, 50]]) else 0
   size_max -= labelHeight
-  size_min = d3.min [size_max, vars.size.scale.min.value]
+  size_min = d3.min [size_max, vars.size.scale.range.min.value]
 
   size = vars.size.scale.value
     .domain domain

diff --git a/src/viz/types/helpers/graph/includes/axes.coffee b/src/viz/types/helpers/graph/includes/axes.coffee
@@ -219,9 +219,9 @@ sizeScale = (vars, value) ->
   value = "size" if value is true
   value = vars[value].value if value of vars
 
-  min = vars.size.scale.min.value
+  min = vars.size.scale.range.min.value
   min = min vars if typeof min is "function"
-  max = vars.size.scale.max.value
+  max = vars.size.scale.range.max.value
   max = max vars if typeof max is "function"
 
   if value is false