Skip to content

Commit

Permalink
[fix] Convoluted init got undefined property
Browse files Browse the repository at this point in the history
  • Loading branch information
lpascal-ledger committed Jul 21, 2023
1 parent 6a61aea commit dd98096
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions speculos/mcu/screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ def _redraw(self, qp):

self.update_screenshot()

def update_public_screenshot(self):
return self.fb.update_public_screenshot()

def get_public_screenshot(self):
return self.fb.get_public_screenshot()


class App(QMainWindow):
def __init__(self, qt_app: QApplication, display: DisplayArgs, server: ServerArgs) -> None:
Expand Down Expand Up @@ -198,14 +192,15 @@ def closeEvent(self, event: QEvent):


class Screen(Display):
def __init__(self, app: App, display: DisplayArgs, server: ServerArgs) -> None:
def __init__(self, display: DisplayArgs, server: ServerArgs) -> None:
super().__init__(display, server)
self.app: App
self.m = self.app.widget
self.m: QWidget
self._gl: GraphicLibrary

def set_app(self, app: App) -> None:
self.app = app
self.app.set_screen(self)
model = self._display_args.model
if model != "stax":
self._gl = bagl.Bagl(app.widget, MODELS[model].screen_size, model)
Expand All @@ -215,6 +210,10 @@ def set_app(self, app: App) -> None:
model,
self._display_args.force_full_ocr)

@property
def m(self) -> Widget:
return self.app.widget

@property
def gl(self):
return self._gl
Expand Down Expand Up @@ -250,9 +249,9 @@ def screen_update(self) -> bool:

class QtScreenNotifier(DisplayNotifier):
def __init__(self, display_args: DisplayArgs, server_args: ServerArgs) -> None:
self._qapp = QApplication([])
super().__init__(display_args, server_args)
self._set_display_class(Screen)
self._qapp = QApplication([])
self._app_widget = App(self._qapp, display_args, server_args)
assert isinstance(self.display, Screen)
self.display.set_app(self._app_widget)
Expand Down

0 comments on commit dd98096

Please sign in to comment.