Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter

robowaiter/proto/ui.qrc

@@ -0,0 +1,5 @@
+<RCC>
+  <qresource lang="图标" prefix="icon">
+    <file>C:/Users/Liang Zhen/Downloads/国防科技大学视觉识别系统--LOGO/国防科技大学logo.png</file>
+  </qresource>
+</RCC>

robowaiter/scene/scene.py

@@ -1510,17 +1510,17 @@ class Scene:
 
         # 画分隔图
         # plt.subplot(2, 2, 1)
-        plt.figure()
-        plt.imshow(img_segment, cmap="gray" if "depth" in im_segment.name.lower() else None)
-        plt.axis("off")
+        # plt.figure()
+        # plt.imshow(img_segment, cmap="gray" if "depth" in im_segment.name.lower() else None)
+        # plt.axis("off")
         # plt.title("相机分割")
         self.send_img("img_label_seg")
 
         # 画目标检测图
         # plt.subplot(2, 2, 2)
-        plt.figure()
-        plt.imshow(img_obj, cmap="gray" if "depth" in im_depth.name.lower() else None)
-        plt.axis('off')
+        # plt.figure()
+        # plt.imshow(img_obj, cmap="gray" if "depth" in im_depth.name.lower() else None)
+        # plt.axis('off')
         # plt.title("目标检测")
 
         for key, value in object_pixels.items():

robowaiter/scene/ui/pyqt5.py

@@ -101,6 +101,9 @@ class UI(QMainWindow, Ui_MainWindow):
 
         self.setupUi(MainWindow)  # 初始化UI
 
+        MainWindow.setWindowTitle("测试V1.0")
+        # MainWindow.setWindowIcon(QIcon("icons/umbrella.ico"))
+
         # 绑定说话按钮
         self.btn_say.clicked.connect(self.btn_say_on_click)
         self.verticalLayout_2.removeWidget(self.img_view_bt)

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.10
+# Created by: PyQt5 UI code generator 5.15.7
 #
 # 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,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(895, 967)
+        MainWindow.resize(895, 980)
         MainWindow.setAutoFillBackground(False)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -96,6 +96,12 @@ class Ui_MainWindow(object):
         self.label_5.setObjectName("label_5")
         self.verticalLayout_2.addWidget(self.label_5)
         self.img_view_bt = QtWidgets.QGraphicsView(self.centralwidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.img_view_bt.sizePolicy().hasHeightForWidth())
+        self.img_view_bt.setSizePolicy(sizePolicy)
+        self.img_view_bt.setMinimumSize(QtCore.QSize(0, 240))
         self.img_view_bt.setObjectName("img_view_bt")
         self.verticalLayout_2.addWidget(self.img_view_bt)
         self.gridLayout_3.addLayout(self.verticalLayout_2, 1, 0, 1, 1)
@@ -293,7 +299,7 @@ class Ui_MainWindow(object):
         font.setFamily("黑体")
         font.setPointSize(14)
         self.cb_task.setFont(font)
-        self.cb_task.setEditable(True)
+        self.cb_task.setEditable(False)
         self.cb_task.setCurrentText("")
         self.cb_task.setInsertPolicy(QtWidgets.QComboBox.InsertAtBottom)
         self.cb_task.setObjectName("cb_task")
@@ -310,7 +316,7 @@ class Ui_MainWindow(object):
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
-        MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
+        MainWindow.setWindowTitle(_translate("MainWindow", "RoboWatier"))
         self.label_10.setText(_translate("MainWindow", "顾客列表："))
         self.label_11.setText(_translate("MainWindow", "顾客历史对话："))
         __sortingEnabled = self.list_customer.isSortingEnabled()

robowaiter/scene/ui/window.ui

@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>895</width>
-    <height>967</height>
+    <height>980</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>RoboWatier</string>
   </property>
   <property name="autoFillBackground">
    <bool>false</bool>
@@ -147,7 +147,20 @@
          </widget>
         </item>
         <item>
-         <widget class="QGraphicsView" name="img_view_bt"/>
+         <widget class="QGraphicsView" name="img_view_bt">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>240</height>
+           </size>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>