5
5
from plotly .graph_objs import graph_objs
6
6
from plotly .tools import make_subplots
7
7
8
- from numbers import Number
9
8
import math
9
+ import copy
10
+ from numbers import Number
10
11
11
12
pd = optional_imports .get_module ('pandas' )
12
13
@@ -489,7 +490,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
489
490
marker = dict (
490
491
color = marker_color ,
491
492
line = kwargs_marker ['line' ],
492
- #opacity=kwargs_marker['opacity'],
493
493
),
494
494
** kwargs_trace
495
495
)
@@ -514,7 +514,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
514
514
marker = dict (
515
515
color = marker_color ,
516
516
line = kwargs_marker ['line' ],
517
- #opacity=kwargs_marker['opacity'],
518
517
),
519
518
** kwargs_trace
520
519
)
@@ -565,7 +564,6 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
565
564
marker = dict (
566
565
color = marker_color ,
567
566
line = kwargs_marker ['line' ],
568
- #opacity=kwargs_marker['opacity'],
569
567
),
570
568
** kwargs_trace
571
569
)
@@ -818,14 +816,15 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
818
816
819
817
# seperate kwargs for marker and else
820
818
if 'marker' in kwargs :
821
- kwargs_marker = kwargs ['marker' ]
819
+ kwargs_marker = copy . copy ( kwargs ['marker' ])
822
820
else :
823
821
kwargs_marker = {}
824
- for param in ['color' ]:
825
- kwargs_marker .pop (param , None )
822
+ marker_color = kwargs_marker .pop ('color' , None )
826
823
kwargs .pop ('marker' , None )
827
- kwargs_trace = kwargs
824
+ kwargs_trace = copy . copy ( kwargs )
828
825
826
+ print kwargs_marker
827
+ print kwargs_trace
829
828
if 'size' not in kwargs_marker :
830
829
if ggplot2 :
831
830
kwargs_marker ['size' ] = 5
@@ -844,7 +843,8 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
844
843
845
844
# default marker size
846
845
if not ggplot2 :
847
- marker_color = 'rgb(31, 119, 180)'
846
+ if not marker_color :
847
+ marker_color = 'rgb(31, 119, 180)'
848
848
else :
849
849
marker_color = 'rgb(0, 0, 0)'
850
850
0 commit comments