Feat/graph

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Dependencies of sample states between plots
     - Use attributes coming from Python
 - Point families implementation as PointSet
+- Graph2D implementation
 
 ### Removed
 - Package Version checks is not implemented anymore

cypress/templates/graph2d.template.html

@@ -45,7 +45,7 @@
 
             var data = $data;
 
-            var plot_data = new PlotData.PlotScatter(data, width, height, true, 0, 0, $canvas_id.id);
+            var plot_data = new PlotData.newGraph2D(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);

plot_data/core.py

@@ -11,7 +11,7 @@
 import tempfile
 import warnings
 import webbrowser
-from typing import Dict, List, Tuple, Union
+from typing import Dict, List, Tuple, Union  # , Any
 
 import matplotlib.pyplot as plt
 from matplotlib.patches import Polygon, Circle, Arc
@@ -30,6 +30,8 @@
 import plot_data.colors
 from plot_data import templates
 
+# CURVES_DATATYPE = Union(List[float], List[str], List[List[float]], List[Dict[str, Any]])
+
 
 def delete_none_from_dict(dict1):
     """ Delete input dictionary's keys where value is None. """
@@ -762,8 +764,7 @@ class Graph2D(Figure):
     :type x_variable: str
     :param y_variable: variable that you want to display on y axis
     :type y_variable: str
-    :param axis: an object containing all information needed for \
-    drawing axis
+    :param axis: an object containing all information needed for drawing axis
     :type axis: Axis
     :param log_scale_x: True or False
     :type log_scale_x: bool
@@ -801,6 +802,109 @@ def mpl_plot(self, ax=None, **kwargs):
         ax.set_xlabel(xname)
         ax.set_ylabel(yname)
         return ax
+# TODO: commented code here is supposed to be used soon
+    # def graphs_to_curves(self):
+    #     curves = []
+    #     for graph in self.graphs:
+    #         x_coords = []
+    #         y_coords = []
+    #         for sample in graph.elements:
+    #             x_coords.append(sample[self.attribute_names[0]])
+    #             y_coords.append(sample[self.attribute_names[1]])
+    #         line_width = graph.edge_style.line_width
+    #         color = graph.edge_style.color_stroke
+    #         dash_line = graph.edge_style.dashline
+    #         marker = graph.point_style.shape
+    #         name = graph.name
+    #         curves.append(Curve(x_coords, y_coords, name, line_width=line_width, color=color, dash_line=dash_line,
+    #                             marker=marker))
+    #     return curves
+
+    # def to_plot(self):
+    #     return
+
+
+# class Curve(PlotDataObject):
+
+#     _KWARGS = ['line_width', 'color', 'dash_line', 'marker']
+
+#     def __init__(self, x_coords: Union(List[str], List[float]), y_coords: Union(List[str], List[float]) = None,
+#                  name: str = '', **kwargs):
+#         self.x_coords, self.y_coords = self.buildCoords(x_coords, y_coords)
+#         self.line_width = None
+#         self.color = None
+#         self.dash_line = None
+#         self.marker = None
+#         self.setStyle(kwargs)
+
+#     @staticmethod
+#     def buildCoords(x_coords: Union(List[str], List[float]), y_coords: Union(List[str], List[float])):
+#         if y_coords is None:
+#             return list(range(len(y_coords))), x_coords
+#         if len(x_coords) == len(y_coords):
+#             return x_coords, y_coords
+#         raise ValueError("x_coords and y_coords must be the same length.")
+
+#     def setStyle(self, kwargs: Dict[str, Any]):
+#         for attribute in self._KWARGS:
+#             if attribute in kwargs:
+#                 setattr(self, attribute, kwargs[attribute])
+
+#     @classmethod
+#     def fromPlot(cls, x_values: CURVES_DATATYPE, y_values: CURVES_DATATYPE, x_variable: str, y_variable: str,
+#                  legend: List[str], **kwargs):
+#         if isinstance(x_values[0], float):
+#             if len(legend) != 1 and legend is not None:
+#                 raise ValueError("x_values and legend must be the same length.")
+#             if legend is None:
+#                 return cls(x_values, y_values, **kwargs)
+#             if len(legend) == 1:
+#                 return cls(x_values, y_values, legend[0], **kwargs)
+
+#         if isinstance(x_values[0], dict):
+#             if x_variable not in x_values[0]:
+#                 raise ValueError(f"{x_variable} not in keys of x_values.")
+
+#             x_coords = [];
+#             y_coords = [];
+#             for elements in x_values:
+#                 x_coords.append(elements[x_variable])
+#                 y_coords.append(elements[y_variable])
+#             return cls(x_coords, y_coords, legend[0], **kwargs)
+
+#         raise TypeError("x_values must be a list of float or dict.")
+
+
+# class Plot(Figure):
+
+#     _plot_commands = "GRAPH_COMMANDS"
+
+#     def __init__(self, x_values: CURVES_DATATYPE, y_values: CURVES_DATATYPE = None, x_variable: str = None,
+#                  y_variable: str = None, axis: Axis = None, legend: List[str] = None, width: int = 750,
+#                  height: int = 400, name: str = '', **kwargs):
+#         self.curves = self.buildCurves(x_values, y_values, x_variable, y_variable, legend, **kwargs)
+#         if axis is None:
+#             self.axis = Axis()
+#         else:
+#             self.axis = axis
+#         super().__init__(width=width, height=height, type_='graph2d', name=name)
+
+#     @staticmethod
+#     def buildCurves(x_values: CURVES_DATATYPE, y_values: CURVES_DATATYPE, x_variable: str, y_variable: str,
+#                     legend: List[str], **kwargs):
+#         if isinstance(x_values[0], (str, float, dict)):
+#             return [Curve.fromPlot(x_values=x_values, y_values=y_values, x_variable=x_variable, y_variable=y_variable,
+#                                    legend=legend, **kwargs)]
+
+#         if isinstance(x_values[0], list):
+#             curves = []
+#             for x_subvalues, y_subvalues, sub_legend in zip(x_values, y_values, legend):
+#                 curves.append(Curve.fromPlot(x_values=x_subvalues, y_values=y_subvalues, x_variable=x_variable,
+#                                              y_variable=y_variable, legend=sub_legend, **kwargs))
+#             return curves
+
+#         if isinstance(x_values[0], Curve):
+#             return x_values
 
 
 class Heatmap(DessiaObject):
@@ -844,10 +948,10 @@ class Scatter(Figure):
 
     _plot_commands = "SCATTER_COMMANDS"
 
-    def __init__(self, x_variable: str, y_variable: str, tooltip: Tooltip = None, point_style: PointStyle = None,
-                 elements: List[Sample] = None, points_sets: List[PointFamily] = None, axis: Axis = None,
-                 log_scale_x: bool = None, log_scale_y: bool = None, heatmap: Heatmap = None, heatmap_view: bool = None,
-                 width: int = 750, height: int = 400, name: str = ''):
+    def __init__(self, x_variable: str = None, y_variable: str = None, tooltip: Tooltip = None,
+                 point_style: PointStyle = None, elements: List[Sample] = None, points_sets: List[PointFamily] = None,
+                 axis: Axis = None, log_scale_x: bool = None, log_scale_y: bool = None, heatmap: Heatmap = None,
+                 heatmap_view: bool = None, width: int = 750, height: int = 400, name: str = ''):
         self.tooltip = tooltip
         self.attribute_names = [x_variable, y_variable]
         self.point_style = point_style

plot_data/templates.py

@@ -39,7 +39,8 @@
         <button name="Zoom-" value="OK" type="button" onclick="plot_data.zoomOut()"> Zoom- </button> &nbsp;&nbsp;
         Cluster:&nbsp; <input type="range" class="slider" min="0" max="2500" value="1250" onclick="plot_data.simpleCluster(value / 10000)"></input>
         <button name="resetClusters" value="OK" type="button" onclick="plot_data.resetClusters()"> Reset clusters </button> &nbsp;&nbsp;
-        <button name="resetView" value="OK" type="button" onclick="plot_data.resetView()"> Reset view </button>
+        <button name="resetView" value="OK" type="button" onclick="plot_data.resetView()"> Reset view </button> &nbsp;&nbsp;
+        <button name="showPoints" value="OK" type="button" onclick="plot_data.togglePoints()"> Show points </button>
     <hr style="border-top: 2px;">
     </div>
     <div id="app">
@@ -70,7 +71,7 @@
             plot_data.mouse_interaction(plot_data.isParallelPlot);"""
 
 GRAPH_COMMANDS = """
-            var plot_data = new PlotData.PlotScatter(data, width, height, true, 0, 0, $canvas_id.id);
+            var plot_data = new PlotData.newGraph2D(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/plot_scatter.py

@@ -48,7 +48,7 @@
                                    color_stroke=VIOLET,
                                    stroke_width=2,
                                    size=8,  # 1, 2, 3 or 4
-                                   shape='^')  # 'circle', 'square' or 'crux'
+                                   shape='cross')  # 'circle', 'square' or 'crux'
 
 # Finally, axis can be personalized too
 graduation_style = plot_data.TextStyle(text_color=BLUE, font_size=10,

script/test_objects/graph_test.py

@@ -3,7 +3,7 @@
 
 import math
 import plot_data
-from plot_data.colors import BLACK, BLUE, RED
+from plot_data.colors import BLUE, RED
 
 k = 0
 
@@ -17,7 +17,7 @@
 
 # The previous line instantiates a dataset with limited arguments but
 # several customizations are available
-point_style = plot_data.PointStyle(color_fill=RED, color_stroke=BLACK, shape='crux')
+point_style = plot_data.PointStyle(color_fill=RED, color_stroke=RED, shape='crux')
 edge_style = plot_data.EdgeStyle(color_stroke=BLUE, dashline=[10, 5])
 
 custom_dataset = plot_data.Dataset(elements=elements1, name='I = f(t)',
@@ -33,4 +33,4 @@
     elements2.append({'time': T2[k], 'electric current': I2[k]})
 
 dataset2 = plot_data.Dataset(elements=elements2, name='I2 = f(t)')
-graph2d = plot_data.Graph2D(graphs=[dataset1, dataset2], x_variable='time', y_variable='electric current')
+graph2d = plot_data.Graph2D(graphs=[custom_dataset, dataset2], x_variable='time', y_variable='electric current')