mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-08-30 12:43:46 +08:00
ui: optimize gui_app & spinner (#1474)
remove gui_app_sp & use upstream gui_app Co-authored-by: Jason Wen <haibin.wen3@gmail.com>
This commit is contained in:
@@ -8,8 +8,6 @@ from openpilot.system.ui.lib.text_measure import measure_text_cached
|
|||||||
from openpilot.system.ui.text import wrap_text
|
from openpilot.system.ui.text import wrap_text
|
||||||
from openpilot.system.ui.widgets import Widget
|
from openpilot.system.ui.widgets import Widget
|
||||||
|
|
||||||
from openpilot.system.ui.sunnypilot.lib.application import gui_app_sp
|
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
if gui_app.big_ui():
|
if gui_app.big_ui():
|
||||||
PROGRESS_BAR_WIDTH = 1000
|
PROGRESS_BAR_WIDTH = 1000
|
||||||
@@ -37,7 +35,7 @@ def clamp(value, min_value, max_value):
|
|||||||
class Spinner(Widget):
|
class Spinner(Widget):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self._comma_texture = gui_app_sp.sp_texture("images/spinner_sunnypilot.png", TEXTURE_SIZE, TEXTURE_SIZE)
|
self._comma_texture = gui_app.texture("../../sunnypilot/selfdrive/assets/images/spinner_sunnypilot.png", TEXTURE_SIZE, TEXTURE_SIZE)
|
||||||
self._spinner_texture = gui_app.texture("images/spinner_track.png", TEXTURE_SIZE, TEXTURE_SIZE, alpha_premultiply=True)
|
self._spinner_texture = gui_app.texture("images/spinner_track.png", TEXTURE_SIZE, TEXTURE_SIZE, alpha_premultiply=True)
|
||||||
self._rotation = 0.0
|
self._rotation = 0.0
|
||||||
self._progress: int | None = None
|
self._progress: int | None = None
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
from openpilot.system.ui.lib.application import GuiApplication
|
|
||||||
from importlib.resources import as_file, files
|
|
||||||
|
|
||||||
ASSETS_DIR_SP = files("openpilot.sunnypilot.selfdrive").joinpath("assets")
|
|
||||||
|
|
||||||
|
|
||||||
class GuiApplicationSP(GuiApplication):
|
|
||||||
|
|
||||||
def __init__(self, width: int, height: int):
|
|
||||||
super().__init__(width, height)
|
|
||||||
|
|
||||||
def sp_texture(self, asset_path: str, width: int, height: int, alpha_premultiply=False, keep_aspect_ratio=True):
|
|
||||||
cache_key = f"{asset_path}_{width}_{height}_{alpha_premultiply}{keep_aspect_ratio}"
|
|
||||||
if cache_key in self._textures:
|
|
||||||
return self._textures[cache_key]
|
|
||||||
|
|
||||||
with as_file(ASSETS_DIR_SP.joinpath(asset_path)) as fspath:
|
|
||||||
image_obj = self._load_image_from_path(fspath.as_posix(), width, height, alpha_premultiply, keep_aspect_ratio)
|
|
||||||
texture_obj = self._load_texture_from_image(image_obj)
|
|
||||||
self._textures[cache_key] = texture_obj
|
|
||||||
return texture_obj
|
|
||||||
|
|
||||||
|
|
||||||
gui_app_sp = GuiApplicationSP(2160, 1080)
|
|
||||||
Reference in New Issue
Block a user