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,9 @@ 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
+- Add Piechart drawing in mutliplot
 
 ## [0.7.1]
 ### Add

diff --git a/plot_data/core.py b/plot_data/core.py
@@ -716,6 +716,30 @@ 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 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[Any] = None, axes: List[str] = None,
                  point_style: PointStyle = None, surface_style: SurfaceStyle = None,
@@ -1001,8 +1025,8 @@ def __init__(self, elements=None, edge_style: EdgeStyle = None,
         self.elements = elements
         self.edge_style = edge_style
         self.disposition = disposition
-        self.attribute_names = axes
-        self.rgbs = rgbs
+        self.attribute_names = axes # TODO: Seems unused
+        self.rgbs = rgbs # TODO: Seems unused
         PlotDataObject.__init__(self, type_='parallelplot', name=name)
 
 
@@ -1151,6 +1175,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))
 
@@ -1161,7 +1187,7 @@ def plot_canvas(plot_data_object: Subclass[PlotDataObject],
     cdn_url = 'https://cdn.dessia.tech/js/plot-data/{}/{}'
     lib_path = cdn_url.format(version, filename)
     if debug_mode:
-        core_path = os.sep.join(os.getcwd().split(os.sep)[:-1] + [folder, filename])
+        core_path = os.sep.join(__file__.split(os.sep)[:-2] + [folder, filename])
 
         if not os.path.isfile(core_path):
             msg = 'Local compiled {} not found, fall back to CDN'

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/minimal_dataviz.py b/script/minimal_dataviz.py
@@ -16,7 +16,6 @@
 axes = ['cost', 'mass', 'wiring_length']
 
 for i in range(100):
-
     elements.append({'mass': 52+ 47*random.random(),
                      'cost': 231 + 89*random.random(),
                      'wiring_length': 8.9 + 3.1*random.random()})

diff --git a/script/multiple_plots.py b/script/multiple_plots.py
@@ -16,31 +16,36 @@
 a list of vectors (dictionaries) that are displayed
 through different representations such as parallel plots and scatter plots
 """
-elements = []
+data_samples = []
 
-nb_elements = 50
+nb_samples = 50
 available_colors = [colors.VIOLET, colors.BLUE, colors.GREEN, colors.RED, colors.YELLOW, colors.CYAN, colors.ROSE]
 directions = ['north', 'south', 'west', 'east']
-for i in range(nb_elements):
+for i in range(nb_samples):
     random_color = available_colors[random.randint(0, len(available_colors) - 1)]
     random_direction = directions[random.randint(0, len(directions) - 1)]
-    elements.append({'x': random.uniform(0, 200),
-                     'y': random.uniform(0, 100),
-                     'color': random_color,
-                     'direction': random_direction})
+    data_samples.append({'x': random.uniform(0, 200),
+                         'y': random.uniform(0, 100),
+                         'color': random_color,
+                         'direction': random_direction})
 
 """ ParallelPlot """
 parallelplot1 = plot_data.ParallelPlot(axes=['x', 'y', 'color', 'direction'])
 parallelplot2 = plot_data.ParallelPlot(axes=['y', 'color'])
 
 """Scatterplots"""
 scatterplot1 = plot_data.Scatter(x_variable='x', y_variable='y')
+piechart1 = plot_data.PieChart(data_samples=data_samples,
+                               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')
+piechart1 = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='direction')
+
 
 """PrimitiveGroupContainers"""
 contour = plot_data.Contour2D(plot_data_primitives=[plot_data.LineSegment2D([1, 1], [1, 2]),
@@ -67,13 +72,35 @@
 
 """Creating the multiplot"""
 plots = [parallelplot1, parallelplot2, scatterplot1,
-         scatterplot2, scatterplot3, graph2d, primitive_group_container,
+         scatterplot2, piechart1, graph2d, primitive_group_container,
+         histogram, graph2d, primitive_group_container,
          histogram]
 
-# plots = [scatterplot1, scatterplot2]
-
-multiplot = plot_data.MultiplePlots(plots=plots, elements=elements,
+multiplot = plot_data.MultiplePlots(plots=plots, elements=data_samples,
                                     initial_view_on=True)
 
 # Display
 plot_data.plot_canvas(plot_data_object=multiplot, debug_mode=True)
+
+plots2 = [piechart1, piechart1, piechart1, piechart1, piechart1, piechart1,
+          piechart1, piechart1, piechart1, piechart1, piechart1, piechart1,
+          piechart1, piechart1, piechart1, piechart1, piechart1]
+
+multiplot2 = plot_data.MultiplePlots(plots=plots2, elements=data_samples,
+                                    initial_view_on=True)
+
+# Display
+plot_data.plot_canvas(plot_data_object=multiplot2, debug_mode=True)
+
+
+plots3 = [scatterplot2, scatterplot2, scatterplot2, scatterplot2, scatterplot2, scatterplot2,
+          scatterplot2, scatterplot2, scatterplot2, scatterplot2]
+
+multiplot3 = plot_data.MultiplePlots(plots=plots3, elements=data_samples,
+                                    initial_view_on=True)
+
+# Display
+plot_data.plot_canvas(plot_data_object=multiplot3, debug_mode=True)
+
+
+
diff --git a/script/parallel_plot.py b/script/parallel_plot.py
@@ -42,5 +42,5 @@
                                                  rgbs=rgbs)
 
 # if debug_mode == True, set it to False
-plot_data.plot_canvas(plot_data_object=parallelplot, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=customized_parallelplot, debug_mode=True)
 
diff --git a/script/pie_chart.py b/script/pie_chart.py
@@ -0,0 +1,39 @@
+#!/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
+import pkg_resources
+from dessia_common import tests
+
+csv_cars = pkg_resources.resource_stream('dessia_common', 'models/data/cars.csv')
+all_cars = [c.to_dict() for c in tests.Car.from_csv(csv_cars)]
+
+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=all_cars,
+                               slicing_variable='mpg')
+
+piechart2 = plot_data.PieChart(data_samples=data_samples,
+                               slicing_variable='shape')
+
+
+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/script/primitive_group_container.py b/script/primitive_group_container.py
@@ -14,17 +14,19 @@
 circle1 = plot_data.Circle2D(cx=0, cy=0, r=10)
 circle2 = plot_data.Circle2D(cx=1, cy=1, r=5, surface_style=plot_data.SurfaceStyle(colors.RED))
 circle3 = plot_data.Circle2D(cx=1, cy=1, r=5, surface_style=plot_data.SurfaceStyle(colors.LIGHTBROWN))
+line1 = plot_data.Line2D([2, 3], [1, 3])
 
 primitive_group1 = plot_data.PrimitiveGroup(primitives=[circle1])
 primitive_group2 = plot_data.PrimitiveGroup(primitives=[contour])
 primitive_group3 = plot_data.PrimitiveGroup(primitives=[circle2])
 primitive_group4 = plot_data.PrimitiveGroup(primitives=[circle3])
-primitive_groups = [primitive_group1, primitive_group2, primitive_group3, primitive_group4]
+primitive_groupl = plot_data.PrimitiveGroup(primitives=[line1])
+primitive_groups = [primitive_group1, primitive_group2, primitive_group3, primitive_groupl, primitive_group4]
 
 primitive_group_container = plot_data.PrimitiveGroupsContainer(primitive_groups=primitive_groups)
 
 # if debug_mode is True, set it to False
-plot_data.plot_canvas(plot_data_object=primitive_group_container, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=primitive_group_container, debug_mode=False)
 
 
 
diff --git a/script/scatter_matrix.py b/script/scatter_matrix.py
@@ -1,19 +1,27 @@
 import plot_data
 import plot_data.colors as colors
 import random
+import pkg_resources
+from dessia_common import tests, cluster
+
+csv_cars = pkg_resources.resource_stream('dessia_common', 'models/data/cars.csv')
+all_cars = [c.to_dict() for c in tests.Car.from_csv(csv_cars)]
 # A script showing scatter plots instantiations.
 
-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
-                     })
+# 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
+#                      })
+
+
+
 
-scatter_matrix = plot_data.ScatterMatrix(elements=elements)
+scatter_matrix = plot_data.ScatterMatrix(elements=all_cars, axes = ['cylinders', 'displacement', 'mpg'])
 plot_data.plot_canvas(scatter_matrix, True)
diff --git a/script/scatter_plot.py b/script/scatter_plot.py
@@ -67,9 +67,9 @@
                                            point_style=point_style,
                                            elements=elements,
                                            axis=axis,
-                                           tooltip=tooltip,
+                                           tooltip=custom_tooltip,
                                            heatmap=heatmap)
 
 # if debug_mode is True, set it to False
-plot_data.plot_canvas(plot_data_object=scatterplot, debug_mode=True)
+plot_data.plot_canvas(plot_data_object=customized_scatterplot, debug_mode=True)
 
diff --git a/script/test_objects/graph_test.py b/script/test_objects/graph_test.py
@@ -36,4 +36,4 @@
 
 
 graph2d = plot_data.Graph2D(graphs=[dataset2], log_scale_x=True, log_scale_y=True,
-                            x_variable='time', y_variable='electric current')
+                            x_variable='time', y_variable='electric current')
diff --git a/script/test_objects/primitive_group_test.py b/script/test_objects/primitive_group_test.py
@@ -71,3 +71,7 @@
 primitives = [point, contour, line, arc,
               circle, text, labels, wire]
 primitive_group = plot_data.PrimitiveGroup(primitives=primitives)
+
+container = plot_data.PrimitiveGroupsContainer([primitive_group])
+
+plot_data.plot_canvas(container)
diff --git a/src/coordinates.ts b/src/coordinates.ts
@@ -0,0 +1,26 @@
+// import { Position } from "@models/workflow"
+
+
+
+// export class Coordinates {
+//   x: number
+//   y: number
+
+//   constructor(x = 0, y = 0) {
+//     this.x = x
+//     this.y = y
+//   }
+
+//   *[Symbol.iterator]() {
+//     let positionAsArray = [this.x, this.y]
+//     for (let item of positionAsArray) yield item
+//   }
+
+//   toPosition(scale: number, originCoordinates: Coordinates) {
+//     return new Position((this.x - originCoordinates.x) / scale, (this.y - originCoordinates.y) / scale)
+//   }
+
+//   copy() {
+//     return new Coordinates(this.x, this.y)
+//   }
+// }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,4 @@


		graph2d = plot_data.Graph2D(graphs=[dataset2], log_scale_x=True, log_scale_y=True,
		x_variable='time', y_variable='electric current')
		x_variable='time', y_variable='electric current')