wolfhece 2.1.119__py3-none-any.whl → 2.1.120__py3-none-any.whl

wolfhece/matplotlib_fig.py

@@ -1242,7 +1242,18 @@ class Matplotlib_Figure(wx.Frame):
         size_x, size_y = self.fig.get_size_inches()
 
         if self.wx_exists:
-            wx.Frame.__init__(self, None, -1, 'Matplotlib Figure', size=(size_x*dpi+16, size_y*dpi+240), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER)
+            size_x = size_x*dpi+16
+            size_y = size_y*dpi+240
+
+            #compare to screen size
+            screen = wx.Display(0)
+            screen_size = screen.GetGeometry().GetSize()
+            if size_x > screen_size[0]:
+                size_x = screen_size[0]
+            if size_y > screen_size[1]:
+                size_y = screen_size[1]
+
+            wx.Frame.__init__(self, None, -1, 'Matplotlib Figure', size=(size_x, size_y), style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER)
 
         self.ax_dict:dict[str,Axes] = {}    # dict of axes
         self.ax:list[Axes] = []             # list of axes -- always flatten
@@ -2048,6 +2059,13 @@ class Matplotlib_Figure(wx.Frame):
             return key, list(self.ax_dict.values()).index(key)
 
     def plot(self, x:np.ndarray, y:np.ndarray, ax:Axes | int | str= None, **kwargs):
+        """ Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
 
         ax, idx_ax = self.get_ax_idx(ax)
 
@@ -2068,8 +2086,72 @@ class Matplotlib_Figure(wx.Frame):
                 self._line_current.SetSelection(len(ax.get_lines())-1)
 
         self.fig.tight_layout()
+        self.fig.canvas.draw()
         self.update_layout()
 
+    def scatter(self, x:np.ndarray, y:np.ndarray, ax:Axes | int | str= None, **kwargs):
+        """ Scatter Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
+
+        ax, idx_ax = self.get_ax_idx(ax)
+
+        ax.scatter(x, y, **kwargs)
+
+        new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
+
+        if self.wx_exists:
+            new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+
+        ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
+        ax_prop._lines.append(new_props)
+        ax_prop.get_properties()
+
+        if self.wx_exists:
+            if ax == self.cur_ax:
+                self._line_current.SetItems([line.get_label() for line in ax.get_lines()])
+                self._line_current.SetSelection(len(ax.get_lines())-1)
+
+        self.fig.tight_layout()
+        self.fig.canvas.draw()
+        self.update_layout()
+
+    def violinplot(self, dataset:np.ndarray, position:np.ndarray=None, ax:Axes | int | str= None, **kwargs):
+        """ Plot x, y on the current ax or on the ax specified
+
+        :param x: x values
+        :param y: y values
+        :param ax: ax to plot on
+        :param kwargs: kwargs for the plot (same as matplotlib.pyplot.plot)
+        """
+
+        ax, idx_ax = self.get_ax_idx(ax)
+
+        ax.violinplot(dataset, position, **kwargs)
+
+        # new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
+
+        # if self.wx_exists:
+        #     new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+
+        # ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
+        # ax_prop._lines.append(new_props)
+        # ax_prop.get_properties()
+
+        # if self.wx_exists:
+        #     if ax == self.cur_ax:
+        #         self._line_current.SetItems([line.get_label() for line in ax.get_lines()])
+        #         self._line_current.SetSelection(len(ax.get_lines())-1)
+
+        self.fig.tight_layout()
+        self.fig.canvas.draw()
+        self.update_layout()
+
+
     def to_dict(self) -> dict:
         """ properties to dict """