Skip to content

fix text rotation #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devsnek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix text rotation #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 94 additions & 52 deletions Dependencies/gfx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ def __init__(
):
self.width = width
self.height = height
# Physical framebuffer dimensions, unchanged by setRotation. Used
# by _print_text to compute the correct stride and remap pixels.
self.phys_width = width
self.phys_height = height
self.rotation = 0
self._pixel = pixel
# Default to slow horizontal & vertical line implementations if no
# faster versions are provided.
Expand Down Expand Up @@ -399,15 +404,20 @@ def fill_round_rect(self, x0, y0, width, height, radius, *args, **kwargs):

def _print_text(self, framebuf, x0, y0, string, size, *args, **kwargs):
"""Optimized text rendering for 1bpp and 2bpp framebuffers with text wrapping"""
# Display parameters (adjust to your display)
# Logical (possibly rotated) clip bounds
DISPLAY_WIDTH = self.width
DISPLAY_HEIGHT = self.height

# Default to 2bpp if not specified
bpp = kwargs.get('bpp', 2)

wrap_text = kwargs.get('text_wrap', False)
BYTES_PER_ROW = (DISPLAY_WIDTH * bpp) // 8
# Stride is based on the PHYSICAL framebuffer width, not the logical
# (rotated) width — the framebuffer layout doesn't change with rotation.
rotation = self.rotation
phys_w = self.phys_width
phys_h = self.phys_height
BYTES_PER_ROW = (phys_w * bpp) // 8

# Color handling
color = args[0] if args else (1 if bpp == 1 else 3) # Default to white
Expand Down Expand Up @@ -437,13 +447,15 @@ def _print_text(self, framebuf, x0, y0, string, size, *args, **kwargs):
GFX._draw_char_1bpp(
framebuf, x, y, char_data, ch_w, ch_h,
size, color, BYTES_PER_ROW,
DISPLAY_WIDTH, DISPLAY_HEIGHT
DISPLAY_WIDTH, DISPLAY_HEIGHT,
rotation, phys_w, phys_h
)
else:
GFX._draw_char_2bpp(
framebuf, x, y, char_data, ch_w, ch_h,
size, color, BYTES_PER_ROW,
DISPLAY_WIDTH, DISPLAY_HEIGHT
DISPLAY_WIDTH, DISPLAY_HEIGHT,
rotation, phys_w, phys_h
)
x += ch_w * size
except (ValueError, TypeError):
Expand Down Expand Up @@ -474,13 +486,15 @@ def _print_text(self, framebuf, x0, y0, string, size, *args, **kwargs):
GFX._draw_char_1bpp(
framebuf, x, y, char_data, ch_w, ch_h,
size, color, BYTES_PER_ROW,
DISPLAY_WIDTH, DISPLAY_HEIGHT
DISPLAY_WIDTH, DISPLAY_HEIGHT,
rotation, phys_w, phys_h
)
else:
GFX._draw_char_2bpp(
framebuf, x, y, char_data, ch_w, ch_h,
size, color, BYTES_PER_ROW,
DISPLAY_WIDTH, DISPLAY_HEIGHT
DISPLAY_WIDTH, DISPLAY_HEIGHT,
rotation, phys_w, phys_h
)
x += ch_w * size
return [x,y], line_height
Expand All @@ -489,89 +503,117 @@ def _print_text(self, framebuf, x0, y0, string, size, *args, **kwargs):
def _draw_char_1bpp(framebuf: ptr8, x0: int, y0: int, char_data: ptr8,
width: int, height: int, size: int,
color: int, bytes_per_row: int,
display_width: int, display_height: int):
"""Optimized 1bpp character drawing"""
shift_mask = ptr8(b'\x80\x40\x20\x10\x08\x04\x02\x01') # Bit masks
color_bit = 0x01 if color else 0x00

display_width: int, display_height: int,
rotation: int, phys_w: int, phys_h: int):
"""Optimized 1bpp character drawing with rotation-aware pixel remap.

(x0,y0) and display_width/height are in LOGICAL (post-rotation) coords.
bytes_per_row and phys_w/phys_h describe the PHYSICAL framebuffer.
"""
shift_mask = ptr8(b'\x80\x40\x20\x10\x08\x04\x02\x01')

for row in range(height):
row_bytes = (width + 7) // 8
row_offset = row * row_bytes

for col in range(width):
byte_idx = col // 8
bit_mask = int(shift_mask[col % 8])
pixel_on = int(char_data[row_offset + byte_idx]) & bit_mask

if pixel_on:
x_base = x0 + col * size
y_base = y0 + row * size

# Clip to display bounds

if x_base >= display_width or y_base >= display_height:
continue
if x_base < 0 or y_base < 0:
if x_base + size <= 0 or y_base + size <= 0:
continue

# Handle scaling

for sy in range(size):
y_pos = y_base + sy
if y_pos >= display_height:
break
if y_pos < 0 or y_pos >= display_height:
continue
for sx in range(size):
x_pos = x_base + sx
if x_pos < display_width and x_pos >= 0:
# Calculate framebuffer position (1bpp specific)
fb_idx = y_pos * bytes_per_row + (x_pos // 8)
shift =(x_pos % 8)

# Set or clear the bit
if color:
framebuf[fb_idx] |= (1 << shift)
else:
framebuf[fb_idx] &= ~(1 << shift)
if x_pos < 0 or x_pos >= display_width:
continue

# Remap logical (x_pos,y_pos) to physical (px,py)
if rotation == 0:
px = x_pos
py = y_pos
elif rotation == 1:
px = y_pos
py = phys_h - 1 - x_pos
elif rotation == 2:
px = phys_w - 1 - x_pos
py = phys_h - 1 - y_pos
else:
px = phys_w - 1 - y_pos
py = x_pos

fb_idx = py * bytes_per_row + (px >> 3)
shift = px & 7

if color:
framebuf[fb_idx] |= (1 << shift)
else:
framebuf[fb_idx] &= ~(1 << shift)

@micropython.viper
def _draw_char_2bpp(framebuf: ptr8, x0: int, y0: int, char_data: ptr8,
width: int, height: int, size: int,
color: int, bytes_per_row: int,
display_width: int, display_height: int):
"""Optimized 2bpp character drawing"""
shift_mask = ptr8(b'\x80\x40\x20\x10\x08\x04\x02\x01') # Bit masks

display_width: int, display_height: int,
rotation: int, phys_w: int, phys_h: int):
"""Optimized 2bpp character drawing with rotation-aware pixel remap."""
shift_mask = ptr8(b'\x80\x40\x20\x10\x08\x04\x02\x01')

for row in range(height):
row_bytes = (width + 7) // 8
row_offset = row * row_bytes

for col in range(width):
byte_idx = col // 8
bit_mask = int(shift_mask[col % 8])
pixel_on = int(char_data[row_offset + byte_idx]) & bit_mask

if pixel_on:
x_base = x0 + col * size
y_base = y0 + row * size

# Clip to display bounds

if x_base >= display_width or y_base >= display_height:
continue
if x_base < 0 or y_base < 0:
if x_base + size <= 0 or y_base + size <= 0:
continue

# Handle scaling

for sy in range(size):
y_pos = y_base + sy
if y_pos >= display_height:
break
if y_pos < 0 or y_pos >= display_height:
continue
for sx in range(size):
x_pos = x_base + sx
if x_pos < display_width and x_pos >= 0:
# Calculate framebuffer position (2bpp specific)
fb_idx = y_pos * bytes_per_row + (x_pos // 4)
shift =((x_pos % 4) * 2)

# Clear existing bits and set new color
framebuf[fb_idx] = (framebuf[fb_idx] & ~(0x03 << shift)) | (color << shift)
if x_pos < 0 or x_pos >= display_width:
continue

if rotation == 0:
px = x_pos
py = y_pos
elif rotation == 1:
px = y_pos
py = phys_h - 1 - x_pos
elif rotation == 2:
px = phys_w - 1 - x_pos
py = phys_h - 1 - y_pos
else:
px = phys_w - 1 - y_pos
py = x_pos

fb_idx = py * bytes_per_row + (px >> 2)
shift = (px & 3) << 1

framebuf[fb_idx] = (framebuf[fb_idx] & ~(0x03 << shift)) | (color << shift)



Expand Down
1 change: 1 addition & 0 deletions Inkplate10/Inkplate10/inkplate10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ def height(self):
# Arduino compatibility functions
def setRotation(self, x):
self.rotation = x % 4
self.GFX.rotation = self.rotation
if self.rotation == 0 or self.rotation == 2:
self.GFX.width = D_COLS
self.GFX.height = D_ROWS
Expand Down
1 change: 1 addition & 0 deletions Inkplate5v2/Inkplate5v2/inkplate5v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ def height(self):
# Arduino compatibility functions
def setRotation(self, x):
self.rotation = x % 4
self.GFX.rotation = self.rotation
if self.rotation == 0 or self.rotation == 2:
self.GFX.width = D_COLS
self.GFX.height = D_ROWS
Expand Down
1 change: 1 addition & 0 deletions Inkplate6/Inkplate6/inkplate6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ def height(self):
# Arduino compatibility functions
def setRotation(self, x):
self.rotation = x % 4
self.GFX.rotation = self.rotation
if self.rotation == 0 or self.rotation == 2:
self.GFX.width = D_COLS
self.GFX.height = D_ROWS
Expand Down
1 change: 1 addition & 0 deletions Inkplate6FLICK/Inkplate6FLICK/inkplate6FLICK.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ def height(self):
def setRotation(self, x):
self.rotation = x % 4
_Inkplate.rotation = x % 4
self.GFX.rotation = self.rotation

if self.rotation == 0 or self.rotation == 2:
self.GFX.width = D_COLS
Expand Down