From b9e3947a251e6b5c61f3f750ac616616dfe89ae7 Mon Sep 17 00:00:00 2001 From: gti Date: Sun, 16 Feb 2025 13:49:15 +0800 Subject: [PATCH] fix ? --- src/nodes/Node.py | 4 +- src/ui/Main.ui | 697 ++++++++++++++++++++++++---------------------- test/winmain.py | 2 +- 3 files changed, 368 insertions(+), 335 deletions(-) diff --git a/src/nodes/Node.py b/src/nodes/Node.py index 71a7b4a..e20330b 100644 --- a/src/nodes/Node.py +++ b/src/nodes/Node.py @@ -28,7 +28,9 @@ class Node: pass def __call__(self, *args, **kwargs): - logging.basicConfig(level=self.level) + FORMAT = '[%(asctime)s] p%(process)s {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s' + FORMAT = '"%(pathname)s:%(lineno)d" %(levelname)s - %(message)s' + logging.basicConfig(level=self.level, format=FORMAT) self.context = zmq.Context() if self.enable_init: self.c = BusClient(*([KillMsg] + self.topics), poller=True) diff --git a/src/ui/Main.ui b/src/ui/Main.ui index 1be1c30..30d6c28 100644 --- a/src/ui/Main.ui +++ b/src/ui/Main.ui @@ -14,185 +14,170 @@ MainWindow - - - - - - - Qt::Orientation::Horizontal - - - - - - - - - - false - - - Playback - - - - - - - SeqName - - - - - - - Frame ID - - - - - - - false - - - false - + + + + + - - Unset - - - - - - - - + - Min: + DeviceConfig - - - 0 - - - - - - - Current: - - - - - - - 0 - - - - - - - Max: - - - - - - - 0 + + + false + + + Empty + + + + + + false + + + Disconnect + + + + + + + Connect + + + + + + + <html><head/><body><p style="line-height:0.3" align="center">Beam</p><p align="center">Status</p></body></html> + + + Qt::AlignmentFlag::AlignCenter + + + + + + + Disconnected + + + Qt::AlignmentFlag::AlignCenter + + + + + + + + 15 + + + + background-color: pink; + + + Device Offline + + + Qt::AlignmentFlag::AlignCenter + + + + + + + Disabled + + + Qt::AlignmentFlag::AlignCenter + + + + + + + <html><head/><body><p style="line-height:0.3" align="center">Connection</p><p align="center">Status</p></body></html> + + + Qt::AlignmentFlag::AlignCenter + + + - - + + - - - false + + + + 15 + + + + 0,0,0,0,0,0 + + + Qt::AlignmentFlag::AlignCenter + + + + + + + + 15 + + + + 0,0,0,0,0,0 + + + Qt::AlignmentFlag::AlignCenter - + - RecordName + Position - - - - false - + + - Record + Force - - - - - - Record Frames: - - - - - - - 0 - - - - - - - Record Size: - - - - - - - 0 - - - - - - - Max SeqId: - - - - - - - 0 - - - - - - - - - false + + + + + 15 + + + + background-color: pink; - Live + Robot Offline + + + Qt::AlignmentFlag::AlignCenter @@ -352,8 +337,12 @@ - - + + + + t_end + + @@ -362,26 +351,42 @@ - - - - TextLabel - - - - - - - 1 - - - 1500 - + + Qt::Orientation::Horizontal + + + + Qt::Orientation::Horizontal + + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + + + @@ -398,51 +403,17 @@ - - - - Qt::Orientation::Horizontal - - - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - - - - t_end + + + + 1 - - - - - - Qt::Orientation::Horizontal + + 1500 - - - - - - - - - - Qt::Orientation::Horizontal @@ -455,107 +426,118 @@ + + + + Qt::Orientation::Horizontal + + + + + + + TextLabel + + + - - - - - - - - DeviceConfig - - - - - - - false - - - - Empty - - - - - + + + + + + Qt::Orientation::Horizontal + + - - + + + + + false - Disconnect + Playback - - + + - Connect + SeqName - - + + - <html><head/><body><p style="line-height:0.3" align="center">Beam</p><p align="center">Status</p></body></html> - - - Qt::AlignmentFlag::AlignCenter + Frame ID - - - - Disconnected + + + + false - - Qt::AlignmentFlag::AlignCenter + + false + + + Unset + + - - - - - 15 - - - - background-color: pink; - - - Device Offline - - - Qt::AlignmentFlag::AlignCenter - - - - - - - Disabled - - - Qt::AlignmentFlag::AlignCenter - - - - - - - <html><head/><body><p style="line-height:0.3" align="center">Connection</p><p align="center">Status</p></body></html> - - - Qt::AlignmentFlag::AlignCenter - - + + + + + + Min: + + + + + + + 0 + + + + + + + Current: + + + + + + + 0 + + + + + + + Max: + + + + + + + 0 + + + + @@ -591,72 +573,121 @@ - - + + - - - - 15 - - - - 0,0,0,0,0,0 - - - Qt::AlignmentFlag::AlignCenter - - - - - - - - 15 - - - - 0,0,0,0,0,0 - - - Qt::AlignmentFlag::AlignCenter + + + false - + - Position + RecordName - - + + + + false + - Force + Record - - - - - 15 - - - - background-color: pink; + + + + + + Record Frames: + + + + + + + 0 + + + + + + + Record Size: + + + + + + + 0 + + + + + + + Max SeqId: + + + + + + + 0 + + + + + + + + + false - Robot Offline - - - Qt::AlignmentFlag::AlignCenter + Live + + + + + + BSCAN + + + + + + + FOCUS + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + diff --git a/test/winmain.py b/test/winmain.py index 5737094..1077859 100644 --- a/test/winmain.py +++ b/test/winmain.py @@ -26,7 +26,7 @@ def main(): pps = [] ps = [ Broker(), - # WebRTC(), + WebRTC(), MainUI(level=logging.DEBUG), Device(level=logging.DEBUG), ImageCV(),