Consistent naming and fix plot scripts

Author: facelessuser

coloraide/channels.py

@@ -33,7 +33,7 @@ class Channel(str):
     flags: int
     limit: Callable[[float], float | int]
     nans: float
-    hue: int
+    angle: int
 
     def __new__(
         cls,
@@ -51,10 +51,10 @@ def __new__(
         obj = super().__new__(cls, name)
         obj.bound = bound
         obj.flags = flags
-        obj.hue = (ANGLE_DEG if angle == ANGLE_NULL else angle) if flags & FLG_ANGLE else ANGLE_NULL
-        if obj.hue:
-            obj.low = ANGLE_RANGE[obj.hue][0]
-            obj.high = ANGLE_RANGE[obj.hue][1]
+        obj.angle = (ANGLE_DEG if angle == ANGLE_NULL else angle) if flags & FLG_ANGLE else ANGLE_NULL
+        if obj.angle:
+            obj.low = ANGLE_RANGE[obj.angle][0]
+            obj.high = ANGLE_RANGE[obj.angle][1]
         else:
             obj.low = low
             obj.high = high

coloraide/color.py

@@ -710,7 +710,7 @@ def __repr__(self) -> str:
             self._space._serialize()[0],
             ' '.join(
                 [
-                    util.fmt_float(self[i], util.DEF_PREC, util.DEF_ROUND_MODE) + POSTFIX[channels[i].hue]
+                    util.fmt_float(self[i], util.DEF_PREC, util.DEF_ROUND_MODE) + POSTFIX[channels[i].angle]
                     for i in range(l - 1)
                 ]
             ),

coloraide/css/parse.py

@@ -164,7 +164,7 @@ def parse_channels(color: list[str], boundry: tuple[Channel, ...], scaled: bool
             bound = boundry[i]
             if bound.flags & FLG_ANGLE:
                 v = norm_angle_channel(c)
-                channels.append(v * (bound.high / 360) if bound.hue != ANGLE_DEG else v)
+                channels.append(v * (bound.high / 360) if bound.angle != ANGLE_DEG else v)
             elif scaled:
                 channels.append(norm_scaled_color_channel(c, bound.high))
             else:
@@ -196,7 +196,7 @@ def parse_color(tokens: dict[str, Any], space: Space) -> tuple[Vector, float] |
         channel = properties[i]
         if channel.flags & FLG_ANGLE:
             v = norm_angle_channel(c)
-            channels.append(v * (channel.high / 360) if channel.hue != ANGLE_DEG else v)
+            channels.append(v * (channel.high / 360) if channel.angle != ANGLE_DEG else v)
         else:
             channels.append(norm_color_channel(c.lower(), channel.span, channel.offset))
     return (channels, alpha)

docs/src/markdown/examples/3d_models.html

@@ -226,7 +226,7 @@ <h1>ColorAide Color Space Models</h1>
 from coloraide.channels import ANGLE_DEG
 from coloraide.spaces import HSLish, HSVish, HWBish, Labish, LChish, RGBish
 from coloraide import algebra as alg
-from coloraide.css.serialize import POSTFIX
+from coloraide.color import POSTFIX
 
 FORCE_OWN_GAMUT = {'ryb', 'ryb-biased'}
 
@@ -638,16 +638,18 @@ <h1>ColorAide Color Space Models</h1>
         "gridcolor": gridcolor,
         "zerolinecolor": zerolinecolor,
     }
-    min_hue = target.channels[target.hue_index()].low
-    max_hue = target.channels[target.hue_index()].high
-    type_hue = target.channels[target.hue_index()].hue
 
     if not is_cyl:
         xaxis = str(names[axm[0]])
-    elif max_hue == 360:
-        xaxis = f"{names[axm[0]]} (0˚ - 360˚)"
     else:
-        xaxis = f"{names[axm[0]]} ({min_hue}{POSTFIX[type_hue]} - {max_hue}{POSTFIX[type_hue]})"
+        max_angle = target.channels[target.hue_index()].angle
+        if max_angle == 360:
+            xaxis = f"{names[axm[0]]} (0˚ - 360˚)"
+        else:
+            min_angle = target.channels[target.hue_index()].low
+            type_angle = target.channels[target.hue_index()].angle
+            xaxis = f"{names[axm[0]]} ({min_angle}{POSTFIX[type_angle]} - {max_angle}{POSTFIX[type_angle]})"
+
     yaxis = str(names[axm[1]])
     zaxis = str(names[axm[2]])
 

tools/gamut_3d_plotly.py

@@ -17,7 +17,7 @@
 from coloraide.channels import ANGLE_DEG
 from coloraide.spaces import HSLish, HSVish, HWBish, Labish, LChish, RGBish  # noqa: E402
 from coloraide import algebra as alg  # noqa: E402
-from coloraide.css.serialize import POSTFIX  # noqa: E402
+from coloraide.color import POSTFIX  # noqa: E402
 
 FORCE_OWN_GAMUT = {'ryb', 'ryb-biased'}
 
@@ -429,16 +429,18 @@ def plot_gamut_in_space(
         "gridcolor": gridcolor,
         "zerolinecolor": zerolinecolor,
     }
-    min_hue = target.channels[target.hue_index()].low
-    max_hue = target.channels[target.hue_index()].high
-    type_hue = target.channels[target.hue_index()].hue
 
     if not is_cyl:
         xaxis = str(names[axm[0]])
-    elif max_hue == 360:
-        xaxis = f"{names[axm[0]]} (0˚ - 360˚)"
     else:
-        xaxis = f"{names[axm[0]]} ({min_hue}{POSTFIX[type_hue]} - {max_hue}{POSTFIX[type_hue]})"
+        max_angle = target.channels[target.hue_index()].angle
+        if max_angle == 360:
+            xaxis = f"{names[axm[0]]} (0˚ - 360˚)"
+        else:
+            min_angle = target.channels[target.hue_index()].low
+            type_angle = target.channels[target.hue_index()].angle
+            xaxis = f"{names[axm[0]]} ({min_angle}{POSTFIX[type_angle]} - {max_angle}{POSTFIX[type_angle]})"
+
     yaxis = str(names[axm[1]])
     zaxis = str(names[axm[2]])