Dessia-tech · Tanguylo · Jun 3, 2022 · Jun 7, 2022 · Jun 7, 2022 · Jun 8, 2022
diff --git a/plot_data/core.py b/plot_data/core.py
@@ -716,6 +716,43 @@ def __init__(self, x_variable: str, y_variable: str,
         PlotDataObject.__init__(self, type_='scatterplot', name=name)
 
 
+class PieChart(PlotDataObject):
+    """
+    A class for drawing pie plots.
+
+    :param elements: A list of vectors. Vectors must have the same \
+    attributes (ie the same keys)
+    :type elements: List[dict]
+    :param x_variable: variable that you want to display on x axis
+    :type x_variable: str
+    :param tooltip: an object containing all information needed for \
+    drawing tooltips
+    :type tooltip: Tooltip
+    :param point_style: for points' customization
+    :type point_style: PointStyle
+    """
+
+    def __init__(self, x_variable: str, elements: List[Any] = None,
+                  tooltip: Tooltip = None,
+                  point_style: PointStyle = None,
+                  edge_style: EdgeStyle = None,
+                  axis: Axis = None,
+                  name: str = ''):
+
+        self.tooltip = tooltip
+        self.attribute_names = [x_variable]
+        self.point_style = point_style
+        if not elements:
+            self.elements = []
+        else:
+            self.elements = elements
+        if not axis:
+            self.axis = Axis()
+        else:
+            self.axis = axis
+        PlotDataObject.__init__(self, type_='piechart', name=name)
+
+
 class ScatterMatrix(PlotDataObject):
     def __init__(self, elements: List[Any] = None, axes: List[str] = None,
                  point_style: PointStyle = None, surface_style: SurfaceStyle = None,
@@ -1151,6 +1188,8 @@ def plot_canvas(plot_data_object: Subclass[PlotDataObject],
         template = templates.histogram_template
     elif plot_type == "scattermatrix":
         template = templates.scatter_matrix_template
+    elif plot_type == "piechart":
+        template = templates.piechart_template
     else:
         raise NotImplementedError('Type {} not implemented'.format(plot_type))
 

diff --git a/plot_data/templates.py b/plot_data/templates.py
@@ -225,3 +225,65 @@
   </body>
 </html>
 ''')
+
+
+piechart_template = Template('''
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <script src=$core_path></script>
+  </head>
+    <div id="app">
+        <canvas id="$canvas_id" width="2000" height="490"
+                    style="border: 1px solid black;">
+        </canvas>
+
+        <!-- Sets the basepath for the library if not in same directory -->
+
+        <script>
+            var width = 0.95*window.innerWidth;
+            var height = Math.max(0.95*window.innerHeight, 350);
+
+            var data = $data;
+            var number_plot_data = data.length;
+
+            var plot_data = new PlotData.PlotPieChart(
+                data, width, height, true, 0, 0, $canvas_id.id
+            );
+            plot_data.define_canvas($canvas_id.id);
+            plot_data.draw_initial();
+            plot_data.mouse_interaction(plot_data.isParallelPlot);
+        </script>
+    </div>
+</html>
+''')
+
+# piechart_template = Template('''
+# <!DOCTYPE html>
+# <html lang="en">
+#   <head>
+#     <script src=$core_path></script>
+#   </head>
+#     <div id="app">
+#         <canvas id="$canvas_id" width="2000" height="490"
+#                     style="border: 1px solid black;">
+#         </canvas>
+
+#         <!-- Sets the basepath for the library if not in same directory -->
+
+#         <script>
+#             var width = 0.95*window.innerWidth;
+#             var height = Math.max(0.95*window.innerHeight, 350);
+
+#             var data = $data;
+#             var number_plot_data = data.length;
+
+#             var plot_data = new PlotData.PlotPieChart(
+#                 data, width, height, true, 0, 0, $canvas_id.id
+#             );
+#             plot_data.define_canvas($canvas_id.id);
+#             plot_data.draw_initial();
+#         </script>
+#     </div>
+# </html>
+# ''')
diff --git a/script/pie_chart.py b/script/pie_chart.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Fri Jun  3 16:18:31 2022
+
+@author: tanguy
+"""
+
+import plot_data
+import plot_data.colors as colors
+import random
+
+
+elements = []
+SHAPES = ['round', 'square', 'triangle', 'ellipse']
+COLORS = [colors.RED, colors.BLUE, colors.GREEN, colors.YELLOW, colors.ORANGE, colors.VIOLET]
+for i in range(50):
+    random_shape = SHAPES[random.randint(0, len(SHAPES) - 1)]
+    random_color = COLORS[random.randint(0, len(SHAPES) - 1)]
+    elements.append({'mass': random.uniform(0, 50),
+                     'length': random.uniform(0, 100),
+                     'shape': random_shape,
+                     'color': random_color
+                     })
+
+
+piechart = plot_data.PieChart(elements=elements,
+                                x_variable='mass') 
+
+# piechart = plot_data.PieChart(elements=elements,
+#                                 x_variable='shape', y_variable='length')
+
+
+
+plot_data.plot_canvas(plot_data_object=piechart, debug_mode=True)
diff --git a/src/multiplots.ts b/src/multiplots.ts
@@ -1,7 +1,7 @@
 import {PlotData, Interactions} from './plot-data';
 import {Point2D} from './primitives';
 import { Attribute, PointFamily, check_package_version, Window, TypeOf, equals, Sort, download } from './utils';
-import { PlotContour, PlotScatter, ParallelPlot, PrimitiveGroupContainer, Histogram } from './subplots';
+import { PlotContour, PlotScatter, ParallelPlot, PrimitiveGroupContainer, Histogram, PlotPieChart } from './subplots';
 import { List, Shape, MyObject } from './toolbox';
 import { string_to_hex, string_to_rgb, rgb_to_string } from './color_conversion';
 
@@ -83,7 +83,7 @@ export class MultiplePlots {
         } else if (object_type_ === 'parallelplot') {
           this.dataObjects[i]['elements'] = elements;
           newObject = new ParallelPlot(this.dataObjects[i], this.sizes[i]['width'], this.sizes[i]['height'], buttons_ON, this.initial_coords[i][0], this.initial_coords[i][1], canvas_id, true);
-        } else if (object_type_ === 'primitivegroup') {
+         } else if (object_type_ === 'primitivegroup') {
           newObject = new PlotContour(this.dataObjects[i], this.sizes[i]['width'], this.sizes[i]['height'], buttons_ON, this.initial_coords[i][0], this.initial_coords[i][1], canvas_id, true);
         } else if (object_type_ === 'primitivegroupcontainer') {
           newObject = new PrimitiveGroupContainer(this.dataObjects[i], this.sizes[i]['width'], this.sizes[i]['height'], buttons_ON, this.initial_coords[i][0], this.initial_coords[i][1], canvas_id, true);
@@ -109,6 +109,7 @@ export class MultiplePlots {
         this.display_order.push(i);
         this.to_display_plots.push(i);
       }
+
       this.mouse_interaction();
 
       if (buttons_ON) {