55from plotly .graph_objs import graph_objs
66from plotly .tools import make_subplots
77
8- from numbers import Number
98import math
9+ import copy
10+ from numbers import Number
1011
1112pd = optional_imports .get_module ('pandas' )
1213
@@ -489,7 +490,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
489490 marker = dict (
490491 color = marker_color ,
491492 line = kwargs_marker ['line' ],
492- #opacity=kwargs_marker['opacity'],
493493 ),
494494 ** kwargs_trace
495495 )
@@ -514,7 +514,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
514514 marker = dict (
515515 color = marker_color ,
516516 line = kwargs_marker ['line' ],
517- #opacity=kwargs_marker['opacity'],
518517 ),
519518 ** kwargs_trace
520519 )
@@ -565,7 +564,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
565564 marker = dict (
566565 color = marker_color ,
567566 line = kwargs_marker ['line' ],
568- #opacity=kwargs_marker['opacity'],
569567 ),
570568 ** kwargs_trace
571569 )
@@ -818,14 +816,15 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
818816
819817 # seperate kwargs for marker and else
820818 if 'marker' in kwargs :
821- kwargs_marker = kwargs ['marker' ]
819+ kwargs_marker = copy . copy ( kwargs ['marker' ])
822820 else :
823821 kwargs_marker = {}
824- for param in ['color' ]:
825- kwargs_marker .pop (param , None )
822+ marker_color = kwargs_marker .pop ('color' , None )
826823 kwargs .pop ('marker' , None )
827- kwargs_trace = kwargs
824+ kwargs_trace = copy . copy ( kwargs )
828825
826+ print kwargs_marker
827+ print kwargs_trace
829828 if 'size' not in kwargs_marker :
830829 if ggplot2 :
831830 kwargs_marker ['size' ] = 5
@@ -844,7 +843,8 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
844843
845844 # default marker size
846845 if not ggplot2 :
847- marker_color = 'rgb(31, 119, 180)'
846+ if not marker_color :
847+ marker_color = 'rgb(31, 119, 180)'
848848 else :
849849 marker_color = 'rgb(0, 0, 0)'
850850
0 commit comments