bec/bec_widgets
1
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2026-04-26 10:10:49 +02:00
Code Activity

even putting it on the main window doesn't work

Browse Source
This commit is contained in:
perl_d
2026-04-12 18:40:12 +02:00
parent 6028b92be1
commit 535b57a23a
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bec_widgets/widgets/containers/main_window/main_window.py
+4
View File
@@ -30,6 +30,7 @@ from bec_widgets.widgets.containers.main_window.addons.notification_center.notif
)
from bec_widgets.widgets.containers.main_window.addons.scroll_label import ScrollLabel
from bec_widgets.widgets.containers.main_window.addons.web_links import BECWebLinksMixin
from bec_widgets.widgets.editors.bec_console.bec_console import BecConsoleRegistry
from bec_widgets.widgets.progress.scan_progressbar.scan_progressbar import ScanProgressBar
from bec_widgets.widgets.utility.widget_hierarchy_tree.widget_hierarchy_tree import (
WidgetHierarchyDialog,
@@ -53,6 +54,9 @@ class BECMainWindow(BECWidget, QMainWindow):
super().__init__(parent=parent, **kwargs)
self.app = QApplication.instance()
self._console_registry = BecConsoleRegistry(self)
if not hasattr(self.app, "console_widget_registry"):
self.app.console_widget_registry = self._console_registry
self.status_bar = self.statusBar()
self._launcher_window = None
self.setWindowTitle(window_title)
bec_widgets/widgets/editors/bec_console/bec_console.py
+16 -20
View File
@@ -7,7 +7,7 @@ from weakref import WeakValueDictionary
import shiboken6
from bec_lib.logger import bec_logger
from pydantic import BaseModel
from qtpy.QtCore import Qt
from qtpy.QtCore import QObject, Qt
from qtpy.QtGui import QMouseEvent
from qtpy.QtWidgets import (
QApplication,
@@ -45,7 +45,7 @@ class _TerminalOwnerInfo(BaseModel):
owner_console_id: str | None = None
registered_console_ids: set[str] = set()
instance: BecTerminal
instance: BecTerminal | QWidget
terminal_id: str
initialized: bool = False
keep_if_last_console_closed: bool = False
@@ -53,15 +53,16 @@ class _TerminalOwnerInfo(BaseModel):
model_config = {"arbitrary_types_allowed": True}
class BecConsoleRegistry:
class BecConsoleRegistry(QWidget):
"""
A registry for the BecConsole class to manage its instances.
"""
def __init__(self):
def __init__(self, parent):
"""
Initialize the registry.
"""
super().__init__(parent=parent)
self._consoles: WeakValueDictionary[str, BecConsole] = WeakValueDictionary()
self._terminal_registry: dict[str, _TerminalOwnerInfo] = {}
@@ -73,10 +74,6 @@ class BecConsoleRegistry:
Args:
console (BecConsole): The instance to register.
"""
# create this on first registration of anything, so we know QApp exists
if not getattr(self, "_persevered_terminals", None):
self._preserved_terminals = QWidget()
self._consoles[console.console_id] = console
console_id, terminal_id = console.console_id, console.terminal_id
if (term_info := self._terminal_registry.get(terminal_id)) is None or not shiboken6.isValid(
@@ -118,7 +115,8 @@ class BecConsoleRegistry:
term_info.instance.deleteLater()
del self._terminal_registry[terminal_id]
else:
term_info.instance.setParent(self._preserved_terminals)
term_info.instance.setHidden()
term_info.instance.setParent(self)
logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
@@ -192,7 +190,8 @@ class BecConsoleRegistry:
logger.debug(f"But it was not the owner, which was {term_info.owner_console_id}!")
return
term_info.owner_console_id = None
term_info.instance.setParent(None)
term_info.instance.setParent(QApplication.instance().console_widget_registry)
def owner_is_visible(self, term_id: str) -> bool:
"""
@@ -212,9 +211,6 @@ class BecConsoleRegistry:
return owner.isVisible()
_bec_console_registry = BecConsoleRegistry()
class _Overlay(QWidget):
def __init__(self, console: BecConsole):
super().__init__(parent=console)
@@ -280,13 +276,13 @@ class BecConsole(BECWidget, QWidget):
self._stacked_layout.addWidget(self._overlay)
# will create a new terminal instance if there isn't already one for this ID
_bec_console_registry.register(self)
QApplication.instance().console_widget_registry.register(self)
self._infer_mode()
if self.startup_cmd:
self.write(self.startup_cmd, True) # will have no effect if not the owner
def _infer_mode(self):
self.term = _bec_console_registry.try_get_term(self)
self.term = QApplication.instance().console_widget_registry.try_get_term(self)
if self.term:
self._set_mode(ConsoleMode.ACTIVE)
elif self.isHidden():
@@ -351,7 +347,7 @@ class BecConsole(BECWidget, QWidget):
from its current owner (if any) to this widget.
"""
# Get the instance from registry
self.term = _bec_console_registry.take_ownership(self)
self.term = QApplication.instance().console_widget_registry.take_ownership(self)
self._infer_mode()
if self._mode == ConsoleMode.ACTIVE:
logger.debug(f"Widget {self.gui_id} took ownership of instance {self.terminal_id}")
@@ -362,7 +358,7 @@ class BecConsole(BECWidget, QWidget):
available for another widget to claim. This is automatically called when the
widget becomes hidden.
"""
_bec_console_registry.yield_ownership(self)
QApplication.instance().console_widget_registry.yield_ownership(self)
self._infer_mode()
if self._mode != ConsoleMode.ACTIVE:
logger.debug(f"Widget {self.gui_id} yielded ownership of instance {self.terminal_id}")
@@ -375,13 +371,13 @@ class BecConsole(BECWidget, QWidget):
def showEvent(self, event):
"""Called when the widget is shown. Updates UI state based on ownership."""
super().showEvent(event)
if not _bec_console_registry.is_owner(self):
if not _bec_console_registry.owner_is_visible(self.terminal_id):
if not QApplication.instance().console_widget_registry.is_owner(self):
if not QApplication.instance().console_widget_registry.owner_is_visible(self.terminal_id):
self.take_terminal_ownership()
def cleanup(self):
"""Unregister this console on destruction."""
_bec_console_registry.unregister(self)
QApplication.instance().console_widget_registry.unregister(self)
super().cleanup()