Merge pull request #1600 from palantir/release-v0.43.1

Release v0.43.1 (--> master)
palantir · Feb 6, 2015 · 6c42b77 · 6c42b77
2 parents 540bdcf + 65a8e81
commit 6c42b77
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 29 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A library for creating charts out of D3",
-  "version": "0.43.0",
+  "version": "0.43.1",
   "main": ["plottable.js", "plottable.css"],
   "license": "MIT",
   "ignore": [

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
   "description": "A library for creating charts out of D3",
-  "version": "0.43.0",
+  "version": "0.43.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/palantir/plottable.git"

diff --git a/plottable.d.ts b/plottable.d.ts
@@ -1275,14 +1275,14 @@ declare module Plottable {
              */
             rangeBand(): number;
             /**
-             * Returns the full band width of the scale.
+             * Returns the step width of the scale.
              *
-             * The full band width is defined as the entire space for a band to occupy,
-             * not accounting for any padding in between the bands.
+             * The step width is defined as the entire space for a band to occupy,
+             * including the padding in between the bands.
              *
              * @returns {number} the full band width of the scale
              */
-            fullBandWidth(): number;
+            stepWidth(): number;
             /**
              * Returns the inner padding of the scale.
              *

diff --git a/plottable.js b/plottable.js
@@ -1,5 +1,5 @@
 /*!
-Plottable 0.43.0 (https://github.com/palantir/plottable)
+Plottable 0.43.1 (https://github.com/palantir/plottable)
 Copyright 2014 Palantir Technologies
 Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
 */
@@ -978,7 +978,7 @@ var Plottable;
 ///<reference path="../reference.ts" />
 var Plottable;
 (function (Plottable) {
-    Plottable.version = "0.43.0";
+    Plottable.version = "0.43.1";
 })(Plottable || (Plottable = {}));
 
 ///<reference path="../reference.ts" />
@@ -2290,15 +2290,15 @@ var Plottable;
                 return this._d3Scale.rangeBand();
             };
             /**
-             * Returns the full band width of the scale.
+             * Returns the step width of the scale.
              *
-             * The full band width is defined as the entire space for a band to occupy,
-             * not accounting for any padding in between the bands.
+             * The step width is defined as the entire space for a band to occupy,
+             * including the padding in between the bands.
              *
              * @returns {number} the full band width of the scale
              */
-            Ordinal.prototype.fullBandWidth = function () {
-                return this.rangeBand() + this.innerPadding();
+            Ordinal.prototype.stepWidth = function () {
+                return this.rangeBand() * (1 + this.innerPadding());
             };
             Ordinal.prototype.innerPadding = function (innerPadding) {
                 if (innerPadding == null) {
@@ -5052,7 +5052,7 @@ var Plottable;
                         break;
                 }
                 ticks.each(function (d) {
-                    var bandWidth = scale.rangeBand();
+                    var bandWidth = scale.stepWidth();
                     var width = self._isHorizontal() ? bandWidth : axisWidth - self._maxLabelTickLength() - self.tickLabelPadding();
                     var height = self._isHorizontal() ? axisHeight - self._maxLabelTickLength() - self.tickLabelPadding() : bandWidth;
                     var writeOptions = {
@@ -5073,7 +5073,7 @@ var Plottable;
             Category.prototype._measureTicks = function (axisWidth, axisHeight, scale, ticks) {
                 var _this = this;
                 var wrappingResults = ticks.map(function (s) {
-                    var bandWidth = scale.fullBandWidth();
+                    var bandWidth = scale.stepWidth();
                     var width = _this._isHorizontal() ? bandWidth : axisWidth - _this._maxLabelTickLength() - _this.tickLabelPadding();
                     var height = _this._isHorizontal() ? axisHeight - _this._maxLabelTickLength() - _this.tickLabelPadding() : bandWidth;
                     return _this._wrapper.wrap(_this.formatter()(s), _this._measurer, width, height);
@@ -5092,7 +5092,8 @@ var Plottable;
                 var ordScale = this._scale;
                 var tickLabels = this._tickLabelContainer.selectAll("." + Axis.AbstractAxis.TICK_LABEL_CLASS).data(this._scale.domain(), function (d) { return d; });
                 var getTickLabelTransform = function (d, i) {
-                    var scaledValue = ordScale.scale(d) - ordScale.rangeBand() / 2;
+                    var innerPaddingWidth = ordScale.stepWidth() - ordScale.rangeBand();
+                    var scaledValue = ordScale.scale(d) - ordScale.rangeBand() / 2 - innerPaddingWidth / 2;
                     var x = _this._isHorizontal() ? scaledValue : 0;
                     var y = _this._isHorizontal() ? 0 : scaledValue;
                     return "translate(" + x + "," + y + ")";

diff --git a/plottable.min.js b/plottable.min.js
diff --git a/plottable.zip b/plottable.zip
diff --git a/src/components/axes/categoryAxis.ts b/src/components/axes/categoryAxis.ts
@@ -116,7 +116,7 @@ export module Axis {
           break;
       }
       ticks.each(function (d: string) {
-        var bandWidth = scale.rangeBand();
+        var bandWidth = scale.stepWidth();
         var width  = self._isHorizontal() ? bandWidth  : axisWidth - self._maxLabelTickLength() - self.tickLabelPadding();
         var height = self._isHorizontal() ? axisHeight - self._maxLabelTickLength() - self.tickLabelPadding() : bandWidth;
         var writeOptions = {
@@ -137,7 +137,7 @@ export module Axis {
      */
     private _measureTicks(axisWidth: number, axisHeight: number, scale: Scale.Ordinal, ticks: string[]) {
       var wrappingResults = ticks.map((s: string) => {
-        var bandWidth = scale.fullBandWidth();
+        var bandWidth = scale.stepWidth();
         var width  = this._isHorizontal() ? bandWidth  : axisWidth - this._maxLabelTickLength() - this.tickLabelPadding();
         var height = this._isHorizontal() ? axisHeight - this._maxLabelTickLength() - this.tickLabelPadding() : bandWidth;
         return this._wrapper.wrap(this.formatter()(s), this._measurer, width, height);
@@ -162,7 +162,8 @@ export module Axis {
       var tickLabels = this._tickLabelContainer.selectAll("." + AbstractAxis.TICK_LABEL_CLASS).data(this._scale.domain(), (d) => d);
 
       var getTickLabelTransform = (d: string, i: number) => {
-        var scaledValue = ordScale.scale(d) - ordScale.rangeBand() / 2;
+        var innerPaddingWidth = ordScale.stepWidth() - ordScale.rangeBand();
+        var scaledValue = ordScale.scale(d) - ordScale.rangeBand() / 2 - innerPaddingWidth / 2;
         var x = this._isHorizontal() ? scaledValue : 0;
         var y = this._isHorizontal() ? 0 : scaledValue;
         return "translate(" + x + "," + y + ")";

diff --git a/src/scales/ordinalScale.ts b/src/scales/ordinalScale.ts
@@ -74,15 +74,15 @@ export module Scale {
     }
 
     /**
-     * Returns the full band width of the scale.
+     * Returns the step width of the scale.
      *
-     * The full band width is defined as the entire space for a band to occupy,
-     * not accounting for any padding in between the bands.
+     * The step width is defined as the entire space for a band to occupy,
+     * including the padding in between the bands.
      *
      * @returns {number} the full band width of the scale
      */
-    public fullBandWidth(): number {
-      return this.rangeBand() + this.innerPadding();
+    public stepWidth(): number {
+      return this.rangeBand() * (1 + this.innerPadding());
     }
 
     /**