starplot 0.13.0__py2.py3-none-any.whl → 0.15.0__py2.py3-none-any.whl

starplot/styles/base.py

@@ -12,7 +12,7 @@ from pydantic.functional_serializers import PlainSerializer
 from matplotlib import patheffects
 from typing_extensions import Annotated
 
-from starplot.data.dsos import DsoType
+from starplot.models.dso import DsoType
 from starplot.styles.helpers import merge_dict
 from starplot.styles.markers import (
     ellipse,
@@ -135,7 +135,7 @@ class MarkerSymbolEnum(str, Enum):
     CIRCLE_DOTTED_RINGS = "circle_dotted_rings"
 
     CIRCLE_LINE = "circle_line"
-    """\u29B5"""
+    """\u29B5  the standard symbol for double stars"""
 
     COMET = "comet"
     """\u2604"""
@@ -204,6 +204,8 @@ class AnchorPointEnum(str, Enum):
     """Options for the anchor point of labels"""
 
     CENTER = "center"
+    LEFT_CENTER = "left center"
+    RIGHT_CENTER = "right center"
     TOP_LEFT = "top left"
     TOP_RIGHT = "top right"
     TOP_CENTER = "top center"
@@ -235,6 +237,12 @@ class AnchorPointEnum(str, Enum):
         elif self.value == AnchorPointEnum.CENTER:
             style["va"] = "center"
             style["ha"] = "center"
+        elif self.value == AnchorPointEnum.LEFT_CENTER:
+            style["va"] = "center"
+            style["ha"] = "right"
+        elif self.value == AnchorPointEnum.RIGHT_CENTER:
+            style["va"] = "center"
+            style["ha"] = "left"
 
         return style
 
@@ -392,6 +400,12 @@ class LineStyle(BaseStyle):
 
         return result
 
+    def matplot_line_collection_kwargs(self, scale: float = 1.0) -> dict:
+        plot_kwargs = self.matplot_kwargs(scale)
+        plot_kwargs["linewidths"] = plot_kwargs.pop("linewidth")
+        plot_kwargs["colors"] = plot_kwargs.pop("color")
+        return plot_kwargs
+
 
 class PolygonStyle(BaseStyle):
     """
@@ -423,7 +437,7 @@ class PolygonStyle(BaseStyle):
         styles = dict(
             edgecolor=self.edge_color.as_hex() if self.edge_color else "none",
             facecolor=self.fill_color.as_hex() if self.fill_color else "none",
-            fill=True if self.fill_color else False,
+            fill=True if self.fill_color or self.color else False,
             linewidth=self.edge_width * scale,
             linestyle=self.line_style,
             alpha=self.alpha,
@@ -435,6 +449,21 @@ class PolygonStyle(BaseStyle):
 
         return styles
 
+    def to_marker_style(self, symbol: MarkerSymbolEnum):
+        color = self.color.as_hex() if self.color else None
+        fill_color = self.fill_color.as_hex() if self.fill_color else None
+        fill_style = FillStyleEnum.FULL if color or fill_color else FillStyleEnum.NONE
+        return MarkerStyle(
+            symbol=symbol,
+            color=color or fill_color,
+            fill=fill_style,
+            edge_color=self.edge_color.as_hex() if self.edge_color else None,
+            edge_width=self.edge_width,
+            alpha=self.alpha,
+            zorder=self.zorder,
+            line_style=self.line_style,
+        )
+
 
 class LabelStyle(BaseStyle):
     """
@@ -648,6 +677,8 @@ class PlotStyle(BaseStyle):
         AnchorPointEnum.BOTTOM_LEFT,
         AnchorPointEnum.BOTTOM_CENTER,
         AnchorPointEnum.TOP_CENTER,
+        AnchorPointEnum.RIGHT_CENTER,
+        AnchorPointEnum.LEFT_CENTER,
     ]
     """If a label's preferred anchor point results in a collision, then these fallbacks will be tried in sequence until a collision-free position is found."""
 
@@ -720,8 +751,10 @@ class PlotStyle(BaseStyle):
     planets: ObjectStyle = ObjectStyle(
         marker=MarkerStyle(
             symbol=MarkerSymbolEnum.CIRCLE,
-            size=50,
+            size=28,
             fill=FillStyleEnum.LEFT,
+            zorder=ZOrderEnum.LAYER_3,
+            alpha=1,
         ),
         label=LabelStyle(
             font_size=28,
@@ -774,13 +807,7 @@ class PlotStyle(BaseStyle):
             edge_width=1.3,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(
-            # font_weight=FontWeightEnum.LIGHT,
-            # offset_x=7,
-            # offset_y=-6,
-            offset_x="auto",
-            offset_y="auto",
-        ),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for open star clusters"""
 
@@ -792,11 +819,7 @@ class PlotStyle(BaseStyle):
             edge_width=1.3,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(
-            font_weight=FontWeightEnum.LIGHT,
-            offset_x=7,
-            offset_y=-6,
-        ),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for associations of stars"""
 
@@ -809,7 +832,7 @@ class PlotStyle(BaseStyle):
             edge_width=1.2,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(offset_x=7, offset_y=-6),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for globular star clusters"""
 
@@ -819,7 +842,7 @@ class PlotStyle(BaseStyle):
             fill=FillStyleEnum.FULL,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(offset_x=1, offset_y=-1),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for galaxies"""
 
@@ -829,7 +852,7 @@ class PlotStyle(BaseStyle):
             fill=FillStyleEnum.FULL,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(offset_x=1, offset_y=-1),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for nebulas"""
 
@@ -841,7 +864,7 @@ class PlotStyle(BaseStyle):
             size=26,
             zorder=ZOrderEnum.LAYER_3 - 1,
         ),
-        label=LabelStyle(offset_x=1, offset_y=-1),
+        label=LabelStyle(offset_x="auto", offset_y="auto"),
     )
     """Styling for planetary nebulas"""
 
@@ -932,17 +955,8 @@ class PlotStyle(BaseStyle):
     )
     """Styling for 'duplicate record' (as designated by OpenNGC) types of deep sky objects"""
 
-    # Constellations
-    constellation: PathStyle = PathStyle(
-        line=LineStyle(color="#c8c8c8"),
-        label=LabelStyle(
-            font_size=21,
-            font_weight=FontWeightEnum.NORMAL,
-            zorder=ZOrderEnum.LAYER_3,
-            anchor_point=AnchorPointEnum.TOP_RIGHT,
-        ),
-    )
-    """Styling for constellation lines and labels (only applies to map plots)"""
+    constellation_lines: LineStyle = LineStyle(color="#c8c8c8")
+    """Styling for constellation lines"""
 
     constellation_borders: LineStyle = LineStyle(
         color="#000",
@@ -951,7 +965,15 @@ class PlotStyle(BaseStyle):
         alpha=0.4,
         zorder=ZOrderEnum.LAYER_3,
     )
-    """Styling for constellation borders (only applies to map plots)"""
+    """Styling for constellation borders"""
+
+    constellation_labels: LabelStyle = LabelStyle(
+        font_size=21,
+        font_weight=FontWeightEnum.NORMAL,
+        zorder=ZOrderEnum.LAYER_3,
+        anchor_point=AnchorPointEnum.CENTER,
+    )
+    """Styling for constellation labels"""
 
     # Milky Way
     milky_way: PolygonStyle = PolygonStyle(
@@ -976,7 +998,7 @@ class PlotStyle(BaseStyle):
             zorder=ZOrderEnum.LAYER_2,
         ),
         label=LabelStyle(
-            font_size=18,
+            font_size=20,
             font_color="#000",
             font_alpha=1,
             anchor_point=AnchorPointEnum.BOTTOM_CENTER,
@@ -992,7 +1014,7 @@ class PlotStyle(BaseStyle):
             style=LineStyleEnum.DOTTED,
             dash_capstyle=DashCapStyleEnum.ROUND,
             alpha=1,
-            zorder=ZOrderEnum.LAYER_3,
+            zorder=ZOrderEnum.LAYER_3 - 1,
         ),
         label=LabelStyle(
             font_size=22,

starplot/styles/ext/antique.yml

@@ -46,19 +46,21 @@ celestial_equator:
   line:
     color: hsl(188, 35%, 76%)
     alpha: 0.62
-constellation:
-  label:
-    font_weight: light
-    font_color: hsl(60, 3%, 52%)
-    font_alpha: 0.46
-    font_name: "serif"
-  line:
-    alpha: 0.3
-    color: hsl(48, 80%, 14%)
+
+# Constellations
+constellation_lines:
+  alpha: 0.3
+  color: hsl(48, 80%, 14%)
+constellation_labels:
+  font_weight: light
+  font_color: hsl(60, 3%, 52%)
+  font_alpha: 0.46
+  font_name: "serif"
 constellation_borders:
   color: hsl(37, 33%, 40%)
   alpha: 0.8
   zorder: -500
+
 ecliptic:
   label:
     font_color: hsl(26, 63%, 50%)

starplot/styles/ext/blue_dark.yml

@@ -38,15 +38,14 @@ ecliptic:
     color: '#e33b3b'
     alpha: 1
 
-constellation:
-  label:
-    font_alpha: 0.37
-    font_color: hsl(209, 23%, 80%)
-    font_weight: light
-  line:
-    alpha: 0.36
-    color: hsl(209, 23%, 76%)
-
+# Constellations
+constellation_lines:
+  alpha: 0.36
+  color: hsl(209, 23%, 76%)
+constellation_labels:
+  font_alpha: 0.37
+  font_color: hsl(209, 23%, 80%)
+  font_weight: light
 constellation_borders:
   width: 2
   color: hsl(209, 50%, 74%)
@@ -120,7 +119,6 @@ gridlines:
   label:
     font_alpha: 1
     font_color: hsl(209, 53%, 94%)
-    font_weight: light
   line:
     alpha: 0.7
     color: hsl(209, 53%, 37%)

starplot/styles/ext/blue_gold.yml

@@ -0,0 +1,135 @@
+# blue_gold
+
+background_color: rgb(46, 61, 74)
+figure_background_color: '#fff'
+
+text_border_color: rgb(46, 61, 74)
+
+border_bg_color: hsl(212, 27%, 56%)
+border_font_color: '#f1f6ff'
+border_line_color: '#2f4358'
+
+title:
+  font_color: '#f1f6ff'
+star:
+  marker:
+    color: rgb(244, 233, 203)
+    edge_color: rgb(46, 61, 74)
+  label:
+    font_color: rgb(244, 233, 203)
+bayer_labels:
+  font_alpha: 1
+  font_color: rgb(244, 233, 203)
+flamsteed_labels:
+  font_color: rgb(244, 233, 203)
+
+# Constellations
+constellation_labels:
+  font_alpha: 0.75
+  font_color: rgb(244, 233, 203)
+constellation_lines:
+  alpha: 0.8
+  color: rgb(34, 124, 130)
+constellation_borders:
+  color: hsl(208, 23%, 2%)
+
+
+celestial_equator:
+  label:
+    font_color: '#2d5ec2'
+  line:
+    color: hsl(220, 62%, 47%)
+    alpha: 0.8
+ecliptic:
+  label:
+    font_color: hsl(4, 60%, 54%)
+  line:
+    color: hsl(4, 60%, 54%)
+    alpha: 0.9
+
+planets:
+  marker:
+    alpha: 1
+    color: hsl(37, 78%, 80%)
+    fill: full
+milky_way:
+  alpha: 0.14
+  fill_color: '#94c5e3'
+  edge_width: 0
+gridlines:
+  label:
+    font_alpha: 1
+    font_color: '#f1f6ff'
+  line:
+    alpha: 0.6
+    color: '#888'
+    style: solid
+sun:
+  marker:
+    color: '#ffd22e'
+    edge_color: 'hsl(47, 100%, 29%)'
+
+horizon:
+  line:
+    color: hsl(208, 23%, 14%)
+    edge_color: hsl(208, 23%, 14%)
+  label:
+    font_color: hsl(208, 23%, 84%)
+
+
+# DSOs
+
+dso_galaxy:
+  marker:
+    alpha: 1
+    color: hsl(328, 23%, 54%)
+    edge_color: hsl(328, 23%, 24%)
+  label:
+    font_color: hsl(328, 23%, 54%)
+
+dso_nebula: &DSO-NEB
+  marker:
+    alpha: 1
+    color: hsl(118, 23%, 54%)
+    edge_color: hsl(118, 23%, 24%)
+  label:
+    font_color: hsl(118, 23%, 54%)
+dso_planetary_nebula: *DSO-NEB
+
+
+dso_open_cluster: &DSO-OC
+  marker:
+    alpha: 1
+    color: hsl(44deg 70% 64%)
+    edge_color: rgb(46, 61, 74)
+  label:
+    font_color: hsl(44deg 70% 64%)
+dso_association_stars: *DSO-OC
+
+dso_globular_cluster:
+  marker:
+    alpha: 1
+    color: hsl(44deg 70% 64%)
+    edge_color: rgb(46, 61, 74)
+  label:
+    font_color: '#989400'
+
+
+# other DSOs
+dso_unknown: &DSO
+  marker:
+    alpha: 1
+    color: hsl(91, 62%, 82%)
+    edge_color: hsl(91, 53%, 40%)
+  label:
+    font_color: hsl(91, 53%, 40%)
+dso_dark_nebula: *DSO
+dso_hii_ionized_region: *DSO
+dso_supernova_remnant: *DSO
+dso_nova_star: *DSO
+dso_nonexistant: *DSO
+dso_unknown: *DSO
+dso_duplicate: *DSO
+
+legend:
+  background_color: '#f1f6ff'

starplot/styles/ext/blue_light.yml

@@ -1,6 +1,7 @@
-background_color: '#fff'
+# background_color: '#fff'
+background_color: hsl(218, 88%, 99%)
 
-text_border_color: '#fff'
+text_border_color: hsl(218, 88%, 99%) #'#fff'
 
 border_bg_color: '#b5cbe3'
 border_font_color: '#2f4358'
@@ -29,14 +30,15 @@ celestial_equator:
     font_color: '#2d5ec2'
   line:
     color: '#2d5ec2'
-constellation:
-  label:
-    font_alpha: 0.27
-    font_color: '#000'
-  line:
-    alpha: 0.52
-    color: '#6ba832'
-    width: 3
+
+# Constellations
+constellation_labels:
+  font_alpha: 0.27
+  font_color: '#000'
+constellation_lines:
+  alpha: 0.52
+  color: '#6ba832'
+  width: 3
 
 dso_double_star:
   marker:
@@ -109,8 +111,8 @@ ecliptic:
     alpha: 1
     style: [0, [0.14, 2]]
 milky_way:
-  alpha: 0.2
-  fill_color: hsl(203, 70%, 83%)
+  alpha: 0.25
+  fill_color: hsl(203, 70%, 81%)
   edge_width: 0
 planets:
   marker:

starplot/styles/ext/blue_medium.yml

@@ -1,11 +1,11 @@
 # blue_medium
 
-background_color: hsl(218, 85%, 97%)
+background_color: hsl(218, 88%, 97%)
 figure_background_color: '#fff'
 
 text_border_color: '#f1f6ff'
 
-border_bg_color: '#7997b9'
+border_bg_color: hsl(212, 27%, 56%)
 border_font_color: '#f1f6ff'
 border_line_color: '#2f4358'
 
@@ -18,31 +18,33 @@ bayer_labels:
   font_alpha: 1
   font_color: '#000'
 
-constellation:
-  label:
-    font_alpha: 0.8
-    font_color: hsl(212, 20%, 10%)
-  line:
-    alpha: 0.48
-    color: '#6ba832'
+# Constellations
+constellation_labels:
+  font_alpha: 0.75
+  font_color: hsl(212, 20%, 34%)
+constellation_lines:
+  alpha: 0.5
+  color: '#6ba832'
 
 celestial_equator:
   label:
     font_color: '#2d5ec2'
   line:
-    color: hsl(220, 62%, 47%)
+    color: hsl(220, 52%, 56%)
     alpha: 0.8
 ecliptic:
   label:
-    font_color: '#e33b3b'
+    font_color: hsl(207, 75%, 53%)
   line:
-    color: hsl(360, 85%, 56%)
-    alpha: 0.9
+    color: hsl(207, 75%, 48%)
+    alpha: 1
+    style: [2, [2, 2]]
+    dash_capstyle: butt
 
 planets:
   marker:
-    alpha: 0.4
-    color: '#f89d00'
+    alpha: 1
+    color: hsl(37, 78%, 80%)
     fill: full
 milky_way:
   alpha: 0.14
@@ -51,8 +53,7 @@ milky_way:
 gridlines:
   label:
     font_alpha: 1
-    font_color: '#2f4358'
-    font_weight: light
+    font_color: '#f1f6ff'
   line:
     alpha: 0.6
     color: '#888'
@@ -64,7 +65,7 @@ sun:
 
 horizon:
   line:
-    color: '#7997b9'
+    color: hsl(212, 27%, 56%)
     edge_color: '#2f4358'
   label:
     font_color: '#f1f6ff'
@@ -80,8 +81,10 @@ zenith:
 dso_galaxy:
   marker:
     alpha: 1
-    color: hsl(330, 80%, 85%)
-    edge_color: hsl(330, 34%, 33%)
+    # color: hsl(330, 80%, 85%)
+    # edge_color: hsl(330, 34%, 33%)
+    color: hsl(330, 90%, 82%)
+    edge_color: hsl(330, 84%, 23%)
   label:
     font_color: hsl(330, 34%, 33%)
 

starplot/styles/ext/cb_wong.yml

@@ -34,13 +34,15 @@ celestial_equator:
     font_color: hsl(202, 100%, 35%)
   line:
     color: hsl(202, 100%, 35%)
-constellation:
-  label:
-    font_color: '#c5c5c5'
-  line:
-    alpha: 0.346
-    color: hsl(202, 100%, 35%)
-    width: 2
+
+# Constellations
+constellation_labels:
+  font_color: '#c5c5c5'
+constellation_lines:
+  alpha: 0.346
+  color: hsl(202, 100%, 35%)
+  width: 2
+
 dso_double_star:
   marker:
     alpha: 0.6

starplot/styles/ext/grayscale.yml

@@ -8,17 +8,18 @@ border_line_color: '#000'
 
 title:
   font_color: '#000'
+
 celestial_equator:
   label:
     font_color: '#999'
   line:
     color: '#999'
-constellation:
-  line:
-    color: '#c8c8c8'
+
 star:
   marker:
     edge_color: '#fff'
+
+# DSOs
 dso_double_star:
   marker:
     color: '#000'

starplot/styles/ext/grayscale_dark.yml

@@ -45,14 +45,16 @@ celestial_equator:
     font_color: '#999'
   line:
     color: '#999'
-constellation:
-  label:
-    font_color: hsl(136, 0%, 77%)
-  line:
-    color: hsl(136, 0%, 30%)
+
+# Constellations
+constellation_labels:
+  font_color: hsl(136, 0%, 77%)
+constellation_lines:
+  color: hsl(136, 0%, 30%)
 constellation_borders:
   color: hsl(136, 0%, 42%)
   alpha: 0.5
+
 dso_double_star:
   label:
     font_color: hsl(136, 0%, 97%)

starplot/styles/ext/map.yml

@@ -1,9 +1,12 @@
-constellation:
-  label:
-    font_size: 38
-    font_weight: heavy
-  line:
-    width: 3.4
+# Map Styles
+
+constellation_lines:
+  width: 3.4
+
+constellation_labels:
+  font_size: 34
+  font_weight: heavy
+
 star:
   label:
     font_size: 22

starplot/styles/ext/nord.yml

@@ -27,13 +27,13 @@ celestial_equator:
   line:
     color: '#77A67F'
 
-constellation:
-  label:
-    font_alpha: 0.7
-    font_color: rgb(230, 204, 147)
-  line:
-    alpha: 0.36
-    color: rgb(230, 204, 147)
+# Constellations
+constellation_labels:
+  font_alpha: 0.7
+  font_color: rgb(230, 204, 147)
+constellation_lines:
+  alpha: 0.36
+  color: rgb(230, 204, 147)
 constellation_borders:
   color: hsl(220, 16%, 12%)
   alpha: 0.8

starplot/styles/ext/optic.yml

@@ -1,6 +1,6 @@
 star:
   label:
-    font_size: 40
+    font_size: 36
   marker:
     size: 30
 bayer_labels:

starplot/styles/extensions.py

@@ -22,6 +22,7 @@ GRAYSCALE_DARK = load("grayscale_dark.yml")
 BLUE_LIGHT = load("blue_light.yml")
 BLUE_MEDIUM = load("blue_medium.yml")
 BLUE_DARK = load("blue_dark.yml")
+BLUE_GOLD = load("blue_gold.yml")
 ANTIQUE = load("antique.yml")
 NORD = load("nord.yml")
 CB_WONG = load("cb_wong.yml")