[Pie Chart] Add three new attributes Half circle,Pad Angle,Corner Radius to Pie Chart #1685
Conversation
| @@ -1207,16 +1207,34 @@ class DistributionPieViz(NVD3Viz): | |||
| viz_type = "pie" | |||
| verbose_name = _("Distribution - NVD3 - Pie Chart") | |||
| is_timeseries = False | |||
| # fieldsets = ({ | |||
| .endAngle(function(d) { return d.endAngle/2 -Math.PI/2 }); | ||
| } | ||
|
|
||
| if (fd.pie_title){ |
There was a problem hiding this comment.
I don't see references to pie_title, pie_title_pffset and pie_pad_angle anywhere else. Am i missing something?
| chart.cornerRadius(fd.pie_corner_radius); | ||
| }else{ | ||
| chart.cornerRadius(0); | ||
| } | ||
| break; | ||
|
|
There was a problem hiding this comment.
If the default is 0 you don't need the conditionals i think
| "label": _("Pad Angle"), | ||
| "default": 0, | ||
| "choices": self.choicify([ | ||
| 0, |
There was a problem hiding this comment.
one line should be enough for them
| "label": _("Corner Radius"), | ||
| "default": 0, | ||
| "choices": self.choicify([ | ||
| 0, |
| .startAngle(function(d) { return d.startAngle/2 -Math.PI/2 }) | ||
| .endAngle(function(d) { return d.endAngle/2 -Math.PI/2 }); | ||
| } | ||
| if (fd.pie_title){ |
There was a problem hiding this comment.
I don't see references of pie_title, pie_title_offset anywhere else.
|
@xrmx thank you for your advice.I correct it now, you can have a check again. |
|
@ganshanshan you ignored half of my comments |
| "label": _("Pad Angle"), | ||
| "default": 0, | ||
| "choices": self.choicify([ | ||
| 0, |
There was a problem hiding this comment.
one line for all of them should be enough
| "label": _("Corner Radius"), | ||
| "default": 0, | ||
| "choices": self.choicify([ | ||
| 0, |
| return d.endAngle / 2 - Math.PI / 2; | ||
| }); | ||
| } | ||
| if (fd.pie_title) { |
| if (fd.pie_title) { | ||
| chart.title(fd.pie_title); | ||
| } | ||
| if (fd.pie_title_offset) { |
| if (fd.pie_title_offset) { | ||
| chart.titleOffset(fd.pie_title_offset); | ||
| } | ||
| if (fd.pie_pad_angle) { |
There was a problem hiding this comment.
if pie_pad_angle default is 0 you don't need the if
| if (fd.pie_pad_angle) { | ||
| chart.padAngle(fd.pie_pad_angle); | ||
| } | ||
| if (fd.pie_corner_radius) { |
|
@xrmx Sorry for my mistake,I have update it.You can have a check. |
|
Hi @xrmx ,if you think my code is okay,could you please merge pull reqiest? |
| }), | ||
| 'pie_half_circle': (BetterBooleanField, { | ||
| "label": _("Half circle"), | ||
| "default": True, |
| @@ -1149,6 +1149,9 @@ def visit_column(element, compiler, **kw): | |||
| qry.compile( | |||
| engine, compile_kwargs={"literal_binds": True},), | |||
| ) | |||
| template_processor = get_template_processor( | |||
There was a problem hiding this comment.
Sorry,i remove it.this is for jinja {{}} in the SQL ,no only in WHEWE or HAVING.
| "label": _("Corner Radius"), | ||
| "default": 0, | ||
| "choices": self.choicify([0, 1, 2, 3, 4, 5, 6, 7, 8]), | ||
| "description": _("Pad Angle of default viewport." |
There was a problem hiding this comment.
looks like it's between 0 and 8
There was a problem hiding this comment.
In [1]: range(9)
Out[1]: [0, 1, 2, 3, 4, 5, 6, 7, 8]
| @@ -1208,14 +1208,21 @@ class DistributionPieViz(NVD3Viz): | |||
| verbose_name = _("Distribution - NVD3 - Pie Chart") | |||
| is_timeseries = False | |||
| fieldsets = ({ | |||
| 'label': None, | |||
| 'label': 'Criterion', | |||
There was a problem hiding this comment.
Do we really need the label here? Criterion does not look like the right one anyway.
There was a problem hiding this comment.
agreed, better None than 'Criterion'
There was a problem hiding this comment.
Would love to see screenshots, I'm curious to see whether the half-pie centers properly and how the other options look like (trying to understand how that may be preferable to existing options).
Rounding the corners may not be visually accurate as small charts get more shaved off proportionally than large ones. Not a big deal, but styling should not diminish visual accuracy.
Also to note is that you currently need to do your change in exploreV2 as well until we fully migrate there. Essentially the configuration elements in viz.py and forms.py are moving to the javascript layer. Let us know if you can't find the place to change the file and the endpoint for exploreV2 to test it
| "label": _("Corner Radius"), | ||
| "default": 0, | ||
| "choices": self.choicify([0, 1, 2, 3, 4, 5, 6, 7, 8]), | ||
| "description": _("Pad Angle of default viewport." |
There was a problem hiding this comment.
In [1]: range(9)
Out[1]: [0, 1, 2, 3, 4, 5, 6, 7, 8]
| ('labels_outside', 'pie_half_circle'), | ||
| ('pie_pad_angle', 'pie_corner_radius'), | ||
| ), | ||
| "description": _("Properties setting of default viewport.") |
There was a problem hiding this comment.
_("Rendering options for the pie chart")
There was a problem hiding this comment.
Thanks very much, I update my code.
There was a problem hiding this comment.
| @@ -1208,14 +1208,21 @@ class DistributionPieViz(NVD3Viz): | |||
| verbose_name = _("Distribution - NVD3 - Pie Chart") | |||
| is_timeseries = False | |||
| fieldsets = ({ | |||
| 'label': None, | |||
| 'label': 'Criterion', | |||
There was a problem hiding this comment.
agreed, better None than 'Criterion'
|
There's been merge conflicts for a long time, feel free to re-open once conflicts are sorted out. |
Add three new attributes Half circle,Pad Angle,Corner Radius to Pie Chart