Brought back Color.toTuple() method

Author: adrianschneider94

cadquery/materials.py

@@ -129,6 +129,10 @@ def rgba(self) -> RGBA:
         """Get RGBA components as tuple."""
         return (self.red, self.green, self.blue, self.alpha)
 
+    def toTuple(self) -> RGBA:
+        """Get RGBA components as tuple."""
+        return self.rgba()
+
     def to_occ_rgb(self) -> "Quantity_Color":
         """Convert Color to an OCCT RGB color object."""
         from OCP.Quantity import Quantity_Color, Quantity_TOC_sRGB
@@ -249,7 +253,7 @@ def apply_to_vtk_actor(self, actor: "vtkActor") -> None:
         elif self.simple:
             self.simple.apply_to_vtk_actor(actor)
         elif self.color:
-            r, g, b, a = self.color.rgba()
+            r, g, b, a = self.color.toTuple()
             prop.SetColor(r, g, b)
             prop.SetOpacity(a)
 

cadquery/occ_impl/assembly.py

@@ -476,7 +476,7 @@ def toJSON(
         trans, rot = element.location.toTuple()
 
         val["shape"] = data
-        val["color"] = element.color.rgba() if element.color else color.rgba()
+        val["color"] = element.color.toTuple() if element.color else color.toTuple()
         val["position"] = trans
         val["orientation"] = tuple(radians(r) for r in rot)
 
@@ -489,7 +489,7 @@ def toJSON(
             }
             if element.material.pbr:
                 val["material"]["pbr"] = {
-                    "base_color": element.material.pbr.base_color.rgba(),
+                    "base_color": element.material.pbr.base_color.toTuple(),
                     "metallic": element.material.pbr.metallic,
                     "roughness": element.material.pbr.roughness,
                     "refraction_index": element.material.pbr.refraction_index,

doc/gen_colors.py

@@ -19,15 +19,15 @@
 def color_to_rgba_str(c: cq.Color) -> str:
     """ Convert a Color object to a string for the HTML/CSS template.
     """
-    t = c.rgba()
+    t = c.toTuple()
     vals = [int(v * 255) for v in t[:3]]
     return ",".join([str(v) for v in chain(vals, [t[3]])])
 
 
 def calc_text_color(c: cq.Color) -> str:
     """ Calculate required overlay text color from background color.
     """
-    val = sum(c.rgba()[:3]) / 3
+    val = sum(c.toTuple()[:3]) / 3
     if val < 0.5:
         rv = "255,255,255"
     else:

tests/test_assembly.py

@@ -1083,7 +1083,7 @@ def check_nodes(doc, expected):
                 (["box0", "box0_part"], {"color_shape": (1.0, 0.0, 0.0, 1.0)}),
                 (
                     ["box1", "box1_part"],
-                    {"color_shape": cq.Color().rgba()},
+                    {"color_shape": cq.Color().toTuple()},
                 ),  # default color when unspecified
             ],
         ),

tests/test_materials.py

@@ -76,6 +76,10 @@ def test_rgba_method(self):
         color = Color(0.1, 0.2, 0.3, 0.4)
         assert color.rgba() == (0.1, 0.2, 0.3, 0.4)
 
+    def test_to_tuple(self):
+        color = Color(0.1, 0.2, 0.3, 0.4)
+        assert color.toTuple() == (0.1, 0.2, 0.3, 0.4)
+
     def test_equality(self):
         color1 = Color(0.1, 0.2, 0.3, 0.4)
         color2 = Color(0.1, 0.2, 0.3, 0.4)