v.0.5.0 cleanup code, utils ...

app/display/fonts/__init__.py

@@ -2,6 +2,8 @@ from .font_3x5 import font_3x5
 from .font_5x7 import font_5x7
 from .font_8x8 import font_8x8
 from .font_16x16 import font_16x16
-from .fonts_utils import char_width
 
-__all__ = ['font_3x5', 'font_5x7', 'font_8x8', 'font_16x16', 'char_width']
+fonts_installed = [font_3x5, font_5x7, font_8x8, font_16x16]
+
+__all__ = ['font_3x5', 'font_5x7', 'font_8x8', 'font_16x16', 'fonts_installed']
+

app/display/fonts/fonts_utils.py

@@ -1,135 +0,0 @@
-import app.utils as utils
-
-# FIXME: der Import klappt nicht !!!
-# from app.display.neopixel_64x64 import NeoPixel_64x64
-# from ...display.neopixel_64x64 import NeoPixel_64x64
-
-
-def char_width(char_matrix) -> int:
-	"""Berechnung der Bits für die Zeichenbreite
-
-	Args:
-			char_matrix (int): Zeichen als Array[int]
-
-	Returns:
-			int: Anzahl Bits für die Zeichenbreite
-	"""
-	max_val = max(char_matrix)
-
-	val = max_val
-	cw = 0
-	while 0xFFFFFFFF & val:
-		"""rechts shiften, bis alles Nullen da sind"""
-		val >>= 1
-		cw += 1
-
-	return cw
-
-
-def shift_letter_right(char, letter, debug=False) -> bool:
-	"""Prüfe ob das Zeichen auch komplett nach rechts gezogen ist
-
-	Args:
-			letter (_type_): Array[0..nBytes]
-
-	Returns:
-			bool: _description_
-	"""
-
-	def isLetterRight(letter):
-		def isByteRight(byte):
-			return True if 1 & byte == 1 else False
-
-		for byte in letter:
-			if isByteRight(byte):
-				return True
-
-		return False
-
-	def shiftLetterRight(letter):
-		def shift(letter):
-			return [byte >> 1 for byte in letter]
-
-		shifted = letter
-		for i in range(8):  # max 1 Bit's
-			shifted = shift(shifted)
-			if isLetterRight(shifted):
-				break
-
-		return shifted
-
-	if isLetterRight(letter):
-		return letter
-
-	# letter is not right shifted
-	shifted = shiftLetterRight(letter)
-
-	if debug:
-		print('origin:')
-		utils.show_byte_matrix(char, letter)
-		print('shifted')
-		utils.show_byte_matrix(char, shifted)
-
-	return shifted
-
-
-def align_font(font, debug=False):
-	chars = [char for char in font]
-	print(chars)
-
-	# Print the dictionary
-	print('font_pretty = {')
-	for char in sorted(font.keys()):
-		shifted = shift_letter_right(char=char, letter=font[char], debug=debug)
-		hex_values = [f'0x{val:02X}' for val in shifted]
-		print(f"\t'{char}': [{', '.join(hex_values)}],")
-	print('}')
-
-	# return f'#keys: {len(list(font.keys()))}'
-	return f'#keys: {len(font)}'
-
-
-def screen_text(text: str, display: NeoPixel_64x64):
-	"""Text für einen Screen anpassen,
-	Anzahl der Zeichen je Zeile begrenzen,
-	ebenso wird die Höhe des Screen brücksichtigt
-
-
-	Args:
-			text (str): Text der ausgegeben werden soll
-			font: Berechnungen für den Font
-			height (int): Pixel
-			width (int): Pixel
-	"""
-
-	def text_per_row(txt):
-		pixs = 0
-		visible_text = ''
-		for a in txt:
-			pixs += char_width(display.selected_font[a]) + 1
-			if pixs > display.MATRIX_WIDTH:
-				# Zeilenende erreicht
-				break
-			visible_text += a
-
-		return visible_text
-
-	# Ganzzahl Division
-	max_visible_rows = display.MATRIX_HEIGHT // display.font_height
-	print(f'rows_visible: {max_visible_rows}')
-
-	text_left = text
-	scn_txt = []
-	for _ in range(max_visible_rows):
-		visible_text = text_per_row(text_left)
-		visible_text_len = len(visible_text)
-		text_left = text_left[visible_text_len:]
-
-		scn_txt.append(visible_text)
-
-		if not text_left:
-			break
-
-	scr_txt_dict = {'visible': scn_txt, 'invisible': text_left}
-
-	return scr_txt_dict