fix(qml): resolve runtime reference errors, missing imports, and port change notifications
This commit is contained in:
+20
-16
@@ -9,12 +9,22 @@ from PySide6.QtWidgets import QApplication
|
||||
|
||||
from pygui.backend.controllers.device_controller import DeviceController
|
||||
from pygui.backend.controllers.session_controller import SessionController
|
||||
from pygui.backend.data.constants import default_data_dir
|
||||
from pygui.backend.data.file_browser import FileBrowser
|
||||
from pygui.backend.data.local_settings import LocalSettings
|
||||
from pygui.backend.data.local_settings_model import LocalSettingsModel
|
||||
from pygui.backend.license.license_model import LicenseModel
|
||||
|
||||
# Importing wafer_map_item + trend_chart_item registers @QmlElement types (QML: import ISC.Wafer).
|
||||
from pygui.backend.visualization import (
|
||||
graph_quick_item as graph_quick_item, # noqa: F401
|
||||
)
|
||||
from pygui.backend.visualization import (
|
||||
trend_chart_item as trend_chart_item, # noqa: F401
|
||||
)
|
||||
from pygui.backend.visualization import (
|
||||
wafer_map_item as wafer_map_item, # noqa: F401
|
||||
)
|
||||
|
||||
|
||||
# ===== Application Entry Point =====
|
||||
@@ -32,8 +42,15 @@ def main() -> int:
|
||||
app = QApplication(sys.argv)
|
||||
engine = QQmlApplicationEngine()
|
||||
|
||||
# ===== Shared Models =====
|
||||
settings_model = LocalSettingsModel()
|
||||
# ===== Shared Settings =====
|
||||
# One LocalSettings instance, one disk read. LocalSettingsModel and
|
||||
# DeviceController both hold this same object, so a save from the
|
||||
# Settings tab is visible to the device layer immediately — no reload,
|
||||
# no second copy to go stale.
|
||||
data_dir = str(default_data_dir())
|
||||
raw_settings = LocalSettings.read_settings(data_dir)
|
||||
|
||||
settings_model = LocalSettingsModel(raw_settings, data_dir)
|
||||
select_file_dialog_model = FileBrowser()
|
||||
settings_model.loadSettings()
|
||||
engine.rootContext().setContextProperty("settingsModel", settings_model)
|
||||
@@ -54,8 +71,6 @@ def main() -> int:
|
||||
# read/erase time (P2.1); a bound Callable[[str], str] avoids a
|
||||
# LicenseModel import in the controller and keeps it testable with a
|
||||
# lambda. See docs/pending/license-gating-plan.md §1.1.
|
||||
data_dir = str(settings_model._data_dir)
|
||||
raw_settings = LocalSettings.read_settings(data_dir)
|
||||
device_controller = DeviceController(raw_settings, data_dir)
|
||||
engine.rootContext().setContextProperty("deviceController", device_controller)
|
||||
|
||||
@@ -64,20 +79,9 @@ def main() -> int:
|
||||
engine.rootContext().setContextProperty("licenseModel", license_model)
|
||||
|
||||
# ===== Session Controller (live/review wafer dashboard) =====
|
||||
raw_settings_dict = raw_settings.__dict__.copy() if hasattr(raw_settings, '__dict__') else {}
|
||||
stream_controller = SessionController(settings=raw_settings_dict)
|
||||
stream_controller = SessionController()
|
||||
engine.rootContext().setContextProperty("streamController", stream_controller)
|
||||
|
||||
# Persist session state back to settings when it changes
|
||||
def _persist_session_settings():
|
||||
session_state = stream_controller.collect_settings()
|
||||
for k, v in session_state.items():
|
||||
if hasattr(raw_settings, k):
|
||||
setattr(raw_settings, k, v)
|
||||
LocalSettings.save_settings(data_dir, raw_settings)
|
||||
|
||||
stream_controller.settingsChanged.connect(_persist_session_settings)
|
||||
|
||||
# ===== QML Startup =====
|
||||
# The "ISC" QML module lives alongside this file (src/pygui/ISC), so the
|
||||
# package directory is the import path the engine searches for qmldir.
|
||||
|
||||
Reference in New Issue
Block a user