From d7361dec04ade5fe621021663ecf914c91842175 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson <oscar.gustafsson@gmail.com> Date: Thu, 14 Sep 2023 14:15:34 +0200 Subject: [PATCH] Fix HiDpi issue (and some cleanup) --- src/simudator/gui/gui.py | 1 + src/simudator/gui/module_graphics_item/mia/upc_graphic.py | 3 +-- src/simudator/gui/module_graphics_item/register_graphic.py | 2 +- src/simudator/processor/mia/mia.py | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/simudator/gui/gui.py b/src/simudator/gui/gui.py index c7a273c..f38cdc8 100644 --- a/src/simudator/gui/gui.py +++ b/src/simudator/gui/gui.py @@ -824,6 +824,7 @@ class GUI(QMainWindow): if __name__ == '__main__': + QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling) app = QApplication(sys.argv) gui = GUI(Processor()) gui.show() diff --git a/src/simudator/gui/module_graphics_item/mia/upc_graphic.py b/src/simudator/gui/module_graphics_item/mia/upc_graphic.py index db66458..2498c39 100644 --- a/src/simudator/gui/module_graphics_item/mia/upc_graphic.py +++ b/src/simudator/gui/module_graphics_item/mia/upc_graphic.py @@ -15,8 +15,7 @@ class uPcGraphicsItem(IntegerRegisterGraphicsItem): name = self.state["name"] value = self.state["value"] - value_text = f"0x{value:02x}" - full_text = name + ": " + value_text[2:] + full_text = f"{name}: {value:02x}" self.text.setText(full_text) diff --git a/src/simudator/gui/module_graphics_item/register_graphic.py b/src/simudator/gui/module_graphics_item/register_graphic.py index d1ce000..52b6a94 100644 --- a/src/simudator/gui/module_graphics_item/register_graphic.py +++ b/src/simudator/gui/module_graphics_item/register_graphic.py @@ -7,7 +7,7 @@ from simudator.gui.module_graphics_item.module_graphics_item import ModuleGraphi class RegisterGraphicsItem(ModuleGraphicsItem): """ - A general garphics item for register modules. + A general graphics item for register modules. """ RECT_HEIGHT = 40 RECT_WIDTH_PER_CHAR = 8 diff --git a/src/simudator/processor/mia/mia.py b/src/simudator/processor/mia/mia.py index 83cdc4e..7c56ba3 100644 --- a/src/simudator/processor/mia/mia.py +++ b/src/simudator/processor/mia/mia.py @@ -1,7 +1,5 @@ import sys -from qtpy.QtWidgets import QApplication - from simudator.cli.cli import CLI from simudator.core.modules import Flag from simudator.core.modules.register import IntegerRegister @@ -223,6 +221,9 @@ class MIA_CPU(Processor): self.do_tick() def launch_gui(self): + from qtpy import QtCore + from qtpy.QtWidgets import QApplication + QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling) app = QApplication(sys.argv) self.load_state_from_file("mia_uppg3.txt") self.reset() -- GitLab