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
@@ -720,36 +720,29 @@ 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)
+    :param elements: [{'name_param_1': any,..., 'name_param_p': any},...,
+                      {'name_param_1': any,..., 'name_param_p': any}]
     :type elements: List[dict]
-    :param x_variable: variable that you want to display on x axis
-    :type x_variable: str
+    :param trim_variable: variable that you want to use to fill pie parts
+    :type trim_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,
+    def __init__(self, slicing_variable: str, data_samples: 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()
+        self.slicing_variable = slicing_variable
+        if not data_samples:
+            self.data_samples = []
         else:
-            self.axis = axis
+            self.data_samples = data_samples
+
         PlotDataObject.__init__(self, type_='piechart', name=name)
 
 

diff --git a/plot_data/templates.py b/plot_data/templates.py
@@ -252,38 +252,8 @@
             );
             plot_data.define_canvas($canvas_id.id);
             plot_data.draw_initial();
-            plot_data.mouse_interaction(plot_data.isParallelPlot);
+            plot_data.mouse_interaction(false);
         </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
@@ -11,25 +11,25 @@
 import random
 
 
-elements = []
+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)]
-    elements.append({'mass': random.uniform(0, 50),
+    data_samples.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') 
+piechart1 = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='mass')
 
-# piechart = plot_data.PieChart(elements=elements,
-#                                 x_variable='shape', y_variable='length')
+piechart2 = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='length')
 
 
-
-plot_data.plot_canvas(plot_data_object=piechart, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=piechart1, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=piechart2, debug_mode=True)
diff --git a/src/plot-data.ts b/src/plot-data.ts
@@ -1,5 +1,5 @@
 import { heatmap_color, string_to_hex } from "./color_conversion";
-import { Point2D, PrimitiveGroup, Contour2D, Circle2D, Dataset, Graph2D, Scatter, Heatmap, Wire, PieChart, PiePart } from "./primitives";
+import { Point2D, PrimitiveGroup, Contour2D, Circle2D, Dataset, Graph2D, Scatter, Heatmap, Wire, PieChart } from "./primitives";
 import { Attribute, PointFamily, Axis, Tooltip, Sort, permutator } from "./utils";
 import { EdgeStyle } from "./style";
 import { Shape, List, MyMath } from "./toolbox";
@@ -291,6 +291,7 @@ export abstract class PlotData {
       this.init_scale = 0.95 * (this.width - this.decalage_axis_x) / (this['max_abs'] - this['min_abs']);
       this.scale = this.init_scale;
       this.originX = this.decalage_axis_x - this.scale * this['min_abs'];
+
     } else { // only rescale
       this.scaleX = this.init_scale;
       this.scaleY = this.init_scale;
@@ -776,53 +777,43 @@ export abstract class PlotData {
 
 
   drawPiechart(d: PieChart, hidden: boolean, mvx: number, mvy: number): void {
-    this.interaction_ON = true;
-    if (d['type_'] == 'piechart') {
-      const radius: number = this.height / this.init_scaleY * 0.45;
-      const center: Array<number> = [this.width / this.init_scaleX / 1.9, this.height / this.init_scaleY / 2];
-      let colorRadius: number = 0;
-      let colorRatio: number = 360 / d.pieParts.length;
-      this.context.lineWidth = 0.5;
-
-      for (let part of d.pieParts) {
-        part.centerX = center[0];
-        part.centerY = center[1];
-        part.radius = radius;
-        colorRadius += colorRatio;
-
-        this.color_to_plot_data[part.hidden_color] = part;
-
-        if (hidden) {
-          this.context.strokeStyle = part.hidden_color;
-          this.context.fillStyle = part.hidden_color;
-        } else {
-          if (part.clicked){
-            d.pieParts.forEach(piepart => piepart.clicked = false);
-            part.clicked = true;
-          }
-          if (part.clicked && this.select_on_mouse !== part) {
-            this.context.fillStyle = this.color_surface_on_click;
-            this.context.strokeStyle = this.color_surface_on_click;
-          } else if (part.clicked && this.select_on_mouse === part) {
-            this.context.fillStyle = this.color_surface_on_mouse;
-            this.context.strokeStyle = this.color_surface_on_mouse;
-          } else if (!part.clicked && this.select_on_mouse === part) { 
-            this.context.fillStyle  = this.color_surface_on_mouse;
-            this.context.strokeStyle  = this.color_surface_on_mouse;
-          } else {
-            this.context.fillStyle  = 'hsl('+ colorRadius +', 50%, 50%, 90%)';
-            this.context.strokeStyle  = 'hsl('+ colorRadius +', 50%, 50%, 90%)';
-          } 
-          this.context.fillStyle = part.color;
-          this.context.strokeStyle = part.color;
+    const radius: number = this.height;
+    const center: [number, number] = [this.width / this.init_scaleX / 2, this.height / this.init_scaleY / 2];
+    const colorRatio: number = 360 / d.pieParts.length;
+    let colorRadius: number = 0;
+    this.context.lineWidth = 0.5;
+
+    for (let part of d.pieParts) {
+      part.centerX = center[0];
+      part.centerY = center[1];
+      part.radius = radius;
+      colorRadius += colorRatio;
+
+      if (hidden) {
+        this.context.strokeStyle = part.hidden_color;
+        this.context.fillStyle = part.hidden_color;
+      } else {
+        if (part.clicked){
+          d.pieParts.forEach(piepart => piepart.clicked = false);
+          part.clicked = true;
         }
-        part.draw(this.context, mvx, mvy, this.scaleX, this.X, this.Y);
+        if (part.clicked && this.select_on_mouse !== part) {
+          part.color = this.color_surface_on_click;
+
+        } else if (this.select_on_mouse === part) {
+          part.color = this.color_surface_on_mouse;
+
+        } else {
+          part.color  = 'hsl('+ colorRadius +', 50%, 50%, 90%)';
+        } 
+        this.context.fillStyle = part.color;
+        this.context.strokeStyle = part.color;
       }
-      this.draw_tooltip(d.tooltip, mvx, mvy, this.scatter_points, d.point_list, d.elements, this.mergeON,
-        d.attribute_names);
+      part.draw(this.context, mvx, mvy, this.scaleX, this.X, this.Y);
     }
   }
 
+
   get_point_order() {
     var point_order = [];
     for (let i = 0; i < this.point_families.length; i++) {