diff --git a/CU/Feeding.py b/CU/Feeding.py
index e6945a5..9cea534 100644
--- a/CU/Feeding.py
+++ b/CU/Feeding.py
@@ -14,13 +14,14 @@ from Util.util_log import log
class FeedStatus(IntEnum):
FNone = 0
FStart = 1
- FSafeP = 2
- FPhoto = 3
- FTake = 4
- FSafeF = 5
- FFeedP = 6
- FBroken = 7
- FFinished = 8
+ FCheck = 2
+ FSafeP = 3
+ FPhoto = 4
+ FTake = 5
+ FSafeF = 6
+ FFeedP = 7
+ FBroken = 8
+ FFinished = 9
class FeedLine:
def __init__(self,name,safe_position:Real_Position,photo_position:Real_Position,mid_position:Real_Position,broken_position:Real_Position,feed_position:Real_Position):
@@ -76,16 +77,24 @@ class Feeding():
self.feedStatus = FeedStatus.FNone
elif self.feedConfig.num == 0:
self.feedStatus = FeedStatus.FNone
-
- if self.feedStatus==FeedStatus.FNone or self.pause:
+ if self.feedStatus == FeedStatus.FNone or self.pause:
return
- elif self.feedStatus==FeedStatus.FStart:
- log.log_message(logging.INFO,Constant.str_feed_start)
- if self.feedConfig.num != 0:
- self.feedStatus = FeedStatus.FSafeP
- self.sendTargPosition(self.feedConfig.feedLine.safe_position)
- # print(request_command)
+ elif self.feedStatus == FeedStatus.FStart:
+ log.log_message(logging.INFO, Constant.str_feed_start)
+ self.feedStatus = FeedStatus.FCheck
pass
+ elif self.feedStatus == FeedStatus.FCheck:
+ log.log_message(logging.INFO, Constant.str_feed_check)
+ # 1, 检查是否是三列
+ # 2, 检查是否有人
+ if self.safe_check_columns() and self.safe_check_person():
+ pass
+ else:
+ if self.feedConfig.num != 0:
+ self.feedStatus = FeedStatus.FSafeP
+ self.sendTargPosition(self.feedConfig.feedLine.safe_position)
+
+
elif self.feedStatus==FeedStatus.FSafeP:
log.log_message(logging.INFO,Constant.str_feed_safe)
if self.feedConfig.feedLine.safe_position.compare(real_position):
@@ -187,3 +196,11 @@ class Feeding():
self.robotClient.add_sendQuene(request_command)
pass
+ def safe_check_columns(self):
+ return True
+ pass
+
+ def safe_check_person(self):
+ return True
+ pass
+
diff --git a/Constant.py b/Constant.py
index 2b96e33..050b02b 100644
--- a/Constant.py
+++ b/Constant.py
@@ -13,6 +13,7 @@ log_file_path = './log/log.log'
feed_sign_path = './Image/wait.png'
str_feed_start = '投料开始'
+str_feed_check = '检测是否安全投料'
str_feed_photo = '移动到拍照位置'
str_feed_take = '移动到抓料位置'
str_feed_pause = '投料暂停'
diff --git a/Seting.ini b/Seting.ini
index 91f91bc..b6df0a2 100644
--- a/Seting.ini
+++ b/Seting.ini
@@ -18,10 +18,13 @@ j6_min=-150
j6_max=+150
photo_x1 = 0
photo_y1 = 0
+photo_z1 = 0
photo_x2 = 0
photo_y2 = 0
+photo_z2 = 0
photo_x3 = 0
photo_y3 = 0
+photo_z3 = 0
LineCount=2
diff --git a/app.py b/app.py
index 6f9e3f9..d503cb5 100644
--- a/app.py
+++ b/app.py
@@ -136,6 +136,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.pushButton_stopFeed.clicked.connect(self.send_stopFeed_button_click)
self.pushButton_pauseFeed.clicked.connect(self.send_pauseFeed_button_click)
+ self.pushButton_get_p1.clicked.connect(self.get_p1_button_click)
+ self.pushButton_get_p2.clicked.connect(self.get_p2_button_click)
+ self.pushButton_get_p3.clicked.connect(self.get_p3_button_click)
+ self.pushButton_set_p1.clicked.connect(self.set_p1_button_click)
+ self.pushButton_set_p2.clicked.connect(self.set_p2_button_click)
+ self.pushButton_set_p3.clicked.connect(self.set_p3_button_click)
+
self.pushButton_clearAlarm.clicked.connect(self.send_clear_alarm_command)
self.pushButton_reset.clicked.connect(self.send_reset_button_click)
self.pushButton_speed.setText(str(Constant.speed))
@@ -177,11 +184,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
ip = self.configReader.get('Robot_Feed', 'IPAddress')
port = int(self.configReader.get('Robot_Feed', 'Port'))
photo_locs = [(int(self.configReader.get('Robot_Feed', 'photo_x1')),
- int(self.configReader.get('Robot_Feed', 'photo_y1'))),
+ int(self.configReader.get('Robot_Feed', 'photo_y1')), int(self.configReader.get('Robot_Feed', 'photo_z1'))),
(int(self.configReader.get('Robot_Feed', 'photo_x2')),
- int(self.configReader.get('Robot_Feed', 'photo_y2'))),
+ int(self.configReader.get('Robot_Feed', 'photo_y2')), int(self.configReader.get('Robot_Feed', 'photo_z2'))),
(int(self.configReader.get('Robot_Feed', 'photo_x3')),
- int(self.configReader.get('Robot_Feed', 'photo_y3')))
+ int(self.configReader.get('Robot_Feed', 'photo_y3')),int(self.configReader.get('Robot_Feed', 'photo_z3')))
]
self.robotClient = RobotClient(ip, port, photo_locs,self.command_position_quene, self.status_address)
@@ -483,6 +490,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.stackedWidget_feed.setCurrentIndex(index)
if index == 0:
self.updateUI_Select_Line()
+ if index == 1:
+ self.updateUI_Photo_Set()
def on_button_click(self):
self.button.setText("Clicked!")
@@ -922,6 +931,87 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.feeding.pause = False
self.send_pause_command(False)
+ ### 设置界面
+ def get_p1_button_click(self):
+ realPosition = self.robotClient.status_model.getRealPosition()
+ self.lineEdit_x1.setText(realPosition.X)
+ self.lineEdit_y1.setText(realPosition.Y)
+ self.lineEdit_z1.setText(realPosition.Z)
+
+ def get_p2_button_click(self):
+ realPosition = self.robotClient.status_model.getRealPosition()
+ self.lineEdit_x2.setText(realPosition.X)
+ self.lineEdit_y2.setText(realPosition.Y)
+ self.lineEdit_z2.setText(realPosition.Z)
+
+ def get_p3_button_click(self):
+ realPosition = self.robotClient.status_model.getRealPosition()
+ self.lineEdit_x3.setText(realPosition.X)
+ self.lineEdit_y3.setText(realPosition.Y)
+ self.lineEdit_z3.setText(realPosition.Z)
+
+ def set_p1_button_click(self):
+ try:
+ x1 = float(self.lineEdit_x1.text())
+ y1 = float(self.lineEdit_y1.text())
+ z1 = float(self.lineEdit_z1.text())
+ self.robotClient.photo_locs[0] = (x1, y1, z1)
+ self.configReader.read(Constant.set_ini)
+ self.configReader.set('Robot_Feed', 'photo_x1', str(x1))
+ self.configReader.set('Robot_Feed', 'photo_y1', str(y1))
+ self.configReader.set('Robot_Feed', 'photo_z1', str(z1))
+ log.log_message(logging.INFO, f'设置拍照点1:{x1},{y1},{z1}')
+ except:
+ self.show_infomessage_box("设置拍照点1失败")
+
+ def set_p2_button_click(self):
+ try:
+ x2 = float(self.lineEdit_x2.text())
+ y2 = float(self.lineEdit_y2.text())
+ z2 = float(self.lineEdit_z2.text())
+ self.robotClient.photo_locs[1] = (x2, y2, z2)
+ self.configReader.read(Constant.set_ini)
+ self.configReader.set('Robot_Feed', 'photo_x2', str(x2))
+ self.configReader.set('Robot_Feed', 'photo_y2', str(y2))
+ self.configReader.set('Robot_Feed', 'photo_z2', str(z2))
+ log.log_message(logging.INFO, f'设置拍照点2:{x2},{y2},{z2}')
+ except:
+ self.show_infomessage_box("设置拍照点2失败")
+
+
+ def set_p3_button_click(self):
+ try:
+ x3 = float(self.lineEdit_x3.text())
+ y3 = float(self.lineEdit_y3.text())
+ z3 = float(self.lineEdit_z3.text())
+ self.robotClient.photo_locs[2] = (x3, y3, z3)
+ self.configReader.read(Constant.set_ini)
+ self.configReader.set('Robot_Feed', 'photo_x3', str(x3))
+ self.configReader.set('Robot_Feed', 'photo_y3', str(y3))
+ self.configReader.set('Robot_Feed', 'photo_z3', str(z3))
+ log.log_message(logging.INFO, f'设置拍照点3:{x3},{y3},{z3}')
+ except:
+ self.show_infomessage_box("设置拍照点3失败")
+
+
+ def updateUI_Photo_Set(self):
+ self.lineEdit_x1.setText(str(self.robotClient.photo_locs[0][0]))
+ self.lineEdit_y1.setText(str(self.robotClient.photo_locs[0][1]))
+ self.lineEdit_z1.setText(str(self.robotClient.photo_locs[0][2]))
+ self.lineEdit_x2.setText(str(self.robotClient.photo_locs[1][0]))
+ self.lineEdit_y2.setText(str(self.robotClient.photo_locs[1][1]))
+ self.lineEdit_z2.setText(str(self.robotClient.photo_locs[1][2]))
+ self.lineEdit_x3.setText(str(self.robotClient.photo_locs[2][0]))
+ self.lineEdit_y3.setText(str(self.robotClient.photo_locs[2][1]))
+ self.lineEdit_z3.setText(str(self.robotClient.photo_locs[2][2]))
+ pass
+
+ def show_infomessage_box(self,message):
+ msg_box = QMessageBox(self)
+ msg_box.setWindowTitle("提示")
+ msg_box.setText(message)
+ msg_box.setIcon(QMessageBox.Information)
+ msg_box.setStandardButtons(QMessageBox.OK)
if __name__ == "__main__":
diff --git a/ui_untitled.py b/ui_untitled.py
index af156c2..8a479d7 100644
--- a/ui_untitled.py
+++ b/ui_untitled.py
@@ -422,7 +422,7 @@ class Ui_MainWindow(object):
self.label_move_sign.setObjectName(u"label_move_sign")
self.label_move_sign.setGeometry(QRect(390, 230, 91, 21))
self.label_move_sign.setStyleSheet(u"background-color: rgba(255, 255, 255, 0);\n"
-"color: black;")
+"color: red;")
self.label_move_sign.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
self.tabWidget_control = QTabWidget(self.frame_6)
self.tabWidget_control.setObjectName(u"tabWidget_control")
@@ -903,7 +903,7 @@ class Ui_MainWindow(object):
self.label_sign_photo.setGeometry(QRect(30, 39, 61, 20))
self.label_sign_photo.setStyleSheet(u"background-color: rgba(255, 255, 255, 0);\n"
"font: 700 12pt \"Microsoft YaHei UI\";\n"
-"color: black;")
+"color: red;")
self.label_sign_photo.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
self.pushButton_sign_photo = QPushButton(self.frame_sign)
self.pushButton_sign_photo.setObjectName(u"pushButton_sign_photo")
@@ -998,7 +998,7 @@ class Ui_MainWindow(object):
self.page_7.setObjectName(u"page_7")
self.tableWidget_feedSeting = QTableWidget(self.page_7)
self.tableWidget_feedSeting.setObjectName(u"tableWidget_feedSeting")
- self.tableWidget_feedSeting.setGeometry(QRect(10, 50, 871, 461))
+ self.tableWidget_feedSeting.setGeometry(QRect(10, 50, 871, 191))
self.pushButton_tableFeedSet_addRow = QPushButton(self.page_7)
self.pushButton_tableFeedSet_addRow.setObjectName(u"pushButton_tableFeedSet_addRow")
self.pushButton_tableFeedSet_addRow.setGeometry(QRect(710, 10, 75, 31))
@@ -1045,6 +1045,184 @@ class Ui_MainWindow(object):
"{\n"
"background-color: #197971;\n"
"}\n"
+"")
+ self.frame_4 = QFrame(self.page_7)
+ self.frame_4.setObjectName(u"frame_4")
+ self.frame_4.setGeometry(QRect(10, 240, 871, 211))
+ self.frame_4.setFrameShape(QFrame.Shape.StyledPanel)
+ self.frame_4.setFrameShadow(QFrame.Shadow.Raised)
+ self.frame_5 = QFrame(self.frame_4)
+ self.frame_5.setObjectName(u"frame_5")
+ self.frame_5.setGeometry(QRect(0, 10, 871, 131))
+ self.frame_5.setFrameShape(QFrame.Shape.StyledPanel)
+ self.frame_5.setFrameShadow(QFrame.Shadow.Raised)
+ self.label_3 = QLabel(self.frame_5)
+ self.label_3.setObjectName(u"label_3")
+ self.label_3.setGeometry(QRect(20, 20, 53, 15))
+ self.label_3.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.lineEdit_x1 = QLineEdit(self.frame_5)
+ self.lineEdit_x1.setObjectName(u"lineEdit_x1")
+ self.lineEdit_x1.setGeometry(QRect(80, 20, 91, 21))
+ self.lineEdit_x1.setReadOnly(True)
+ self.lineEdit_y1 = QLineEdit(self.frame_5)
+ self.lineEdit_y1.setObjectName(u"lineEdit_y1")
+ self.lineEdit_y1.setGeometry(QRect(290, 20, 91, 21))
+ self.lineEdit_y1.setReadOnly(True)
+ self.label_7 = QLabel(self.frame_5)
+ self.label_7.setObjectName(u"label_7")
+ self.label_7.setGeometry(QRect(230, 20, 53, 15))
+ self.label_7.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.lineEdit_z1 = QLineEdit(self.frame_5)
+ self.lineEdit_z1.setObjectName(u"lineEdit_z1")
+ self.lineEdit_z1.setGeometry(QRect(480, 20, 91, 21))
+ self.lineEdit_z1.setReadOnly(True)
+ self.label_8 = QLabel(self.frame_5)
+ self.label_8.setObjectName(u"label_8")
+ self.label_8.setGeometry(QRect(420, 20, 53, 15))
+ self.label_8.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.lineEdit_y2 = QLineEdit(self.frame_5)
+ self.lineEdit_y2.setObjectName(u"lineEdit_y2")
+ self.lineEdit_y2.setGeometry(QRect(290, 50, 91, 21))
+ self.lineEdit_y2.setReadOnly(True)
+ self.lineEdit_x2 = QLineEdit(self.frame_5)
+ self.lineEdit_x2.setObjectName(u"lineEdit_x2")
+ self.lineEdit_x2.setGeometry(QRect(80, 50, 91, 21))
+ self.lineEdit_x2.setReadOnly(True)
+ self.label_9 = QLabel(self.frame_5)
+ self.label_9.setObjectName(u"label_9")
+ self.label_9.setGeometry(QRect(230, 50, 53, 15))
+ self.label_9.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.label_10 = QLabel(self.frame_5)
+ self.label_10.setObjectName(u"label_10")
+ self.label_10.setGeometry(QRect(420, 50, 53, 15))
+ self.label_10.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.label_11 = QLabel(self.frame_5)
+ self.label_11.setObjectName(u"label_11")
+ self.label_11.setGeometry(QRect(20, 50, 53, 15))
+ self.label_11.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.lineEdit_z2 = QLineEdit(self.frame_5)
+ self.lineEdit_z2.setObjectName(u"lineEdit_z2")
+ self.lineEdit_z2.setGeometry(QRect(480, 50, 91, 21))
+ self.lineEdit_z2.setReadOnly(True)
+ self.lineEdit_z3 = QLineEdit(self.frame_5)
+ self.lineEdit_z3.setObjectName(u"lineEdit_z3")
+ self.lineEdit_z3.setGeometry(QRect(480, 80, 91, 21))
+ self.lineEdit_z3.setReadOnly(True)
+ self.lineEdit_x3 = QLineEdit(self.frame_5)
+ self.lineEdit_x3.setObjectName(u"lineEdit_x3")
+ self.lineEdit_x3.setGeometry(QRect(80, 80, 91, 21))
+ self.lineEdit_x3.setReadOnly(True)
+ self.label_12 = QLabel(self.frame_5)
+ self.label_12.setObjectName(u"label_12")
+ self.label_12.setGeometry(QRect(420, 80, 53, 15))
+ self.label_12.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.lineEdit_y3 = QLineEdit(self.frame_5)
+ self.lineEdit_y3.setObjectName(u"lineEdit_y3")
+ self.lineEdit_y3.setGeometry(QRect(290, 80, 91, 21))
+ self.lineEdit_y3.setReadOnly(True)
+ self.label_13 = QLabel(self.frame_5)
+ self.label_13.setObjectName(u"label_13")
+ self.label_13.setGeometry(QRect(20, 80, 53, 15))
+ self.label_13.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.label_14 = QLabel(self.frame_5)
+ self.label_14.setObjectName(u"label_14")
+ self.label_14.setGeometry(QRect(230, 80, 53, 15))
+ self.label_14.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+ self.pushButton_get_p1 = QPushButton(self.frame_5)
+ self.pushButton_get_p1.setObjectName(u"pushButton_get_p1")
+ self.pushButton_get_p1.setGeometry(QRect(594, 20, 81, 23))
+ self.pushButton_get_p1.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: rgb(16, 133, 255);\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
+"")
+ self.pushButton_get_p2 = QPushButton(self.frame_5)
+ self.pushButton_get_p2.setObjectName(u"pushButton_get_p2")
+ self.pushButton_get_p2.setGeometry(QRect(594, 50, 81, 23))
+ self.pushButton_get_p2.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: rgb(16, 133, 255);\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
+"")
+ self.pushButton_get_p3 = QPushButton(self.frame_5)
+ self.pushButton_get_p3.setObjectName(u"pushButton_get_p3")
+ self.pushButton_get_p3.setGeometry(QRect(594, 80, 81, 23))
+ self.pushButton_get_p3.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: rgb(16, 133, 255);\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
+"")
+ self.pushButton_set_p3 = QPushButton(self.frame_5)
+ self.pushButton_set_p3.setObjectName(u"pushButton_set_p3")
+ self.pushButton_set_p3.setGeometry(QRect(680, 80, 81, 23))
+ self.pushButton_set_p3.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: #1AA094;\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
+"")
+ self.pushButton_set_p1 = QPushButton(self.frame_5)
+ self.pushButton_set_p1.setObjectName(u"pushButton_set_p1")
+ self.pushButton_set_p1.setGeometry(QRect(680, 20, 81, 23))
+ self.pushButton_set_p1.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: #1AA094;\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
+"")
+ self.pushButton_set_p2 = QPushButton(self.frame_5)
+ self.pushButton_set_p2.setObjectName(u"pushButton_set_p2")
+ self.pushButton_set_p2.setGeometry(QRect(680, 50, 81, 23))
+ self.pushButton_set_p2.setStyleSheet(u"\n"
+"*{\n"
+"color: #ffffff;\n"
+"background-color: #1AA094;\n"
+"font: 12pt \"\u6977\u4f53\";\n"
+"border: 1px solid #dcdfe6;\n"
+"border-radius: 6px;\n"
+"}\n"
+"*:pressed\n"
+"{\n"
+"background-color: #197971;\n"
+"}\n"
"")
self.stackedWidget_feed.addWidget(self.page_7)
self.tabWidget.addTab(self.tab, "")
@@ -1217,6 +1395,21 @@ class Ui_MainWindow(object):
self.pushButton_tableFeedSet_addRow.setText(QCoreApplication.translate("MainWindow", u"\u65b0\u589e\u7ebf", None))
self.pushButton_tableFeedSet_deleRow.setText(QCoreApplication.translate("MainWindow", u"\u5220\u9664\u7ebf", None))
self.pushButton_tableFeedSet_save.setText(QCoreApplication.translate("MainWindow", u"\u4fdd\u5b58", None))
+ self.label_3.setText(QCoreApplication.translate("MainWindow", u"X1:", None))
+ self.label_7.setText(QCoreApplication.translate("MainWindow", u"Y1:", None))
+ self.label_8.setText(QCoreApplication.translate("MainWindow", u"Z1:", None))
+ self.label_9.setText(QCoreApplication.translate("MainWindow", u"Y2:", None))
+ self.label_10.setText(QCoreApplication.translate("MainWindow", u"Z2:", None))
+ self.label_11.setText(QCoreApplication.translate("MainWindow", u"X2:", None))
+ self.label_12.setText(QCoreApplication.translate("MainWindow", u"Z3:", None))
+ self.label_13.setText(QCoreApplication.translate("MainWindow", u"X3:", None))
+ self.label_14.setText(QCoreApplication.translate("MainWindow", u"Y3:", None))
+ self.pushButton_get_p1.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d1", None))
+ self.pushButton_get_p2.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d2", None))
+ self.pushButton_get_p3.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d3", None))
+ self.pushButton_set_p3.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d3", None))
+ self.pushButton_set_p1.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d1", None))
+ self.pushButton_set_p2.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5f55\u70b9\u4f4d2", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QCoreApplication.translate("MainWindow", u"\u6295\u6599", None))
self.pushButton_2.setText(QCoreApplication.translate("MainWindow", u"PushButton", None))
self.pushButton.setText(QCoreApplication.translate("MainWindow", u"PushButton", None))
diff --git a/untitled.ui b/untitled.ui
index f66ca92..84cdc63 100644
--- a/untitled.ui
+++ b/untitled.ui
@@ -127,7 +127,7 @@ border: 1px solid #dcdfe6;
- 1
+ 0
@@ -2308,7 +2308,7 @@ background-color: #197971;
0
10
871
- 61
+ 131
@@ -2317,6 +2317,435 @@ background-color: #197971;
QFrame::Shadow::Raised
+
+
+
+ 20
+ 20
+ 53
+ 15
+
+
+
+ X1:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 80
+ 20
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 290
+ 20
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 230
+ 20
+ 53
+ 15
+
+
+
+ Y1:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 480
+ 20
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 420
+ 20
+ 53
+ 15
+
+
+
+ Z1:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 290
+ 50
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 80
+ 50
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 230
+ 50
+ 53
+ 15
+
+
+
+ Y2:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 420
+ 50
+ 53
+ 15
+
+
+
+ Z2:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 20
+ 50
+ 53
+ 15
+
+
+
+ X2:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 480
+ 50
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 480
+ 80
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 80
+ 80
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 420
+ 80
+ 53
+ 15
+
+
+
+ Z3:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 290
+ 80
+ 91
+ 21
+
+
+
+ true
+
+
+
+
+
+ 20
+ 80
+ 53
+ 15
+
+
+
+ X3:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 230
+ 80
+ 53
+ 15
+
+
+
+ Y3:
+
+
+ Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter
+
+
+
+
+
+ 594
+ 20
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: rgb(16, 133, 255);
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位1
+
+
+
+
+
+ 594
+ 50
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: rgb(16, 133, 255);
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位2
+
+
+
+
+
+ 594
+ 80
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: rgb(16, 133, 255);
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位3
+
+
+
+
+
+ 680
+ 80
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: #1AA094;
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位3
+
+
+
+
+
+ 680
+ 20
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: #1AA094;
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位1
+
+
+
+
+
+ 680
+ 50
+ 81
+ 23
+
+
+
+
+*{
+color: #ffffff;
+background-color: #1AA094;
+font: 12pt "楷体";
+border: 1px solid #dcdfe6;
+border-radius: 6px;
+}
+*:pressed
+{
+background-color: #197971;
+}
+
+
+
+ 记录点位2
+
+