added histnorm parameter

yankev · yankev · commit b28b4a227c25 · 2016-05-20T15:42:18.000-04:00
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -4019,7 +4019,7 @@ def create_candlestick(open, high, low, close,
     @staticmethod
     def create_distplot(hist_data, group_labels,
                         bin_size=1., curve_type='kde',
-                        colors=[], rug_text=[],
+                        colors=[], rug_text=[], histnorm='probability density',
                         show_hist=True, show_curve=True,
                         show_rug=True):
         """
@@ -4144,23 +4144,23 @@ def create_distplot(hist_data, group_labels,
             bin_size = [bin_size]*len(hist_data)
 
         hist = _Distplot(
-            hist_data, group_labels, bin_size,
+            hist_data, histnorm, group_labels, bin_size,
             curve_type, colors, rug_text,
             show_hist, show_curve).make_hist()
 
         if curve_type == 'normal':
             curve = _Distplot(
-                hist_data, group_labels, bin_size,
+                hist_data, histnorm, group_labels, bin_size,
                 curve_type, colors, rug_text,
                 show_hist, show_curve).make_normal()
         else:
             curve = _Distplot(
-                hist_data, group_labels, bin_size,
+                hist_data, histnorm, group_labels, bin_size,
                 curve_type, colors, rug_text,
                 show_hist, show_curve).make_kde()
 
         rug = _Distplot(
-            hist_data, group_labels, bin_size,
+            hist_data, histnorm, group_labels, bin_size,
             curve_type, colors, rug_text,
             show_hist, show_curve).make_rug()
 
@@ -5036,10 +5036,11 @@ class _Distplot(FigureFactory):
     """
     Refer to TraceFactory.create_distplot() for docstring
     """
-    def __init__(self, hist_data, group_labels,
+    def __init__(self, hist_data, histnorm, group_labels,
                  bin_size, curve_type, colors,
                  rug_text, show_hist, show_curve):
         self.hist_data = hist_data
+        self.histnorm = histnorm
         self.group_labels = group_labels
         self.bin_size = bin_size
         self.show_hist = show_hist
@@ -5081,7 +5082,7 @@ def make_hist(self):
                                x=self.hist_data[index],
                                xaxis='x1',
                                yaxis='y1',
-                               histnorm='probability density',
+                               histnorm=self.histnorm,
                                name=self.group_labels[index],
                                legendgroup=self.group_labels[index],
                                marker=dict(color=self.colors[index]),
@@ -5108,7 +5109,9 @@ def make_kde(self):
             self.curve_y[index] = (scipy.stats.gaussian_kde
                                    (self.hist_data[index])
                                    (self.curve_x[index]))
-            # self.curve_y[index] *= self.bin_size[index]
+
+            if self.histnorm == 'probability':
+                self.curve_y[index] *= self.bin_size[index]
 
         for index in range(self.trace_number):
             curve[index] = dict(type='scatter',
@@ -5143,7 +5146,9 @@ def make_normal(self):
                                    / 500 for x in range(500)]
             self.curve_y[index] = scipy.stats.norm.pdf(
                 self.curve_x[index], loc=mean[index], scale=sd[index])
-            # self.curve_y[index] *= self.bin_size[index]
+
+            if self.histnorm == 'probability':
+                self.curve_y[index] *= self.bin_size[index]
 
         for index in range(self.trace_number):
             curve[index] = dict(type='scatter',
@@ -5621,4 +5626,3 @@ def make_table_annotations(self):
                         font=dict(color=font_color),
                         showarrow=False))
         return annotations
-
