Skip to content

Commit

Permalink
Merge pull request #12 from ayamahmod/master
Browse files Browse the repository at this point in the history
ColorAxis Error Fixed [Update highcharts.py] , Heatmap Hover Color Error Fixed [Update common.py]
  • Loading branch information
ksolan authored Oct 31, 2016
2 parents ef0ba31 + 1445531 commit 17ced17
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions highcharts/highcharts/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,7 @@ class Hover(CommonObject):
"marker": (Marker, dict),
"radius": int,
"radiusPlus": int,
"color": (ColorObject, basestring, dict),
}

class States(CommonObject):
Expand Down
5 changes: 4 additions & 1 deletion highcharts/highcharts/highcharts.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __init__(self, **kwargs):
# Bind Base Classes to self
self.options = {
"chart": ChartOptions(),
"colorAxis" : ColorAxisOptions(),
#"colorAxis" : ColorAxisOptions(),
"colors": ColorsOptions(),
"credits": CreditsOptions(),
#"data": #NotImplemented
Expand Down Expand Up @@ -270,6 +270,9 @@ def set_options(self, option_type, option_dict, force_options=False):
self.options[option_type].update_dict(**option_dict)
elif option_type in ["global" , "lang"]: #Highcharts.setOptions:
self.setOptions[option_type].update_dict(**option_dict)
elif option_type == 'colorAxis':
self.options.update({'colorAxis': ColorAxisOptions()})
self.options[option_type].update_dict(**option_dict)
else:
self.options[option_type].update_dict(**option_dict)

Expand Down

0 comments on commit 17ced17

Please sign in to comment.