[Python-modules-commits] [python-mplexporter] 45/135: Commit after adding mplobj keyword args to PloltyRenderer.

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-mplexporter.

commit 7d0722ae52a1f993a8bcecb9023dbc1c90eac3e3
Author: theengineear <andseier at gmail.com>
Date:   Mon Feb 24 23:51:55 2014 -0800

    Commit after adding mplobj keyword args to PloltyRenderer.
---
 mplexporter/renderers/plotly/plotly_renderer.py | 34 ++-----------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/mplexporter/renderers/plotly/plotly_renderer.py b/mplexporter/renderers/plotly/plotly_renderer.py
index 2881d53..c76f6a4 100644
--- a/mplexporter/renderers/plotly/plotly_renderer.py
+++ b/mplexporter/renderers/plotly/plotly_renderer.py
@@ -53,8 +53,7 @@ class PlotlyRenderer(Renderer):
     def close_axes(self, ax):
         self.output += "  closing axis {}\n".format(self.axis_ct)
 
-<<<<<<< HEAD
-    def draw_line(self, data, coordinates, style):
+    def draw_line(self, data, coordinates, style, mplobj=None):
         if coordinates == 'data':
             self.output += "    draw line with {0} points\n".format(data.shape[0])
             trace = {
@@ -74,7 +73,7 @@ class PlotlyRenderer(Renderer):
         else:
             self.output += "    received {}-point line with 'figure' coordinates, skipping!".format(data.shape[0])
 
-    def draw_markers(self, data, coordinates, style):
+    def draw_markers(self, data, coordinates, style, mplobj=None):
         if coordinates == 'data':
             self.output += "    draw {0} markers\n".format(data.shape[0])
             trace = {
@@ -131,35 +130,6 @@ class PlotlyRenderer(Renderer):
                 self.layout['yaxis']['anchor'] = 'x'
         except KeyError:
             pass
-=======
-    def draw_line(self, data, coordinates, style, mplobj=None):
-        self.output += "    draw line with {0} points\n".format(data.shape[0])
-        data_dict = {'x': [], 'y': []}
-        for xy_pair in data:
-            data_dict['x'] += [xy_pair[0]]
-            data_dict['y'] += [xy_pair[1]]
-        data_dict['mode'] = 'lines'
-        data_dict['line'] = {}
-        data_dict['line']['opacity'] = style['alpha']
-        data_dict['line']['width'] = style['linewidth']
-        data_dict['line']['dash'] = plotly_utils.convert_dash(style['dasharray'])
-        self.data += data_dict,
-
-    def draw_markers(self, data, coordinates, style, mplobj=None):
-        self.output += "    draw {0} markers\n".format(data.shape[0])
-        data_dict = {'x': [], 'y': []}
-        for xy_pair in data:
-            data_dict['x'] += [xy_pair[0]]
-            data_dict['y'] += [xy_pair[1]]
-        data_dict['mode'] = 'markers'
-        data_dict['marker'] = {}
-        data_dict['marker']['opacity'] = style['alpha']
-        data_dict['marker']['color'] = style['facecolor']
-        # need to incorporate style['edgecolor']
-        data_dict['marker']['symbol'] = plotly_utils.convert_symbol(style['marker'])
-        # not sure whether we need to incorporate style['markerpath']
-        self.data += data_dict,
->>>>>>> mpld3/master
 
 
 def fig_to_plotly(fig, username=None, api_key=None, notebook=False):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mplexporter.git