Use d3 line object when no region

434af4b8 · Masayuki Tanaka · masayuki · ac7d9cbd · 434af4b8
Commit 434af4b8 authored May 22, 2013 by Masayuki Tanaka Committed by masayuki May 22, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 10 deletions

c3.js c3.js +15 -10

No files found.
--- a/c3.js
+++ b/c3.js
@@ -222,17 +222,22 @@
            })()
        }
-        // For main region // TODO: use nornal line when no region
+        // For main region
-        var lineOnMain = function (d) {
+        var lineOnMain = (function () {
-            var x0, y0
+            var line = d3.svg.line()
-            if (isLineType(d)) {
+                .x(__axis_rotated ? function(d){ return getYScale(d.id)(d.value) } : xx)
-                return lineWithRegions(d.values, x, getYScale(d.id), __data_regions[d.id])
+                .y(__axis_rotated ? xx : function(d){ return getYScale(d.id)(d.value) })
-            } else {
+            return function (d) {
-                x0 = x(d.values[0].x)
+                var x0, y0
-                y0 = getYScale(d.id)(d.values[0].value)
+                if (isLineType(d)) {
-                return __axis_rotated ? "M "+y0+" "+x0 : "M "+x0+" "+y0
+                    return __data_regions.length > 0 ? lineWithRegions(d.values, x, getYScale(d.id), __data_regions[d.id]) : line(d.values)
+                } else {
+                    x0 = x(d.values[0].x)
+                    y0 = getYScale(d.id)(d.values[0].value)
+                    return __axis_rotated ? "M "+y0+" "+x0 : "M "+x0+" "+y0
+                }
            }
-        }
+        })()
        // For brush region
        var lineOnSub = (function () {