Update threshold approach and rename files to not use _jmh

Author: facelessuser

coloraide/everything.py

@@ -26,12 +26,12 @@
 from .spaces.acescg import ACEScg
 from .spaces.acescc import ACEScc
 from .spaces.acescct import ACEScct
-from .spaces.cam02_jmh import CAM02JMh
+from .spaces.cam02 import CAM02JMh
 from .spaces.cam02_ucs import CAM02UCS, CAM02LCD, CAM02SCD
-from .spaces.cam16_jmh import CAM16JMh
+from .spaces.cam16 import CAM16JMh
 from .spaces.cam16_ucs import CAM16UCS, CAM16LCD, CAM16SCD
-from .spaces.hellwig_jmh import HellwigJMh, HellwigHKJMh
-from .spaces.zcam_jmh import ZCAMJMh
+from .spaces.hellwig import HellwigJMh, HellwigHKJMh
+from .spaces.zcam import ZCAMJMh
 from .spaces.hct import HCT
 from .spaces.ucs import UCS
 from .spaces.rec709 import Rec709

coloraide/spaces/cam02_jmh.py coloraide/spaces/cam02.pycoloraide/spaces/cam02_jmh.py renamed to coloraide/spaces/cam02.py

@@ -10,20 +10,19 @@
 import math
 from .. import util
 from .. import algebra as alg
-from ..spaces import Space, LChish
+from .lch import LCh
 from ..cat import WHITES, CAT02
 from ..channels import Channel, FLG_ANGLE
-from .lch import ACHROMATIC_THRESHOLD
 from ..types import Vector
-from .cam16_jmh import (
+from .cam16 import (
     M1,
     hue_quadrature,
     inv_hue_quadrature,
     eccentricity,
     adapt,
     unadapt
 )
-from .cam16_jmh import Environment as _Environment
+from .cam16 import Environment as _Environment
 
 # CAT02
 M02 = CAT02.MATRIX
@@ -247,7 +246,7 @@ def cam_jmh_to_xyz(jmh: Vector, env: Environment) -> Vector:
     return cam_to_xyz(J=J, M=M, h=h, env=env)
 
 
-class CAM02JMh(LChish, Space):
+class CAM02JMh(LCh):
     """CAM02 class (JMh)."""
 
     BASE = "xyz-d65"
@@ -291,7 +290,7 @@ def is_achromatic(self, coords: Vector) -> bool | None:
         """Check if color is achromatic."""
 
         # Account for both positive and negative chroma
-        return coords[0] == 0 or abs(coords[1]) < ACHROMATIC_THRESHOLD
+        return coords[0] == 0 or abs(coords[1]) < self.achromatic_threshold
 
     def to_base(self, coords: Vector) -> Vector:
         """From CAM02 JMh to XYZ."""

coloraide/spaces/cam02_ucs.py

@@ -1,15 +1,14 @@
 """CAM02 UCS."""
 from __future__ import annotations
-from .cam02_jmh import xyz_to_cam, cam_to_xyz, CAM02JMh
+from .cam02 import xyz_to_cam, cam_to_xyz, CAM02JMh
 from .cam16_ucs import cam_jmh_to_cam_ucs, cam_ucs_to_cam_jmh
-from ..spaces import Space, Labish
-from .lch import ACHROMATIC_THRESHOLD
+from .lab import Lab
 from ..cat import WHITES
 from ..channels import Channel, FLG_MIRROR_PERCENT
 from ..types import Vector
 
 
-class CAM02UCS(Labish, Space):
+class CAM02UCS(Lab):
     """CAM02 UCS (Jab) class."""
 
     BASE = "cam02-jmh"
@@ -32,7 +31,7 @@ def is_achromatic(self, coords: Vector) -> bool:
         """Check if color is achromatic."""
 
         j, m = cam_ucs_to_cam_jmh(coords, self.MODEL)[:-1]
-        return j == 0 or abs(m) < ACHROMATIC_THRESHOLD
+        return j == 0 or abs(m) < self.achromatic_threshold
 
     def to_base(self, coords: Vector) -> Vector:
         """To base from UCS."""