Dessia-tech · Tanguylo · Jun 3, 2022 · Jun 7, 2022 · Jun 7, 2022 · Jun 8, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased => [0.7.2]
+### Add
+- Add Piechart drawing
 
 ## [0.7.1]
 ### Add

diff --git a/code_pylint.py b/code_pylint.py
@@ -44,7 +44,7 @@
                      'too-many-return-statements': 8,
                      'raise-missing-from': 6,
                      'consider-merging-isinstance': 6,
-                     'abstract-method': 25,
+                     'abstract-method': 26,
                      'import-outside-toplevel': 7,
                      'too-many-instance-attributes': 3,
                      'consider-iterating-dictionary': 4,

diff --git a/cypress/e2e/piechart.cy.ts b/cypress/e2e/piechart.cy.ts
@@ -0,0 +1,19 @@
+import { parseHTML } from '../support/parseHTML';
+import piechartData from '../data_src/piechart.data.json';
+
+const FEATURE_NAME = "piechart"
+
+before(() => {
+  parseHTML(FEATURE_NAME, piechartData)
+})
+
+describe('PIECHART CANVAS', function () {
+  const describeTitle = this.title + ' -- '
+  beforeEach(() => {
+    cy.visit("cypress/html_files/" + FEATURE_NAME + ".html");
+  })
+
+  it("should draw canvas", function () {
+    cy.compareSnapshot(describeTitle + this.test.title, 0.05);
+  })
+})
diff --git a/cypress/snapshots/base/graph2d.cy.ts/GRAPH2D CANVAS -- should draw canvas-base.png b/cypress/snapshots/base/graph2d.cy.ts/GRAPH2D CANVAS -- should draw canvas-base.png
diff --git a/.../MULTIPLOT CANVAS -- should add primitive group container in multiplot-base.png b/.../MULTIPLOT CANVAS -- should add primitive group container in multiplot-base.png
diff --git a/.../snapshots/base/multiplot.cy.ts/MULTIPLOT CANVAS -- should draw canvas-base.png b/.../snapshots/base/multiplot.cy.ts/MULTIPLOT CANVAS -- should draw canvas-base.png
diff --git a/...OT CANVAS -- should remove primitive group from container in multiplot-base.png b/...OT CANVAS -- should remove primitive group from container in multiplot-base.png
diff --git a/...multiplot.cy.ts/MULTIPLOT CANVAS -- should reorder all plots in canvas-base.png b/...multiplot.cy.ts/MULTIPLOT CANVAS -- should reorder all plots in canvas-base.png
diff --git a/...ss/snapshots/base/piechart.cy.ts/PIECHART CANVAS -- should draw canvas-base.png b/...ss/snapshots/base/piechart.cy.ts/PIECHART CANVAS -- should draw canvas-base.png
diff --git a/cypress/templates/piechart.template.html b/cypress/templates/piechart.template.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <script src=$core_path></script>
+  </head>
+    <div id="app">
+        <canvas id="canvas" style="border: 1px solid black;"></canvas>
+
+        <script type="text/javascript">
+            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");
+            plot_data.define_canvas("canvas");
+            plot_data.draw_initial();
+            plot_data.mouse_interaction(false);
+        </script>
+    </div>
+</html>
diff --git a/plot_data/core.py b/plot_data/core.py
@@ -755,6 +755,30 @@ def __init__(self, x_variable: str, y_variable: str, tooltip: Tooltip = None, po
         PlotDataObject.__init__(self, type_='scatterplot', name=name)
 
 
+class PieChart(PlotDataObject):
+    """
+    A class for drawing pie plots.
+
+    :param data_samples: [{'name_param_1': any,..., 'name_param_p': any},...,
+                          {'name_param_1': any,..., 'name_param_p': any}]
+    :type data_samples: List[dict]
+    :param slicing_variable: variable that you want to use to fill pie parts
+    :type slicing_variable: str
+    """
+
+    def __init__(self, slicing_variable: str, 
+                 data_samples: List[Any] = None,
+                 name: str = ''):
+
+        self.slicing_variable = slicing_variable
+        if not data_samples:
+            self.data_samples = []
+        else:
+            self.data_samples = data_samples
+
+        PlotDataObject.__init__(self, type_='piechart', name=name)
+
+
 class ScatterMatrix(PlotDataObject):
     def __init__(self, elements: List[Sample] = None, axes: List[str] = None,
                  point_style: PointStyle = None, surface_style: SurfaceStyle = None,
@@ -1199,6 +1223,8 @@ def plot_canvas(plot_data_object: 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,35 @@
   </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(false);
+        </script>
+    </div>
+</html>
+''')
diff --git a/script/ci_tests.py b/script/ci_tests.py
@@ -24,6 +24,7 @@
     "plot_scatter.py",
     "primitive_group.py",
     "simple_shapes.py",
+    "pie_chart.py",
     "text_scaling.py"
 ]
 

diff --git a/script/multiplot.py b/script/multiplot.py
@@ -37,12 +37,14 @@
 
 """Scatterplots"""
 scatterplot1 = plot_data.Scatter(x_variable='x', y_variable='y')
+piechart1 = plot_data.PieChart(data_samples=elements,
+                               slicing_variable='mass')
 
 scatterplot2 = plot_data.Scatter(x_variable='y', y_variable='color',
                                  point_style=plot_data.PointStyle(shape='square'))  # optional argument that changes
                                                                                     # points' appearance
 
-scatterplot3 = plot_data.Scatter(x_variable='x', y_variable='direction')
+# scatterplot3 = plot_data.Scatter(x_variable='x', y_variable='direction')
 
 """PrimitiveGroupContainers"""
 contour = plot_data.Contour2D(plot_data_primitives=[plot_data.LineSegment2D([1, 1], [1, 2]),
@@ -68,8 +70,7 @@
 histogram = plot_data.Histogram(x_variable='x')
 
 """Creating the multiplot"""
-plots = [parallelplot1, parallelplot2, scatterplot1,
-         scatterplot2, scatterplot3, graph2d, primitive_group_container,
+plots = [parallelplot1, parallelplot2, scatterplot1, scatterplot2, parallelplot1, graph2d, primitive_group_container,
          histogram]
 
 # plots = [scatterplot1, scatterplot2]

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
+
+
+data_samples = []
+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)]
+    data_samples.append({'mass': random.uniform(0, 50),
+                     'length': random.uniform(0, 100),
+                     'shape': random_shape,
+                     'color': random_color
+                     })
+
+
+piechart1 = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='mass')
+
+plot_data_object = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='length')
+
+
+plot_data.plot_canvas(plot_data_object=piechart1, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=plot_data_object, debug_mode=True)
diff --git a/src/multiplots.ts b/src/multiplots.ts
@@ -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);
@@ -101,6 +101,7 @@ export class MultiplePlots {
         }
         this.initializeObjectContext(newObject);
         this.objectList.push(newObject);
+        console.log(newObject)
       }
       if (elements) {this.initialize_point_families();}
 
@@ -109,6 +110,7 @@ export class MultiplePlots {
         this.display_order.push(i);
         this.to_display_plots.push(i);
       }
+
       this.mouse_interaction();
 
       if (buttons_ON) {