(matplotlylib) Merge opacity into color.

theengineear · theengineear · commit 3b2d398aeea2 · 2015-09-15T16:28:48.000+07:00
`Line` `opacity` has been removed (or never existed?). We keep the
functionality by merging the hex color and opacity into an rgba tuple.
diff --git a/plotly/matplotlylib/mpltools.py b/plotly/matplotlylib/mpltools.py
@@ -83,6 +83,43 @@ def convert_symbol(mpl_symbol):
         return 'dot'  # default
 
 
+def hex_to_rgb(value):
+    """
+    Change a hex color to an rgb tuple
+
+    :param (str|unicode) value: The hex string we want to convert.
+    :return: (int, int, int) The red, green, blue int-tuple.
+
+    Example:
+
+        '#FFFFFF' --> (255, 255, 255)
+
+    """
+    value = value.lstrip('#')
+    lv = len(value)
+    return tuple(int(value[i:i + lv // 3], 16) for i in range(0, lv, lv // 3))
+
+
+def merge_color_and_opacity(color, opacity):
+    """
+    Merge hex color with an alpha (opacity) to get an rgba tuple.
+
+    :param (str|unicode) color: A hex color string.
+    :param (float|int) opacity: A value [0, 1] for the 'a' in 'rgba'.
+    :return: (int, int, int, float) The rgba color and alpha tuple.
+
+    """
+    if color is None:  # None can be used as a placeholder, just bail.
+        return None
+
+    rgb_tup = hex_to_rgb(color)
+    if opacity is None:
+        return 'rgb {}'.format(rgb_tup)
+
+    rgba_tup = rgb_tup + (opacity,)
+    return 'rgba {}'.format(rgba_tup)
+
+
 def convert_va(mpl_va):
     """Convert mpl vertical alignment word to equivalent HTML word.
 
diff --git a/plotly/matplotlylib/renderer.py b/plotly/matplotlylib/renderer.py
@@ -341,9 +341,11 @@ def draw_marked_line(self, **props):
             self.msg += "... with just markers\n"
             mode = "markers"
         if props['linestyle']:
+            color = \
+                mpltools.merge_color_and_opacity(props['linestyle']['color'],
+                                                 props['linestyle']['alpha'])
             line = go.Line(
-                opacity=props['linestyle']['alpha'],
-                color=props['linestyle']['color'],
+                color=color,
                 width=props['linestyle']['linewidth'],
                 dash=mpltools.convert_dash(props['linestyle']['dasharray'])
             )
diff --git a/plotly/tests/test_optional/test_matplotlylib/data/annotations.py b/plotly/tests/test_optional/test_matplotlylib/data/annotations.py
@@ -12,9 +12,8 @@
             mode='lines',
             line=Line(
                 dash='solid',
-                color='#0000FF',
-                width=1.0,
-                opacity=1
+                color='rgba (0, 0, 255, 1)',
+                width=1.0
             ),
             xaxis='x1',
             yaxis='y1'
@@ -26,9 +25,8 @@
             mode='lines',
             line=Line(
                 dash='solid',
-                color='#0000FF',
-                width=1.0,
-                opacity=1
+                color='rgba (0, 0, 255, 1)',
+                width=1.0
             ),
             xaxis='x1',
             yaxis='y1'
diff --git a/plotly/tests/test_optional/test_matplotlylib/data/axis_scales.py b/plotly/tests/test_optional/test_matplotlylib/data/axis_scales.py
@@ -16,9 +16,8 @@
             mode='lines',
             line=Line(
                 dash='solid',
-                color='#0000FF',
-                width=1.0,
-                opacity=1
+                color='rgba (0, 0, 255, 1)',
+                width=1.0
             ),
             xaxis='x1',
             yaxis='y1'
diff --git a/plotly/tests/test_optional/test_matplotlylib/data/lines.py b/plotly/tests/test_optional/test_matplotlylib/data/lines.py
@@ -19,9 +19,8 @@
             mode='lines',
             line=Line(
                 dash='solid',
-                color='#0000FF',
-                width=1.0,
-                opacity=1
+                color='rgba (0, 0, 255, 1)',
+                width=1.0
             ),
             xaxis='x1',
             yaxis='y1'
@@ -102,9 +101,8 @@
             mode='lines',
             line=Line(
                 dash='solid',
-                color='#0000FF',
-                width=2,
-                opacity=0.7
+                color='rgba (0, 0, 255, 0.7)',
+                width=2
             ),
             xaxis='x1',
             yaxis='y1'
@@ -134,9 +132,8 @@
             mode='lines',
             line=Line(
                 dash='dash',
-                color='#FF0000',
-                width=2,
-                opacity=0.8
+                color='rgba (255, 0, 0, 0.8)',
+                width=2
             ),
             xaxis='x1',
             yaxis='y1'
diff --git a/plotly/tests/test_optional/test_matplotlylib/data/subplots.py b/plotly/tests/test_optional/test_matplotlylib/data/subplots.py
@@ -18,8 +18,7 @@
             line=Line(
                 dash='solid',
                 color='#0000FF',
-                width=1.0,
-                opacity=1
+                width=1.0
             ),
             xaxis='x1',
             yaxis='y1'
