From af1b84afe2adedc55ebf6bfa99451452a7a13cdf Mon Sep 17 00:00:00 2001 From: Laurens Valk Date: Fri, 12 Feb 2021 10:16:43 +0100 Subject: [PATCH] api/parameters/Color: drop name attribute --- pybricks/parameters.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pybricks/parameters.py b/pybricks/parameters.py index c8a2142..989dfc2 100644 --- a/pybricks/parameters.py +++ b/pybricks/parameters.py @@ -30,16 +30,13 @@ class _PybricksEnum(_Enum, metaclass=_PybricksEnumMeta): class Color: """Light or surface color.""" - def __init__(self, h, s=100, v=100, name=None): + def __init__(self, h, s=100, v=100): self.h = h % 360 self.s = max(0, min(s, 100)) self.v = max(0, min(v, 100)) - self.name = name def __repr__(self): - name_str = '' if self.name is None else ", '{}'".format(self.name) - - return "Color({}, {}, {}{})".format(self.h, self.s, self.v, name_str) + return "Color(h={}, s={}, v={})".format(self.h, self.s, self.v) def __eq__(self, other): return (isinstance(other, Color) and @@ -59,17 +56,18 @@ class Color: return self.__mul__(1/scale) -Color.BLACK = Color(0, 0, 0, 'BLACK') -Color.GRAY = Color(0, 0, 50, 'GRAY') -Color.WHITE = Color(0, 0, 100, 'WHITE') -Color.RED = Color(0, 100, 100, 'RED') -Color.ORANGE = Color(30, 100, 100, 'ORANGE') -Color.YELLOW = Color(60, 100, 100, 'YELLOW') -Color.GREEN = Color(120, 100, 100, 'GREEN') -Color.CYAN = Color(180, 100, 100, 'CYAN') -Color.BLUE = Color(240, 100, 100, 'BLUE') -Color.VIOLET = Color(270, 100, 100, 'VIOLET') -Color.MAGENTA = Color(300, 100, 100, 'MAGENTA') +Color.NONE = Color(0, 0, 0) +Color.BLACK = Color(0, 0, 20) +Color.GRAY = Color(0, 0, 50) +Color.WHITE = Color(0, 0, 100) +Color.RED = Color(0, 100, 100) +Color.ORANGE = Color(30, 100, 100) +Color.YELLOW = Color(60, 100, 100) +Color.GREEN = Color(120, 100, 100) +Color.CYAN = Color(180, 100, 100) +Color.BLUE = Color(240, 100, 100) +Color.VIOLET = Color(270, 100, 100) +Color.MAGENTA = Color(300, 100, 100) class Port(_PybricksEnum):