From f397e4db34c94a58d0fd3732851b6e7575c5c24b Mon Sep 17 00:00:00 2001
From: Caiyishuai <39987654+Caiyishuai@users.noreply.github.com>
Date: Thu, 23 Nov 2023 19:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86UI=E7=9A=84=E4=BD=8D?=
=?UTF-8?q?=E7=BD=AE=E5=92=8C=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
robowaiter/scene/ui/window.py | 131 ++++++++++++----
robowaiter/scene/ui/window.ui | 283 ++++++++++++++++++++++++----------
2 files changed, 304 insertions(+), 110 deletions(-)
diff --git a/robowaiter/scene/ui/window.py b/robowaiter/scene/ui/window.py
index 68148e8..c3b3c3a 100644
--- a/robowaiter/scene/ui/window.py
+++ b/robowaiter/scene/ui/window.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'window.ui'
#
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt5 UI code generator 5.15.10
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
@@ -14,99 +14,176 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
- MainWindow.resize(960, 1080)
+ MainWindow.resize(936, 1080)
MainWindow.setAutoFillBackground(False)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.edit_say = QtWidgets.QLineEdit(self.centralwidget)
- self.edit_say.setGeometry(QtCore.QRect(320, 200, 191, 21))
+ self.edit_say.setGeometry(QtCore.QRect(520, 390, 221, 31))
+ font = QtGui.QFont()
+ font.setFamily("Times New Roman")
+ font.setPointSize(14)
+ self.edit_say.setFont(font)
self.edit_say.setObjectName("edit_say")
self.btn_say = QtWidgets.QPushButton(self.centralwidget)
- self.btn_say.setGeometry(QtCore.QRect(530, 200, 75, 23))
+ self.btn_say.setGeometry(QtCore.QRect(760, 390, 81, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_say.setFont(font)
self.btn_say.setObjectName("btn_say")
self.img_label_seg = QtWidgets.QLabel(self.centralwidget)
- self.img_label_seg.setGeometry(QtCore.QRect(0, 280, 311, 241))
+ self.img_label_seg.setGeometry(QtCore.QRect(60, 530, 341, 251))
self.img_label_seg.setStyleSheet("border: 2px solid black;")
self.img_label_seg.setText("")
self.img_label_seg.setObjectName("img_label_seg")
self.img_label_bt = QtWidgets.QLabel(self.centralwidget)
- self.img_label_bt.setGeometry(QtCore.QRect(0, 830, 811, 151))
+ self.img_label_bt.setGeometry(QtCore.QRect(40, 830, 831, 161))
self.img_label_bt.setStyleSheet("border: 2px solid black;")
self.img_label_bt.setText("")
self.img_label_bt.setObjectName("img_label_bt")
self.label_5 = QtWidgets.QLabel(self.centralwidget)
- self.label_5.setGeometry(QtCore.QRect(370, 800, 111, 16))
+ self.label_5.setGeometry(QtCore.QRect(410, 800, 121, 21))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_5.setFont(font)
self.label_5.setObjectName("label_5")
self.img_label_obj = QtWidgets.QLabel(self.centralwidget)
- self.img_label_obj.setGeometry(QtCore.QRect(420, 280, 331, 241))
+ self.img_label_obj.setGeometry(QtCore.QRect(510, 530, 331, 251))
self.img_label_obj.setStyleSheet("border: 2px solid black;")
self.img_label_obj.setText("")
self.img_label_obj.setObjectName("img_label_obj")
self.img_label_map = QtWidgets.QLabel(self.centralwidget)
- self.img_label_map.setGeometry(QtCore.QRect(0, 580, 411, 191))
+ self.img_label_map.setGeometry(QtCore.QRect(60, 320, 331, 161))
self.img_label_map.setStyleSheet("border: 2px solid black;")
self.img_label_map.setText("")
self.img_label_map.setObjectName("img_label_map")
self.label_6 = QtWidgets.QLabel(self.centralwidget)
- self.label_6.setGeometry(QtCore.QRect(150, 540, 111, 16))
+ self.label_6.setGeometry(QtCore.QRect(180, 290, 121, 21))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_6.setFont(font)
self.label_6.setObjectName("label_6")
self.label_7 = QtWidgets.QLabel(self.centralwidget)
- self.label_7.setGeometry(QtCore.QRect(120, 250, 111, 16))
+ self.label_7.setGeometry(QtCore.QRect(180, 490, 111, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_7.setFont(font)
self.label_7.setObjectName("label_7")
self.label_8 = QtWidgets.QLabel(self.centralwidget)
- self.label_8.setGeometry(QtCore.QRect(580, 240, 111, 16))
+ self.label_8.setGeometry(QtCore.QRect(630, 490, 111, 21))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_8.setFont(font)
self.label_8.setObjectName("label_8")
self.btn_AEM = QtWidgets.QPushButton(self.centralwidget)
- self.btn_AEM.setGeometry(QtCore.QRect(30, 30, 121, 21))
+ self.btn_AEM.setGeometry(QtCore.QRect(30, 70, 151, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_AEM.setFont(font)
self.btn_AEM.setObjectName("btn_AEM")
self.label_9 = QtWidgets.QLabel(self.centralwidget)
- self.label_9.setGeometry(QtCore.QRect(20, 10, 331, 16))
+ self.label_9.setGeometry(QtCore.QRect(10, 20, 371, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(10)
+ self.label_9.setFont(font)
self.label_9.setObjectName("label_9")
self.btn_VLN = QtWidgets.QPushButton(self.centralwidget)
- self.btn_VLN.setGeometry(QtCore.QRect(30, 60, 121, 21))
+ self.btn_VLN.setGeometry(QtCore.QRect(30, 120, 151, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_VLN.setFont(font)
self.btn_VLN.setObjectName("btn_VLN")
self.btn_VLM = QtWidgets.QPushButton(self.centralwidget)
- self.btn_VLM.setGeometry(QtCore.QRect(30, 90, 121, 21))
+ self.btn_VLM.setGeometry(QtCore.QRect(30, 170, 151, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_VLM.setFont(font)
self.btn_VLM.setObjectName("btn_VLM")
self.btn_GQA = QtWidgets.QPushButton(self.centralwidget)
- self.btn_GQA.setGeometry(QtCore.QRect(160, 30, 121, 21))
+ self.btn_GQA.setGeometry(QtCore.QRect(200, 70, 141, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_GQA.setFont(font)
self.btn_GQA.setObjectName("btn_GQA")
self.btn_OT = QtWidgets.QPushButton(self.centralwidget)
- self.btn_OT.setGeometry(QtCore.QRect(160, 60, 121, 21))
+ self.btn_OT.setGeometry(QtCore.QRect(200, 120, 141, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_OT.setFont(font)
self.btn_OT.setObjectName("btn_OT")
self.btn_AT = QtWidgets.QPushButton(self.centralwidget)
- self.btn_AT.setGeometry(QtCore.QRect(160, 90, 121, 21))
+ self.btn_AT.setGeometry(QtCore.QRect(200, 170, 141, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_AT.setFont(font)
self.btn_AT.setObjectName("btn_AT")
self.btn_reset = QtWidgets.QPushButton(self.centralwidget)
- self.btn_reset.setGeometry(QtCore.QRect(30, 120, 251, 21))
+ self.btn_reset.setGeometry(QtCore.QRect(30, 220, 311, 31))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.btn_reset.setFont(font)
self.btn_reset.setObjectName("btn_reset")
self.list_customer = QtWidgets.QListWidget(self.centralwidget)
- self.list_customer.setGeometry(QtCore.QRect(320, 30, 151, 161))
+ self.list_customer.setGeometry(QtCore.QRect(380, 50, 151, 161))
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ self.list_customer.setFont(font)
self.list_customer.setObjectName("list_customer")
item = QtWidgets.QListWidgetItem()
self.list_customer.addItem(item)
self.label_10 = QtWidgets.QLabel(self.centralwidget)
- self.label_10.setGeometry(QtCore.QRect(370, 10, 71, 16))
+ self.label_10.setGeometry(QtCore.QRect(390, 20, 121, 16))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_10.setFont(font)
self.label_10.setObjectName("label_10")
self.label_11 = QtWidgets.QLabel(self.centralwidget)
- self.label_11.setGeometry(QtCore.QRect(530, 10, 71, 16))
+ self.label_11.setGeometry(QtCore.QRect(560, 20, 141, 16))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_11.setFont(font)
self.label_11.setObjectName("label_11")
self.label_12 = QtWidgets.QLabel(self.centralwidget)
- self.label_12.setGeometry(QtCore.QRect(700, 10, 71, 16))
+ self.label_12.setGeometry(QtCore.QRect(740, 20, 131, 16))
+ font = QtGui.QFont()
+ font.setFamily("黑体")
+ font.setPointSize(14)
+ self.label_12.setFont(font)
self.label_12.setObjectName("label_12")
self.edit_local_history = QtWidgets.QTextEdit(self.centralwidget)
self.edit_local_history.setEnabled(True)
- self.edit_local_history.setGeometry(QtCore.QRect(490, 30, 161, 161))
+ self.edit_local_history.setGeometry(QtCore.QRect(550, 50, 171, 261))
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ self.edit_local_history.setFont(font)
self.edit_local_history.setReadOnly(True)
self.edit_local_history.setObjectName("edit_local_history")
self.edit_global_history = QtWidgets.QTextEdit(self.centralwidget)
self.edit_global_history.setEnabled(True)
- self.edit_global_history.setGeometry(QtCore.QRect(670, 30, 161, 161))
+ self.edit_global_history.setGeometry(QtCore.QRect(740, 50, 161, 261))
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ self.edit_global_history.setFont(font)
self.edit_global_history.setReadOnly(True)
self.edit_global_history.setObjectName("edit_global_history")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 960, 23))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 936, 23))
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
diff --git a/robowaiter/scene/ui/window.ui b/robowaiter/scene/ui/window.ui
index 816edbd..e60edc4 100644
--- a/robowaiter/scene/ui/window.ui
+++ b/robowaiter/scene/ui/window.ui
@@ -6,7 +6,7 @@
0
0
- 960
+ 936
1080
@@ -20,12 +20,18 @@
- 320
- 200
- 191
- 21
+ 520
+ 390
+ 221
+ 31
+
+
+ Times New Roman
+ 14
+
+
Is(AC,On)
@@ -33,12 +39,18 @@
- 530
- 200
- 75
- 23
+ 760
+ 390
+ 81
+ 31
+
+
+ 黑体
+ 14
+
+
说话
@@ -46,10 +58,10 @@
- 0
- 280
- 311
- 241
+ 60
+ 530
+ 341
+ 251
@@ -62,10 +74,10 @@
- 0
+ 40
830
- 811
- 151
+ 831
+ 161
@@ -78,12 +90,18 @@
- 370
+ 410
800
- 111
- 16
+ 121
+ 21
+
+
+ 黑体
+ 14
+
+
当前行为树
@@ -91,10 +109,10 @@
- 420
- 280
+ 510
+ 530
331
- 241
+ 251
@@ -107,10 +125,10 @@
- 0
- 580
- 411
- 191
+ 60
+ 320
+ 331
+ 161
@@ -123,12 +141,18 @@
- 150
- 540
- 111
- 16
+ 180
+ 290
+ 121
+ 21
+
+
+ 黑体
+ 14
+
+
可达性地图
@@ -136,12 +160,18 @@
- 120
- 250
+ 180
+ 490
111
- 16
+ 31
+
+
+ 黑体
+ 14
+
+
实例分割
@@ -149,12 +179,18 @@
- 580
- 240
+ 630
+ 490
111
- 16
+ 21
+
+
+ 黑体
+ 14
+
+
目标检测
@@ -163,11 +199,17 @@
30
- 30
- 121
- 21
+ 70
+ 151
+ 31
+
+
+ 黑体
+ 14
+
+
环境主动探索
@@ -175,12 +217,18 @@
- 20
- 10
- 331
- 16
+ 10
+ 20
+ 371
+ 31
+
+
+ 黑体
+ 10
+
+
任务演示：（播放动画时需等待动画播放完毕才会重置场景）
@@ -189,11 +237,17 @@
30
- 60
- 121
- 21
+ 120
+ 151
+ 31
+
+
+ 黑体
+ 14
+
+
视觉语言导航
@@ -202,11 +256,17 @@
30
- 90
- 121
- 21
+ 170
+ 151
+ 31
+
+
+ 黑体
+ 14
+
+
视觉语言操作
@@ -214,12 +274,18 @@
- 160
- 30
- 121
- 21
+ 200
+ 70
+ 141
+ 31
+
+
+ 黑体
+ 14
+
+
具身多轮对话
@@ -227,12 +293,18 @@
- 160
- 60
- 121
- 21
+ 200
+ 120
+ 141
+ 31
+
+
+ 黑体
+ 14
+
+
开放具身任务
@@ -240,12 +312,18 @@
- 160
- 90
- 121
- 21
+ 200
+ 170
+ 141
+ 31
+
+
+ 黑体
+ 14
+
+
自主具身任务
@@ -254,11 +332,17 @@
30
- 120
- 251
- 21
+ 220
+ 311
+ 31
+
+
+ 黑体
+ 14
+
+
重置
@@ -266,12 +350,17 @@
- 320
- 30
+ 380
+ 50
151
161
+
+
+ 11
+
+
-
System
@@ -281,12 +370,18 @@
- 370
- 10
- 71
+ 390
+ 20
+ 121
16
+
+
+ 黑体
+ 14
+
+
顾客列表：
@@ -294,12 +389,18 @@
- 530
- 10
- 71
+ 560
+ 20
+ 141
16
+
+
+ 黑体
+ 14
+
+
顾客历史对话：
@@ -307,12 +408,18 @@
- 700
- 10
- 71
+ 740
+ 20
+ 131
16
+
+
+ 黑体
+ 14
+
+
全局历史对话：
@@ -323,12 +430,17 @@
- 490
- 30
- 161
- 161
+ 550
+ 50
+ 171
+ 261
+
+
+ 11
+
+
true
@@ -339,12 +451,17 @@
- 670
- 30
+ 740
+ 50
161
- 161
+ 261
+
+
+ 11
+
+
true
@@ -355,7 +472,7 @@
0
0
- 960
+ 936
23