Add tick turning for 90 degrees in debug mode

594f7514 · Evgeny · d049e52c · 594f7514 · 594f7514 · 594f7514
Commit 594f7514 authored Jul 21, 2016 by Evgeny
Hide whitespace changes
Inline Side-by-side

Showing with 38 additions and 16 deletions

c3.js c3.js +21 -8

c3.min.js c3.min.js +0 -0

c3.axis.js src/c3.axis.js +17 -8

No files found.
--- a/c3.js
+++ b/c3.js
@@ -8289,7 +8289,11 @@
                    }

                    if(!shouldSplitText){
-                        return [tickText.substr(0, 10)];
+                        var postfix = '';
+                        if(tickText.length > 12){
+                            //postfix = '...';
+                        }
+                        return [tickText.substr(0, 10) + postfix];
                    }

                    if($$.isXAxis(orient)){
@@ -8351,18 +8355,27 @@

                text = tick.select("text");

-                if(typeof turn_axis_ticks !== 'undefined'){
-                    if($$.isXAxis(orient)){
-                        if($$.isCategorized()){
-                            shouldSplitText = false;
+                if(typeof turn_axis_ticks !== 'undefined' || typeof turn_axis_ticks_90 !== 'undefined'){
+                    if($$.isXAxis(orient) && $$.isCategorized){
+                        shouldSplitText = false;

+                        if(typeof turn_axis_ticks !== 'undefined'){
                            text.attr('transform', function(d, i){
                                var tickText = splitTickText(d)[0];
-                                var offset = 15;
+                                var offset = 7;
+
+                                var tickSize = getSizeFor1Char(tickText).w * tickText.length;
+
+                                return 'rotate(-45) translate(' + (-tickSize / 2 - offset) + ', ' + (-tickOffset / Math.sqrt(2) / 2) + ')';
+                            });
+                        } else {
+                            text.attr('transform', function(d){
+                                var tickText = splitTickText(d)[0];
+                                var offset = 10;

-                                var tickSize = getSizeFor1Char(tickText).w * tickText.length + offset;
+                                var tickSize = getSizeFor1Char(tickText).w * tickText.length;

-                                return 'rotate(-45) translate(' + (-tickSize / 2) + ', ' + (-tickOffset / Math.sqrt(2) / 2) + ')';
+                                return 'rotate(-90) translate(' + (-tickSize/2 - offset) + ', ' + (-tickOffset) + ')';
                            });
                        }
                    }

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/c3.axis.js
+++ b/src/c3.axis.js
@@ -161,7 +161,7 @@ function c3_axis(d3, params, $$) {
                if(!shouldSplitText){
                    var postfix = '';
                    if(tickText.length > 12){
-                        postfix = '...';
+                        //postfix = '...';
                    }
                    return [tickText.substr(0, 10) + postfix];
                }
@@ -225,18 +225,27 @@ function c3_axis(d3, params, $$) {

            text = tick.select("text");

-            if(typeof turn_axis_ticks !== 'undefined'){
-                if($$.isXAxis(orient)){
-                    if($$.isCategorized()){
-                        shouldSplitText = false;
+            if(typeof turn_axis_ticks !== 'undefined' || typeof turn_axis_ticks_90 !== 'undefined'){
+                if($$.isXAxis(orient) && $$.isCategorized){
+                    shouldSplitText = false;

+                    if(typeof turn_axis_ticks !== 'undefined'){
                        text.attr('transform', function(d, i){
                            var tickText = splitTickText(d)[0];
-                            var offset = 15;
+                            var offset = 7;
+
+                            var tickSize = getSizeFor1Char(tickText).w * tickText.length;
+
+                            return 'rotate(-45) translate(' + (-tickSize / 2 - offset) + ', ' + (-tickOffset / Math.sqrt(2) / 2) + ')';
+                        });
+                    } else {
+                        text.attr('transform', function(d){
+                            var tickText = splitTickText(d)[0];
+                            var offset = 10;

-                            var tickSize = getSizeFor1Char(tickText).w * tickText.length + offset;
+                            var tickSize = getSizeFor1Char(tickText).w * tickText.length;

-                            return 'rotate(-45) translate(' + (-tickSize / 2) + ', ' + (-tickOffset / Math.sqrt(2) / 2) + ')';
+                            return 'rotate(-90) translate(' + (-tickSize/2 - offset) + ', ' + (-tickOffset) + ')';
                        });
                    }
                }