From b8a90aaaa03dafcb44dbaa98165c2b6a972d9629 Mon Sep 17 00:00:00 2001
From: rhangelxs <rhangelxs@gmail.com>
Date: Sun, 27 Nov 2016 18:51:47 +0300
Subject: [PATCH 1/3] Change examples to negative values

---
 examples/bulletChart.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/bulletChart.html b/examples/bulletChart.html
index d41e1e496..d285897d9 100644
--- a/examples/bulletChart.html
+++ b/examples/bulletChart.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <link href="../build/nv.d3.css" rel="stylesheet" type="text/css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.2/d3.min.js" charset="utf-8"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.2/d3.js" charset="utf-8"></script>
     <script src="../build/nv.d3.js"></script>
 
     <style>
@@ -44,15 +44,15 @@
             .height(height - margin.top - margin.bottom);
 
     data = [
-        {"title":"Revenue","subtitle":"US$, in thousands","ranges":[150,225,300],"measures":[220],"markers":[250],"markerLines":[270]},
-        {"title":"Order Size","subtitle":"US$, average","ranges":[350,500,600],"measures":[100],"markers":[550], "markerLines":[530]},
+        {"title":"Revenue","subtitle":"US$, in thousands","ranges":[-1150,225,300],"measures":[-220],"markers":[-250],"markerLines":[270]},
+        {"title":"Order Size","subtitle":"US$, average","ranges":[-1350,500,600],"measures":[100],"markers":[-350,550], "markerLines":[530]},
         {"title":"Satisfaction","subtitle":"out of 5","ranges":[3.5,4.25,5],"measures":[3.2,4.7],"markers":[4.4], "markerLines":[3.8]}
     ];
 
     dataWithLabels = [{
         "title":"Revenue",
         "subtitle":"US$, in thousands",
-        "ranges":[150,225,300],
+        "ranges":[110,150,230],
         "measures":[220],
         "markers":[250, 100],
         "markerLines":[240, 120],
@@ -98,7 +98,7 @@
     function randomizer(d) {
         var k = d3.max(d.ranges) * .2;
         return function(d) {
-            return Math.max(0, d + k * (Math.random() - .5));
+            return Math.max(-1000, d + k * (Math.random() - .5));
         };
     }
 

From cb9d812d0d384eb39125617f1589c5c5dd4409e9 Mon Sep 17 00:00:00 2001
From: rhangelxs <rhangelxs@gmail.com>
Date: Sun, 27 Nov 2016 18:52:36 +0300
Subject: [PATCH 2/3] Negative values initial support

---
 src/models/bullet.js      | 20 +++++++++-----------
 src/models/bulletChart.js |  8 ++++----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/models/bullet.js b/src/models/bullet.js
index 32e2a007b..4c709d4f4 100644
--- a/src/models/bullet.js
+++ b/src/models/bullet.js
@@ -21,7 +21,7 @@ nv.models.bullet = function() {
         , markerLabels = function(d) { return d.markerLabels ? d.markerLabels : []  }
         , markerLineLabels = function(d) { return d.markerLineLabels ? d.markerLineLabels : []  }
         , measureLabels = function(d) { return d.measureLabels ? d.measureLabels : []  }
-        , forceX = [0] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.)
+        , forceX = [] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.)
         , width = 380
         , height = 30
         , container = null
@@ -74,7 +74,7 @@ nv.models.bullet = function() {
             // Setup Scales
             // Compute the new x-scale.
             var x1 = d3.scale.linear()
-                .domain( d3.extent(d3.merge([forceX, rangez])) )
+                .domain( d3.extent(d3.merge([forceX, rangez, markerz, measurez])) )
                 .range(reverse ? [availableWidth, 0] : [0, availableWidth]);
 
             // Retrieve the old x-scale, if this is an update.
@@ -88,7 +88,7 @@ nv.models.bullet = function() {
             var rangeMin = d3.min(rangez), //rangez[2]
                 rangeMax = d3.max(rangez), //rangez[0]
                 rangeAvg = rangez[1];
-
+            var min = d3.min([].concat(rangez, markerz, measurez));
             // Setup containers and skeleton of chart
             var wrap = container.selectAll('g.nv-wrap.nv-bullet').data([d]);
             var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bullet');
@@ -105,12 +105,12 @@ nv.models.bullet = function() {
 
             gEnter.append('rect').attr('class', 'nv-measure');
 
-            wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
+            // wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
 
-            var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0)
-                w1 = function(d) { return Math.abs(x1(d) - x1(0)) };
-            var xp0 = function(d) { return d < 0 ? x0(d) : x0(0) },
-                xp1 = function(d) { return d < 0 ? x1(d) : x1(0) };
+            var w0 = function(d) { return x0(d) }, // TODO: could optimize by precalculating x0(0) and x1(0)
+                w1 = function(d) { return min < 0 ? x1(d) : x1(d)-x1(min) };
+            var xp0 = function(d) { return 0 },
+                xp1 = function(d) { return min < 0 ? 0 : 0 };
 
             for(var i=0,il=rangez.length; i<il; i++){
                 var range = rangez[i];
@@ -150,9 +150,7 @@ nv.models.bullet = function() {
                 })
                 .transition()
                 .duration(duration)
-                .attr('width', measurez < 0 ?
-                    x1(0) - x1(measurez[0])
-                    : x1(measurez[0]) - x1(0))
+                .attr('width', w1(measurez[0]))
                 .attr('x', xp1(measurez));
 
             var h3 =  availableHeight / 6;
diff --git a/src/models/bulletChart.js b/src/models/bulletChart.js
index 648db3191..c318a9f74 100644
--- a/src/models/bulletChart.js
+++ b/src/models/bulletChart.js
@@ -67,19 +67,19 @@ nv.models.bulletChart = function() {
 
             // Compute the new x-scale.
             var x1 = d3.scale.linear()
-                .domain([0, Math.max(rangez[0], (markerz[0] || 0), measurez[0])])  // TODO: need to allow forceX and forceY, and xDomain, yDomain
+                .domain([d3.min([].concat(rangez, markerz, measurez)), d3.max([].concat(rangez, markerz, measurez))])  // TODO: need to allow forceX and forceY, and xDomain, yDomain
                 .range(reverse ? [availableWidth, 0] : [0, availableWidth]);
 
             // Retrieve the old x-scale, if this is an update.
             var x0 = this.__chart__ || d3.scale.linear()
-                .domain([0, Infinity])
+                .domain([-Infinity, Infinity])
                 .range(x1.range());
 
             // Stash the new scale.
             this.__chart__ = x1;
 
-            var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0)
-                w1 = function(d) { return Math.abs(x1(d) - x1(0)) };
+            // var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0)
+            //     w1 = function(d) { return Math.abs(x1(d) - x1(0)) };
 
             var title = gEnter.select('.nv-titles').append('g')
                 .attr('text-anchor', 'end')

From 105c009a2c12cb3fc97aaffb969cbdc7bc4e1199 Mon Sep 17 00:00:00 2001
From: rhangelxs <rhangelxs@gmail.com>
Date: Sun, 27 Nov 2016 19:20:17 +0300
Subject: [PATCH 3/3] Refactoring

---
 src/models/bullet.js      | 8 +++++---
 src/models/bulletChart.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/models/bullet.js b/src/models/bullet.js
index 4c709d4f4..7f4e68dd5 100644
--- a/src/models/bullet.js
+++ b/src/models/bullet.js
@@ -108,9 +108,9 @@ nv.models.bullet = function() {
             // wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
 
             var w0 = function(d) { return x0(d) }, // TODO: could optimize by precalculating x0(0) and x1(0)
-                w1 = function(d) { return min < 0 ? x1(d) : x1(d)-x1(min) };
+                w1 = function(d) { return x1(d) };
             var xp0 = function(d) { return 0 },
-                xp1 = function(d) { return min < 0 ? 0 : 0 };
+                xp1 = function(d) { return 0 };
 
             for(var i=0,il=rangez.length; i<il; i++){
                 var range = rangez[i];
@@ -193,7 +193,9 @@ nv.models.bullet = function() {
               .data(markerData)
               .transition()
               .duration(duration)
-              .attr('transform', function(d) { return 'translate(' + x1(d.value) + ',' + (availableHeight / 2) + ')' });
+              .attr('transform', function(d) {
+                  return 'translate(' + (x1(d.value) || x1(min)) + ',' + (availableHeight / 2) + ')'
+              });
 
             var markerLinesData = markerLinez.map( function(marker, index) {
                 return {value: marker, label: markerLineLabelz[index]}
diff --git a/src/models/bulletChart.js b/src/models/bulletChart.js
index c318a9f74..1d75e4522 100644
--- a/src/models/bulletChart.js
+++ b/src/models/bulletChart.js
@@ -72,7 +72,7 @@ nv.models.bulletChart = function() {
 
             // Retrieve the old x-scale, if this is an update.
             var x0 = this.__chart__ || d3.scale.linear()
-                .domain([-Infinity, Infinity])
+                .domain([0, Infinity])
                 .range(x1.range());
 
             // Stash the new scale.
@@ -112,7 +112,6 @@ nv.models.bulletChart = function() {
             // Initialize the ticks with the old scale, x0.
             var tickEnter = tick.enter().append('g')
                 .attr('class', 'nv-tick')
-                .attr('transform', function(d) { return 'translate(' + x0(d) + ',0)' })
                 .style('opacity', 1e-6);
 
             tickEnter.append('line')
