rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let lists of colours be set for simulation sample.

Browse source
This commit is contained in:
Julian Stirling 2025-12-28 21:32:27 +00:00
parent 11379d8fa7
commit 980af66548
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/openflexure_microscope_server/things/camera/simulation.py
View file

@ -50,6 +50,9 @@ DOWNSAMPLE = 2
# for a nice gain in quality. # for a nice gain in quality.
SPRITE_UPSAMPLE = 4 SPRITE_UPSAMPLE = 4
COLOUR_LIST_REGEX = re.compile(
r"\s*^(#[0-9a-fA-F]{6})\s*(?:;\s*(#[0-9a-fA-F]{6})\s*)*$"
)
COLOUR_REGEX = re.compile(r"^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$") COLOUR_REGEX = re.compile(r"^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$")
@ -71,18 +74,22 @@ def _downsample_shape(
raise ValueError("A shape should be a 2 or 3 element tuple.") raise ValueError("A shape should be a 2 or 3 element tuple.")
def colour_str_to_colour(colour: str) -> tuple[int, int, int]: def colour_str_to_colour(colour_str: str) -> tuple[int, int, int]:
"""Convert a colour string into RGB colour values. """Convert a colour string into RGB colour values.
:param colour: Should be a hex colour such as #33aa33 :param colour_str: Should be a hex colour such as #33aa33 or a list separated by
semicolons.
:return: The colour as a tuple of 3 integers from 0 to 255 in value :return: The colour as a tuple of 3 integers from 0 to 255 in value
:raises ValueError: If the hex string is not valid. :raises ValueError: If the hex string is not valid.
""" """
colour = colour.lower().strip() if ";" in colour_str:
colour_match = COLOUR_REGEX.match(colour) colours = colour_str.split(";")
colour_str = colours[RNG.integers(0, len(colours))]
colour_str = colour_str.lower().strip()
colour_match = COLOUR_REGEX.match(colour_str)
if colour_match is None: if colour_match is None:
raise ValueError( raise ValueError(
f"{colour} is not a valid colour. Please use HTML hex notation." f"{colour_str} is not a valid colour. Please use HTML hex notation."
) )
r = int("0x" + colour_match.group(1), 16) r = int("0x" + colour_match.group(1), 16)
@ -149,7 +156,7 @@ class SimulatedCamera(BaseCamera):
@colour.setter @colour.setter
def colour(self, value: str) -> None: def colour(self, value: str) -> None:
if COLOUR_REGEX.match(value) is None: if COLOUR_LIST_REGEX.match(value) is None:
self.logger.warning(f"{value} is not a valid colour string.") self.logger.warning(f"{value} is not a valid colour string.")
return return