QuasarCode 0.32.9__tar.gz → 0.32.11__tar.gz

{quasarcode-0.32.9 → quasarcode-0.32.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuasarCode
-Version: 0.32.9
+Version: 0.32.11
 Summary: A general purpose library for Python applications.
 Project-URL: Documentation, https://github.com/QuasarX1/QuasarCode/blob/master/README.md
 Project-URL: Issues, https://github.com/QuasarX1/QuasarCode/issues

{quasarcode-0.32.9 → quasarcode-0.32.11}/src/QuasarCode/Plotting/_CachedFigureGrid.py

@@ -92,11 +92,16 @@ class CachedFigureGrid(CacheableStruct):
             self.rows = len(self.mosaic)
             self.columns = max(len(row) for row in self.mosaic)
 
-        self.plots = {}
-        self.colourbars = {}
-        self.custom_legends = {}
-        self.default_font = CachedPlotFontInfo()
-        self.title_font = CachedPlotFontInfo()
+        if "plots" not in kwargs:
+            self.plots = {}
+        if "colourbars" not in kwargs:
+            self.colourbars = {}
+        if "custom_legends" not in kwargs:
+            self.custom_legends = {}
+        if "default_font" not in kwargs:
+            self.default_font = CachedPlotFontInfo()
+        if "title_font" not in kwargs:
+            self.title_font = CachedPlotFontInfo()
         
     def set_resolution_custom(self, width_pixels: int|None = None, height_pixels: int|None = None, file_only: bool = False) -> None:
         """

{quasarcode-0.32.9 → quasarcode-0.32.11}/src/QuasarCode/Plotting/_CachedPlot.py

@@ -82,19 +82,33 @@ class CachedPlot(CacheableStruct):
             ),
             **kwargs
         )
-        self.plot_elements = {}
-        self.colourbars = {}
-        self.custom_legends = {}
-        self.default_font = CachedPlotFontInfo()
-        self.title_font = CachedPlotFontInfo()
-        self.x_axis_label_font = CachedPlotFontInfo()
-        self.y_axis_label_font = CachedPlotFontInfo()
-        self.alt_x_axis_label_font = CachedPlotFontInfo()
-        self.alt_y_axis_label_font = CachedPlotFontInfo()
-        self.x_tick_label_font = CachedPlotFontInfo()
-        self.y_tick_label_font = CachedPlotFontInfo()
-        self.alt_x_tick_label_font = CachedPlotFontInfo()
-        self.alt_y_tick_label_font = CachedPlotFontInfo()
+        
+        if "plot_elements" not in kwargs:
+            self.plot_elements = {}
+        if "colourbars" not in kwargs:
+            self.colourbars = {}
+        if "custom_legends" not in kwargs:
+            self.custom_legends = {}
+        if "default_font" not in kwargs:
+            self.default_font = CachedPlotFontInfo()
+        if "title_font" not in kwargs:
+            self.title_font = CachedPlotFontInfo()
+        if "x_axis_label_font" not in kwargs:
+            self.x_axis_label_font = CachedPlotFontInfo()
+        if "y_axis_label_font" not in kwargs:
+            self.y_axis_label_font = CachedPlotFontInfo()
+        if "alt_x_axis_label_font" not in kwargs:
+            self.alt_x_axis_label_font = CachedPlotFontInfo()
+        if "alt_y_axis_label_font" not in kwargs:
+            self.alt_y_axis_label_font = CachedPlotFontInfo()
+        if "x_tick_label_font" not in kwargs:
+            self.x_tick_label_font = CachedPlotFontInfo()
+        if "y_tick_label_font" not in kwargs:
+            self.y_tick_label_font = CachedPlotFontInfo()
+        if "alt_x_tick_label_font" not in kwargs:
+            self.alt_x_tick_label_font = CachedPlotFontInfo()
+        if "alt_y_tick_label_font" not in kwargs:
+            self.alt_y_tick_label_font = CachedPlotFontInfo()
     
     def __check_element_name_is_new(self, name: str) -> bool:
         return name not in self.plot_elements
@@ -180,7 +194,7 @@ class CachedPlot(CacheableStruct):
                 functions = tuple(self.alt_x_axis_functions)
             )
             if self.alt_x_axis_label is not None:
-                self._alt_x_axis.set_xlabel(self.alt_x_axis_label, **self.alt_x_axis_label_font.with_default(self.default_font).with_default(figure_default_font).fontdict)
+                self._alt_x_axis.set_xlabel(self.alt_x_axis_label, **self.alt_x_axis_label_font.with_default(self.x_axis_label_font).with_default(self.default_font).with_default(figure_default_font).fontdict)
             alt_x_tick_label_font = self.alt_x_tick_label_font.with_default(self.x_tick_label_font).with_default(self.default_font).with_default(figure_default_font)
             alt_x_tick_label_font_kwargs = {}
             if alt_x_tick_label_font.size is not None:
@@ -203,7 +217,7 @@ class CachedPlot(CacheableStruct):
                 functions = tuple(self.alt_y_axis_functions)
             )
             if self.alt_y_axis_label is not None:
-                self._alt_y_axis.set_xlabel(self.alt_y_axis_label, **self.alt_y_axis_label_font.with_default(self.default_font).with_default(figure_default_font).fontdict)
+                self._alt_y_axis.set_xlabel(self.alt_y_axis_label, **self.alt_y_axis_label_font.with_default(self.y_axis_label_font).with_default(self.default_font).with_default(figure_default_font).fontdict)
             alt_y_tick_label_font = self.alt_y_tick_label_font.with_default(self.y_tick_label_font).with_default(self.default_font).with_default(figure_default_font)
             alt_y_tick_label_font_kwargs = {}
             if alt_y_tick_label_font.size is not None:

{quasarcode-0.32.9 → quasarcode-0.32.11}/src/QuasarCode/Plotting/_CachedPlotCustomLegend.py

@@ -27,33 +27,33 @@ class CachedPlotLegendBoxProperties(CacheableStruct):
         )
 
 class CachedPlotCustomLegend(CacheableStruct):
-    title                          = AutoProperty            [str                          ](allow_uninitialised = True)
-    element_targets                = AutoProperty_NonNullable[dict[str,str|tuple[str,str]] ]() # Label : target element | (target plot, target element)
-    reverse_order                  = AutoProperty_NonNullable[bool                         ](default_value = False)
-    columns                        = AutoProperty_NonNullable[int                          ](default_value = 1)
-    position                       = AutoProperty_NonNullable[Literal["best", "upper left", "upper center", "upper right", "center left", "center", "center right", "lower left", "lower center", "lower right"]|tuple[float, float]](default_value = "best")
-    anchor_region                  = AutoProperty            [Rect                         ](allow_uninitialised = True) # Max. one of these \/ can be set
-    anchor                         = AutoProperty            [tuple[int,int]               ](allow_uninitialised = True) # Max. one of these /\ can be set
-    anchor_space                   = AutoProperty            [Literal["figure-space", "axis-space", "axis-data-space"]](allow_uninitialised = True)
-    label_font                     = AutoProperty_NonNullable[CachedPlotFontInfo           ]()
-    label_colours                  = AutoProperty            [str|Literal["linecolor", "markerfacecolor", "markeredgecolor"]|list[str|Literal["linecolor", "markerfacecolor", "markeredgecolor"]]](allow_uninitialised = True)
-    title_font                     = AutoProperty_NonNullable[CachedPlotFontInfo           ]()
-    alignment                      = AutoProperty_NonNullable[Literal["left", "center", "right"]](default_value = "center")
+    title                           = AutoProperty            [str                          ](allow_uninitialised = True)
+    element_targets                 = AutoProperty_NonNullable[dict[str,str|tuple[str,str]] ]() # Label : target element | (target plot, target element)
+    reverse_order                   = AutoProperty_NonNullable[bool                         ](default_value = False)
+    columns                         = AutoProperty_NonNullable[int                          ](default_value = 1)
+    position                        = AutoProperty_NonNullable[Literal["best", "upper left", "upper center", "upper right", "center left", "center", "center right", "lower left", "lower center", "lower right"]|tuple[float, float]](default_value = "best")
+    anchor_region                   = AutoProperty            [Rect                         ](allow_uninitialised = True) # Max. one of these \/ can be set
+    anchor                          = AutoProperty            [tuple[int,int]               ](allow_uninitialised = True) # Max. one of these /\ can be set
+    anchor_space                    = AutoProperty            [Literal["figure-space", "axis-space", "axis-data-space"]](allow_uninitialised = True)
+    label_font                      = AutoProperty_NonNullable[CachedPlotFontInfo           ]()
+    label_colours                   = AutoProperty            [str|Literal["linecolor", "markerfacecolor", "markeredgecolor"]|list[str|Literal["linecolor", "markerfacecolor", "markeredgecolor"]]](allow_uninitialised = True)
+    title_font                      = AutoProperty_NonNullable[CachedPlotFontInfo           ]()
+    alignment                       = AutoProperty_NonNullable[Literal["left", "center", "right"]](default_value = "center")
 
-    line_render_points             = AutoProperty            [int                          ](allow_uninitialised = True)
-    scatter_render_points          = AutoProperty            [int                          ](allow_uninitialised = True)
+    line_render_points              = AutoProperty            [int                          ](allow_uninitialised = True)
+    scatter_render_points           = AutoProperty            [int                          ](allow_uninitialised = True)
     scatter_render_points_y_offsets = AutoProperty_NonNullable[list[float]                  ](default_value = [0.375, 0.5, 0.3125]) # Relative to the font height (0 -> 1)
-    marker_scale                   = AutoProperty            [float                        ](allow_uninitialised = True)
-    marker_location                = AutoProperty_NonNullable[Literal["left", "right"]     ](default_value = "left")
-    vertical_spacing               = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
-    horizontal_spacing             = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
-    handle_length                  = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
-    handle_height                  = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
-    handle_text_space              = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
+    marker_scale                    = AutoProperty            [float                        ](allow_uninitialised = True)
+    marker_location                 = AutoProperty_NonNullable[Literal["left", "right"]     ](default_value = "left")
+    vertical_spacing                = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
+    horizontal_spacing              = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
+    handle_length                   = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
+    handle_height                   = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
+    handle_text_space               = AutoProperty            [float                        ](allow_uninitialised = True) # in units of font-size
 
-    box                            = AutoProperty_NonNullable[CachedPlotLegendBoxProperties]()
-    expand_into_horizontal_space   = AutoProperty_NonNullable[bool                         ](default_value = False)
-    mouse_draggable                = AutoProperty_NonNullable[bool                         ](default_value = False)
+    box                             = AutoProperty_NonNullable[CachedPlotLegendBoxProperties]()
+    expand_into_horizontal_space    = AutoProperty_NonNullable[bool                         ](default_value = False)
+    mouse_draggable                 = AutoProperty_NonNullable[bool                         ](default_value = False)
 
     def __init__(self, **kwargs):
         super().__init__(
@@ -67,10 +67,14 @@ class CachedPlotCustomLegend(CacheableStruct):
             ],
             **kwargs
         )
-        self.element_targets = {}
-        self.label_font = CachedPlotFontInfo()
-        self.title_font = CachedPlotFontInfo()
-        self.box = CachedPlotLegendBoxProperties()
+        if "element_targets" not in kwargs:
+            self.element_targets = {}
+        if "label_font" not in kwargs:
+            self.label_font = CachedPlotFontInfo()
+        if "title_font" not in kwargs:
+            self.title_font = CachedPlotFontInfo()
+        if "box" not in kwargs:
+            self.box = CachedPlotLegendBoxProperties()
 
     def render(self, figure: Figure, axis: Axes|None, default_font: CachedPlotFontInfo, plot_elements: Optional[dict[str, CachedPlotElement]] = None, elements_by_figure_plot: Optional[dict[str, dict[str, CachedPlotElement]]] = None, *args: Any, **kwargs: Any) -> None:
 

{quasarcode-0.32.9 → quasarcode-0.32.11}/src/QuasarCode/Plotting/_CachedPlotElements.py

@@ -220,9 +220,12 @@ class CachedPlotColourbar(CachedPlotElement[Colorbar]):
     tick_label_font = AutoProperty_NonNullable[CachedPlotFontInfo]()
     def __init__(self, **kwargs):
         super().__init__("target_element", "target_plot", "label", "add_to_axis", "location", "orientation", "extend", "default_font", "label_font", "tick_label_font", **kwargs)
-        self.default_font    = CachedPlotFontInfo()
-        self.label_font      = CachedPlotFontInfo()
-        self.tick_label_font = CachedPlotFontInfo()
+        if "default_font" not in kwargs:
+            self.default_font = CachedPlotFontInfo()
+        if "label_font" not in kwargs:
+            self.label_font = CachedPlotFontInfo()
+        if "tick_label_font" not in kwargs:
+            self.tick_label_font = CachedPlotFontInfo()
     def render(self, figure: Figure, axis: Axes, target: ScalarMappable|ColorizingArtist, default_font: CachedPlotFontInfo, *args: Any, **kwargs: Any) -> None:
         """
         Render the element on the given figure and axis, using the target element.
@@ -273,10 +276,9 @@ class CachedPlotContour(CachedPlotElement[QuadContourSet]):
     labeled_level_indexes = AutoProperty            [Sequence[int]                ](allow_uninitialised = True)
     label_positions       = AutoProperty            [Sequence[tuple[float, float]]](allow_uninitialised = True)
     label_format          = AutoProperty            [CacheableFunction            ](allow_uninitialised = True)
-    font                  = AutoProperty_NonNullable[CachedPlotFontInfo]()
+    fontsize              = AutoProperty[float|Literal["xx-small","x-small","small","medium","large","x-large","xx-large"]](allow_uninitialised = True) # Matplotlib default is 10.0
     def __init__(self, **kwargs):
-        self.font = CachedPlotFontInfo()
-        super().__init__("x", "y", "extent", "z", "levels", "linewidths", "linestyles", "alpha_values", "colours", "labeled_level_indexes", "label_positions", "label_format", "font", **kwargs)
+        super().__init__("x", "y", "extent", "z", "levels", "linewidths", "linestyles", "alpha_values", "colours", "labeled_level_indexes", "label_positions", "label_format", "fontsize", **kwargs)
     def render(self, figure: Figure, axis: Axes, default_font: CachedPlotFontInfo, *args: Any, **kwargs: Any) -> None:
         if sum([self.x is not None, self.y is not None]) == 1:
             raise ValueError("Both x and y must be provided together or not at all.")
@@ -296,13 +298,16 @@ class CachedPlotContour(CachedPlotElement[QuadContourSet]):
         )
         if self.labeled_level_indexes is not None:
             labelled_levels = [self._result.levels[i] for i in self.labeled_level_indexes]
+            font_kwargs = {}
+            if self.fontsize is not None:
+                font_kwargs["fontsize"] = self.fontsize
             axis.clabel(
-                CS     = self._result,
-                levels = labelled_levels,
-                fmt    = [self.label_format(level) for level in labelled_levels] if self.label_format is not None else None,
-                inline = 1,
-                manual = self.label_positions,
-                **self.font.with_default(default_font).fontdict,
+                CS       = self._result,
+                levels   = labelled_levels,
+                fmt      = [self.label_format(level) for level in labelled_levels] if self.label_format is not None else None,
+                inline   = 1,
+                manual   = self.label_positions,
+                **font_kwargs,
             )
     @staticmethod
     def from_contours(contours: QuadContourSet, x: np.ndarray[tuple[int], np.dtype[np.floating]], y: np.ndarray[tuple[int], np.dtype[np.floating]], z: np.ndarray[tuple[int], np.dtype[np.floating]], uses_single_colour_value: bool = False) -> "CachedPlotContour":
@@ -356,19 +361,21 @@ class CachedPlotText(CachedPlotElement[Text]):
     x             = AutoProperty_NonNullable[np.ndarray[tuple[int], np.dtype[np.floating]]]()
     y             = AutoProperty_NonNullable[np.ndarray[tuple[int], np.dtype[np.floating]]]()
     font          = AutoProperty_NonNullable[CachedPlotFontInfo                           ]()
-    colour        = AutoProperty            [ColorType                                    ]()
+#    colour        = AutoProperty            [ColorType                                    ]()
     alpha         = AutoProperty_NonNullable[float                                        ](default_value = 1.0)
     box_colour    = AutoProperty            [ColorType                                    ](allow_uninitialised = True)
     border_colour = AutoProperty            [ColorType                                    ](allow_uninitialised = True)
     def __init__(self, **kwargs):
         super().__init__("text", "x", "y", "font", "alpha", "box_colour", "border_colour", **kwargs)
-        self.font = CachedPlotFontInfo()
+        if "font" not in kwargs:
+            self.font = CachedPlotFontInfo()
     def render(self, figure: Figure, axis: Axes, default_font: CachedPlotFontInfo, *args: Any, **kwargs: Any) -> None:
         self._result = axis.text(
             x           = self.x,
             y           = self.y,
             s           = self.text,
             **self.font.with_default(default_font).fontdict,
+            color = self.font.colour,
             alpha       = self.alpha,
             bbox        = dict(facecolor = self.box_colour, edgecolor = self.border_colour) if (self.box_colour is not None or self.border_colour is not None) else None,
             **kwargs,
@@ -387,28 +394,29 @@ class CachedPlotText(CachedPlotElement[Text]):
         )
 
 class CachedPlotPie(CachedPlotElement[tuple[list[Wedge], list[Text]] | tuple[list[Wedge], list[Text], list[Text]]]):
-    values              = AutoProperty_NonNullable[Sequence[float]|Sequence[str]]()
-    colours             = AutoProperty_NonNullable[Sequence[ColorType]|Sequence[str]]()
-    texture             = AutoProperty_NonNullable[Sequence[Literal["/","\\","|","-","+", "x", "o", "O", ".", "*"]]]()
-    shadow              = AutoProperty_NonNullable[bool](default_value = False)
-    labels              = AutoProperty_NonNullable[Sequence[str]]()
-    label_distance      = AutoProperty[float](default_value = 1.1, allow_uninitialised = True)
-    rotate_labels       = AutoProperty_NonNullable[bool](default_value = False)
-    percentage_format   = AutoProperty[str|CacheableFunction](allow_uninitialised = True)
-    percentage_distance = AutoProperty_NonNullable[float](default_value = 0.6)
-    centre              = AutoProperty_NonNullable[tuple[float,float]](default_value = (0, 0))
-    radius              = AutoProperty_NonNullable[float](default_value = 1.0)
-    start_angle         = AutoProperty_NonNullable[float](default_value = 0.0)
+    values              = AutoProperty_NonNullable[Sequence[float]|Sequence[str]        ]()
+    colours             = AutoProperty            [Sequence[ColorType]|Sequence[str]    ](allow_uninitialised = True)
+    texture             = AutoProperty            [Sequence[Literal["", "/","\\","|","-","+", "x", "o", "O", ".", "*"]|str]|str](allow_uninitialised = True)
+    shadow              = AutoProperty_NonNullable[bool                                 ](default_value = False)
+    labels              = AutoProperty            [Sequence[str]                        ](allow_uninitialised = True)
+    label_distance      = AutoProperty            [float                                ](default_value = 1.1, allow_uninitialised = True)
+    rotate_labels       = AutoProperty_NonNullable[bool                                 ](default_value = False)
+    percentage_format   = AutoProperty            [str|CacheableFunction                ](allow_uninitialised = True)
+    percentage_distance = AutoProperty_NonNullable[float                                ](default_value = 0.6)
+    centre              = AutoProperty_NonNullable[tuple[float,float]                   ](default_value = (0, 0))
+    radius              = AutoProperty_NonNullable[float                                ](default_value = 1.0)
+    start_angle         = AutoProperty_NonNullable[float                                ](default_value = 0.0)
     segment_rotation    = AutoProperty_NonNullable[Literal["clockwise", "anticlockwise"]](default_value = "anticlockwise")
-    wedge_properties    = AutoProperty[dict](allow_uninitialised = True)
-    explode_distance    = AutoProperty[Sequence[float]|Sequence[str]](allow_uninitialised = True)
-    font                = AutoProperty_NonNullable[CachedPlotFontInfo]()
-    hide_axes           = AutoProperty_NonNullable[bool](default_value = True)
-    ensure_complete_pie = AutoProperty_NonNullable[bool](default_value = True)
-    labled_data         = AutoProperty[dict](allow_uninitialised = True)
+    wedge_properties    = AutoProperty            [dict                                 ](allow_uninitialised = True)
+    explode_distance    = AutoProperty            [Sequence[float]|Sequence[str]        ](allow_uninitialised = True)
+    font                = AutoProperty_NonNullable[CachedPlotFontInfo                   ]()
+    hide_axes           = AutoProperty_NonNullable[bool                                 ](default_value = True)
+    ensure_complete_pie = AutoProperty_NonNullable[bool                                 ](default_value = True)
+    labled_data         = AutoProperty            [dict                                 ](allow_uninitialised = True)
     def __init__(self, **kwargs):
         super().__init__("values", "colours", "texture", "shadow", "labels", "label_distance", "rotate_labels", "percentage_format", "percentage_distance", "centre", "radius", "start_angle", "segment_rotation", "wedge_properties", "explode_distance", "font", "hide_axes", "ensure_complete_pie", "labled_data", **kwargs)
-        self.font = CachedPlotFontInfo()
+        if "font" not in kwargs:
+            self.font = CachedPlotFontInfo()
     def render(self, figure: Figure, axis: Axes, default_font: CachedPlotFontInfo, *args: Any, **kwargs: Any):
         if not self.ensure_complete_pie and sum(self.values) > 1:
             raise ValueError("The sum of the values must not exceed 1 when ensure_complete_pie is False.")

quasarcode-0.32.11/src/QuasarCode/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.32.11"

quasarcode-0.32.9/src/QuasarCode/__about__.py

@@ -1 +0,0 @@
-__version__ = "0.32.9"