update 修复原点bug 修改生产回原点速度 修复设置速度bug
Add 新增动态高度设置
This commit is contained in:
FrankCV2048
@ -36,6 +36,7 @@ class RobotClient(TCPClient):
|
||||
self.reset_speed = 10
|
||||
self.max_angle_interval = 0
|
||||
self.smooth = 0
|
||||
self.dynamic_height = 0
|
||||
def add_sendQuene(self,command): #后面 命令分等级，紧急命令直接执行
|
||||
self.command_quene.put(command)
|
||||
log.log_message(logging.INFO, f'{Constant.str_sys_command}{command}')
|
||||
|
||||
@ -297,7 +297,7 @@ class Feeding(QObject):
|
||||
|
||||
elif self.feedStatus == FeedStatus.FStart:
|
||||
self.log_signal.emit(logging.INFO, Constant.str_feed_start)
|
||||
if not self.robotClient.origin_position.compare(real_position) and not self.is_reverse:
|
||||
if not self.robotClient.origin_position.compare(real_position,is_action=True) and not self.is_reverse:
|
||||
# QMessageBox.information(None, "提示", Constant.str_feed_start_error) # Fuck 引起异常
|
||||
self.log_signal.emit(logging.ERROR, Constant.str_feed_start_error)
|
||||
self.need_origin_signal.emit(Constant.str_feed_start_error)
|
||||
@ -537,7 +537,7 @@ class Feeding(QObject):
|
||||
self.pos_near_index = -1
|
||||
self.reversed_positions = []
|
||||
for index, pos_model in enumerate(self.feedConfig.feedLine.feed_positions):
|
||||
if pos_model.get_position().compare(real_position):
|
||||
if pos_model.get_position().compare(real_position,is_action=True):
|
||||
self.pos_index = index
|
||||
break
|
||||
|
||||
@ -553,7 +553,7 @@ class Feeding(QObject):
|
||||
else:
|
||||
return False
|
||||
else:
|
||||
self.reversed_positions = self.feedConfig.feedLine.feed_positions[:self.pos_index]
|
||||
self.reversed_positions = self.feedConfig.feedLine.feed_positions[:self.pos_index+1]
|
||||
self.reversed_positions = list(reversed(self.reversed_positions))
|
||||
self.reverse_index = 0
|
||||
self.send_emergency_sound()
|
||||
@ -728,15 +728,15 @@ class Feeding(QObject):
|
||||
if start_pos.lineType == LineType.CureMid.value:
|
||||
start_pos1 = self.feedConfig.feedLine.get_next_start_position(reverse)
|
||||
self.feedStatus = FeedStatus(start_pos1.status) if self.feedStatus != FeedStatus.FNone else FeedStatus.FNone
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.feed_speed, move_type=MoveType.Cure, real_position1=start_pos1.get_position())
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.reset_speed, move_type=MoveType.Cure, real_position1=start_pos1.get_position())
|
||||
elif start_pos.lineType == LineType.WORLD.value:
|
||||
if self.robotClient.status_model.getAnglePosition().is_error_angel_move(start_pos.get_position(),self.robotClient.max_angle_interval):
|
||||
self.feedStatus = None
|
||||
self.log_signal.emit(logging.ERROR, Constant.str_feed_angle_error)
|
||||
else:
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.feed_speed,move_type=MoveType.AXIS)
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.reset_speed,move_type=MoveType.AXIS)
|
||||
else:
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.feed_speed)
|
||||
self.sendTargPosition(real_position=start_pos.get_position(),speed=self.robotClient.reset_speed)
|
||||
pass
|
||||
|
||||
def next_take(self,reverse=False):
|
||||
|
||||
369
MainWin.ui
369
MainWin.ui
@ -4041,7 +4041,7 @@ background-color: #197971;
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_18" stretch="7">
|
||||
<item>
|
||||
<widget class="QFrame" name="frame_29">
|
||||
<widget class="QFrame" name="lineEdit_setting_height1">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
@ -4054,7 +4054,7 @@ background-color: #197971;
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Shadow::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_6" rowstretch="1,1,1,1,1,1">
|
||||
<layout class="QGridLayout" name="gridLayout_6" rowstretch="1,1,1,1,1,1,1">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
@ -4071,96 +4071,9 @@ background-color: #197971;
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="verticalSpacing">
|
||||
<number>80</number>
|
||||
<number>60</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_28">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>生产速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_speed_run">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_94">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>复位速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_speed_reset">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_86">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抛袋延时：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_put">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0" colspan="4">
|
||||
<item row="6" column="0" colspan="4">
|
||||
<widget class="QPushButton" name="pushButton_saveSeting">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
@ -4202,35 +4115,6 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_29">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>调试速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_take_addr">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QLabel" name="label_51">
|
||||
<property name="sizePolicy">
|
||||
@ -4260,22 +4144,6 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QLabel" name="label_52">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抛袋点位：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QLabel" name="label_54">
|
||||
<property name="sizePolicy">
|
||||
@ -4292,6 +4160,32 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_speed_run">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_speed_reset">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_shake_addr">
|
||||
<property name="sizePolicy">
|
||||
@ -4305,37 +4199,8 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_take">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_87">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抓取延时：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_shake">
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_put">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
@ -4363,6 +4228,151 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_94">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>复位速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_shake">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_28">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>生产速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_setting_smooth">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_timedelay_take">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_setting_height">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_29">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>调试速度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_87">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抓取延时：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_take_addr">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QLabel" name="label_52">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抛袋点位：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QLabel" name="label_89">
|
||||
<property name="sizePolicy">
|
||||
@ -4379,10 +4389,10 @@ background-color: #499c8a;
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLineEdit" name="lineEdit_setting_smooth">
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_86">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
@ -4390,6 +4400,25 @@ background-color: #499c8a;
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>抛袋延时：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label_96">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">color: rgb(255, 255, 255);</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>动态高度：</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
9
main.py
9
main.py
@ -633,7 +633,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
time_delay_put = float(self.configReader.get('Robot_Feed', 'putDelay'))
|
||||
time_delay_shake = float(self.configReader.get('Robot_Feed', 'shakeDelay'))
|
||||
max_angle_interval = float(self.configReader.get('Robot_Feed', 'max_angle_interval'))
|
||||
smooth = float(self.configReader.get('Robot_Feed', 'smooth'))
|
||||
smooth = int(self.configReader.get('Robot_Feed', 'smooth'))
|
||||
dynamic_height = float(self.configReader.get('Robot_Feed', 'dynamic_height'))
|
||||
#TODO
|
||||
#dropDelay_time = int(self.configReader.get('Robot_Feed', 'dropDelay_time'))
|
||||
self.robotClient = RobotClient(ip, port, photo_locs, self.command_position_quene, self.status_address,[io_take_addr, io_zip_addr, io_shake_addr],time_delay_take,time_delay_put,time_delay_shake,origin_position)
|
||||
@ -642,6 +643,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.robotClient.reset_speed = reset_speed
|
||||
self.robotClient.max_angle_interval = max_angle_interval
|
||||
self.robotClient.smooth = smooth
|
||||
self.robotClient.dynamic_height = dynamic_height
|
||||
self.feeding = Feeding(self.robotClient) # 临时
|
||||
self.feeding.need_origin_signal.connect(self.show_infomessage_box)
|
||||
self.feeding.take_no_photo_sigal.connect(self.show_no_photo_message_box)
|
||||
@ -1032,6 +1034,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.robotClient.debug_speed = int(self.lineEdit_speed_debug.text())
|
||||
self.robotClient.reset_speed = int(self.lineEdit_speed_reset.text())
|
||||
self.robotClient.smooth = int(self.lineEdit_setting_smooth.text())
|
||||
self.robotClient.dynamic_height = float(self.lineEdit_setting_height.text())
|
||||
try:
|
||||
take_addr = int(self.lineEdit_take_addr.text())
|
||||
press_addr = int(self.lineEdit_press_addr.text())
|
||||
@ -1057,6 +1060,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.configReader.set('Speed', 'debug_speed', str(self.robotClient.debug_speed))
|
||||
self.configReader.set('Speed', 'reset_speed', str(self.robotClient.reset_speed))
|
||||
self.configReader.set('Robot_Feed', 'smooth', str(self.robotClient.smooth))
|
||||
self.configReader.set('Robot_Feed', 'dynamic_height', str(self.robotClient.dynamic_height))
|
||||
self.configReader.write(open(Constant.set_ini, 'w', encoding='utf-8'))
|
||||
except Exception as e:
|
||||
log.log_message(logging.ERROR, Constant.str_sys_set_error+e)
|
||||
@ -1158,6 +1162,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
def send_stopFeed_button_click(self):
|
||||
# 清空状态
|
||||
self.feeding.feedStatus = FeedStatus.FNone
|
||||
self.feeding.reset_status = ResetStatus.RNone
|
||||
# 清空运行命令
|
||||
self.send_clear_auto_command()
|
||||
self.feeding.feedConfig.num = 0
|
||||
@ -1208,6 +1213,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
return_positions = self.feedLine_dict[line_head].positions
|
||||
position_origin = PositionModel()
|
||||
position_origin.init_position(self.robotClient.origin_position)
|
||||
position_origin.status = 1
|
||||
return_positions.insert(0,position_origin)
|
||||
if self.feedLine_dict.keys().__contains__(line_head):
|
||||
self.feeding.feedConfig= FeedingConfig(0, FeedLine(self.feedLine_dict[line_head].id, self.feedLine_dict[line_head].name,
|
||||
@ -1906,6 +1912,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.lineEdit_timedelay_take.setText(str(self.robotClient.time_delay_take))
|
||||
self.lineEdit_timedelay_put.setText(str(self.robotClient.time_delay_put))
|
||||
self.lineEdit_timedelay_shake.setText(str(self.robotClient.time_delay_shake))
|
||||
self.lineEdit_setting_height.setText(str(self.robotClient.dynamic_height))
|
||||
|
||||
def show_infomessage_box(self,message):
|
||||
print('显示弹窗')
|
||||
|
||||
266
ui_MainWin.py
266
ui_MainWin.py
@ -2457,69 +2457,21 @@ class Ui_MainWindow(object):
|
||||
self.frame_8.setFrameShadow(QFrame.Shadow.Raised)
|
||||
self.verticalLayout_18 = QVBoxLayout(self.frame_8)
|
||||
self.verticalLayout_18.setObjectName(u"verticalLayout_18")
|
||||
self.frame_29 = QFrame(self.frame_8)
|
||||
self.frame_29.setObjectName(u"frame_29")
|
||||
self.lineEdit_setting_height1 = QFrame(self.frame_8)
|
||||
self.lineEdit_setting_height1.setObjectName(u"lineEdit_setting_height1")
|
||||
sizePolicy8 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Minimum)
|
||||
sizePolicy8.setHorizontalStretch(0)
|
||||
sizePolicy8.setVerticalStretch(0)
|
||||
sizePolicy8.setHeightForWidth(self.frame_29.sizePolicy().hasHeightForWidth())
|
||||
self.frame_29.setSizePolicy(sizePolicy8)
|
||||
self.frame_29.setFrameShape(QFrame.Shape.StyledPanel)
|
||||
self.frame_29.setFrameShadow(QFrame.Shadow.Raised)
|
||||
self.gridLayout_6 = QGridLayout(self.frame_29)
|
||||
sizePolicy8.setHeightForWidth(self.lineEdit_setting_height1.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_setting_height1.setSizePolicy(sizePolicy8)
|
||||
self.lineEdit_setting_height1.setFrameShape(QFrame.Shape.StyledPanel)
|
||||
self.lineEdit_setting_height1.setFrameShadow(QFrame.Shadow.Raised)
|
||||
self.gridLayout_6 = QGridLayout(self.lineEdit_setting_height1)
|
||||
self.gridLayout_6.setObjectName(u"gridLayout_6")
|
||||
self.gridLayout_6.setHorizontalSpacing(0)
|
||||
self.gridLayout_6.setVerticalSpacing(80)
|
||||
self.gridLayout_6.setVerticalSpacing(60)
|
||||
self.gridLayout_6.setContentsMargins(0, 0, 0, 60)
|
||||
self.label_28 = QLabel(self.frame_29)
|
||||
self.label_28.setObjectName(u"label_28")
|
||||
sizePolicy4.setHeightForWidth(self.label_28.sizePolicy().hasHeightForWidth())
|
||||
self.label_28.setSizePolicy(sizePolicy4)
|
||||
self.label_28.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_28, 0, 0, 1, 1)
|
||||
|
||||
self.lineEdit_speed_run = QLineEdit(self.frame_29)
|
||||
self.lineEdit_speed_run.setObjectName(u"lineEdit_speed_run")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_speed_run.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_speed_run.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_speed_run.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_speed_run, 0, 1, 1, 1)
|
||||
|
||||
self.label_94 = QLabel(self.frame_29)
|
||||
self.label_94.setObjectName(u"label_94")
|
||||
sizePolicy4.setHeightForWidth(self.label_94.sizePolicy().hasHeightForWidth())
|
||||
self.label_94.setSizePolicy(sizePolicy4)
|
||||
self.label_94.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_94, 1, 0, 1, 1)
|
||||
|
||||
self.lineEdit_speed_reset = QLineEdit(self.frame_29)
|
||||
self.lineEdit_speed_reset.setObjectName(u"lineEdit_speed_reset")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_speed_reset.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_speed_reset.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_speed_reset.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_speed_reset, 1, 1, 1, 1)
|
||||
|
||||
self.label_86 = QLabel(self.frame_29)
|
||||
self.label_86.setObjectName(u"label_86")
|
||||
sizePolicy4.setHeightForWidth(self.label_86.sizePolicy().hasHeightForWidth())
|
||||
self.label_86.setSizePolicy(sizePolicy4)
|
||||
self.label_86.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_86, 4, 0, 1, 1)
|
||||
|
||||
self.lineEdit_timedelay_put = QLineEdit(self.frame_29)
|
||||
self.lineEdit_timedelay_put.setObjectName(u"lineEdit_timedelay_put")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_put.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_put.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_put.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_put, 4, 1, 1, 1)
|
||||
|
||||
self.pushButton_saveSeting = QPushButton(self.frame_29)
|
||||
self.pushButton_saveSeting = QPushButton(self.lineEdit_setting_height1)
|
||||
self.pushButton_saveSeting.setObjectName(u"pushButton_saveSeting")
|
||||
sizePolicy1.setHeightForWidth(self.pushButton_saveSeting.sizePolicy().hasHeightForWidth())
|
||||
self.pushButton_saveSeting.setSizePolicy(sizePolicy1)
|
||||
@ -2536,9 +2488,9 @@ class Ui_MainWindow(object):
|
||||
"")
|
||||
self.pushButton_saveSeting.setFlat(False)
|
||||
|
||||
self.gridLayout_6.addWidget(self.pushButton_saveSeting, 5, 0, 1, 4)
|
||||
self.gridLayout_6.addWidget(self.pushButton_saveSeting, 6, 0, 1, 4)
|
||||
|
||||
self.lineEdit_speed_debug = QLineEdit(self.frame_29)
|
||||
self.lineEdit_speed_debug = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_speed_debug.setObjectName(u"lineEdit_speed_debug")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_speed_debug.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_speed_debug.setSizePolicy(sizePolicy1)
|
||||
@ -2546,23 +2498,7 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_speed_debug, 2, 1, 1, 1)
|
||||
|
||||
self.label_29 = QLabel(self.frame_29)
|
||||
self.label_29.setObjectName(u"label_29")
|
||||
sizePolicy4.setHeightForWidth(self.label_29.sizePolicy().hasHeightForWidth())
|
||||
self.label_29.setSizePolicy(sizePolicy4)
|
||||
self.label_29.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_29, 2, 0, 1, 1)
|
||||
|
||||
self.lineEdit_take_addr = QLineEdit(self.frame_29)
|
||||
self.lineEdit_take_addr.setObjectName(u"lineEdit_take_addr")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_take_addr.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_take_addr.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_take_addr.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_take_addr, 0, 3, 1, 1)
|
||||
|
||||
self.label_51 = QLabel(self.frame_29)
|
||||
self.label_51 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_51.setObjectName(u"label_51")
|
||||
sizePolicy4.setHeightForWidth(self.label_51.sizePolicy().hasHeightForWidth())
|
||||
self.label_51.setSizePolicy(sizePolicy4)
|
||||
@ -2570,7 +2506,7 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_51, 0, 2, 1, 1)
|
||||
|
||||
self.lineEdit_press_addr = QLineEdit(self.frame_29)
|
||||
self.lineEdit_press_addr = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_press_addr.setObjectName(u"lineEdit_press_addr")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_press_addr.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_press_addr.setSizePolicy(sizePolicy1)
|
||||
@ -2578,15 +2514,7 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_press_addr, 1, 3, 1, 1)
|
||||
|
||||
self.label_52 = QLabel(self.frame_29)
|
||||
self.label_52.setObjectName(u"label_52")
|
||||
sizePolicy4.setHeightForWidth(self.label_52.sizePolicy().hasHeightForWidth())
|
||||
self.label_52.setSizePolicy(sizePolicy4)
|
||||
self.label_52.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_52, 1, 2, 1, 1)
|
||||
|
||||
self.label_54 = QLabel(self.frame_29)
|
||||
self.label_54 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_54.setObjectName(u"label_54")
|
||||
sizePolicy4.setHeightForWidth(self.label_54.sizePolicy().hasHeightForWidth())
|
||||
self.label_54.setSizePolicy(sizePolicy4)
|
||||
@ -2594,7 +2522,23 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_54, 2, 2, 1, 1)
|
||||
|
||||
self.lineEdit_shake_addr = QLineEdit(self.frame_29)
|
||||
self.lineEdit_speed_run = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_speed_run.setObjectName(u"lineEdit_speed_run")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_speed_run.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_speed_run.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_speed_run.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_speed_run, 0, 1, 1, 1)
|
||||
|
||||
self.lineEdit_speed_reset = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_speed_reset.setObjectName(u"lineEdit_speed_reset")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_speed_reset.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_speed_reset.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_speed_reset.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_speed_reset, 1, 1, 1, 1)
|
||||
|
||||
self.lineEdit_shake_addr = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_shake_addr.setObjectName(u"lineEdit_shake_addr")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_shake_addr.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_shake_addr.setSizePolicy(sizePolicy1)
|
||||
@ -2602,31 +2546,15 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_shake_addr, 2, 3, 1, 1)
|
||||
|
||||
self.lineEdit_timedelay_take = QLineEdit(self.frame_29)
|
||||
self.lineEdit_timedelay_take.setObjectName(u"lineEdit_timedelay_take")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_take.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_take.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_take.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
self.lineEdit_timedelay_put = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_timedelay_put.setObjectName(u"lineEdit_timedelay_put")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_put.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_put.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_put.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_take, 3, 1, 1, 1)
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_put, 4, 1, 1, 1)
|
||||
|
||||
self.label_87 = QLabel(self.frame_29)
|
||||
self.label_87.setObjectName(u"label_87")
|
||||
sizePolicy4.setHeightForWidth(self.label_87.sizePolicy().hasHeightForWidth())
|
||||
self.label_87.setSizePolicy(sizePolicy4)
|
||||
self.label_87.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_87, 3, 0, 1, 1)
|
||||
|
||||
self.lineEdit_timedelay_shake = QLineEdit(self.frame_29)
|
||||
self.lineEdit_timedelay_shake.setObjectName(u"lineEdit_timedelay_shake")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_shake.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_shake.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_shake.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_shake, 3, 3, 1, 1)
|
||||
|
||||
self.label_85 = QLabel(self.frame_29)
|
||||
self.label_85 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_85.setObjectName(u"label_85")
|
||||
sizePolicy4.setHeightForWidth(self.label_85.sizePolicy().hasHeightForWidth())
|
||||
self.label_85.setSizePolicy(sizePolicy4)
|
||||
@ -2634,15 +2562,31 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_85, 3, 2, 1, 1)
|
||||
|
||||
self.label_89 = QLabel(self.frame_29)
|
||||
self.label_89.setObjectName(u"label_89")
|
||||
sizePolicy4.setHeightForWidth(self.label_89.sizePolicy().hasHeightForWidth())
|
||||
self.label_89.setSizePolicy(sizePolicy4)
|
||||
self.label_89.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
self.label_94 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_94.setObjectName(u"label_94")
|
||||
sizePolicy4.setHeightForWidth(self.label_94.sizePolicy().hasHeightForWidth())
|
||||
self.label_94.setSizePolicy(sizePolicy4)
|
||||
self.label_94.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_89, 4, 2, 1, 1)
|
||||
self.gridLayout_6.addWidget(self.label_94, 1, 0, 1, 1)
|
||||
|
||||
self.lineEdit_setting_smooth = QLineEdit(self.frame_29)
|
||||
self.lineEdit_timedelay_shake = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_timedelay_shake.setObjectName(u"lineEdit_timedelay_shake")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_shake.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_shake.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_shake.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_shake, 3, 3, 1, 1)
|
||||
|
||||
self.label_28 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_28.setObjectName(u"label_28")
|
||||
sizePolicy4.setHeightForWidth(self.label_28.sizePolicy().hasHeightForWidth())
|
||||
self.label_28.setSizePolicy(sizePolicy4)
|
||||
self.label_28.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_28, 0, 0, 1, 1)
|
||||
|
||||
self.lineEdit_setting_smooth = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_setting_smooth.setObjectName(u"lineEdit_setting_smooth")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_setting_smooth.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_setting_smooth.setSizePolicy(sizePolicy1)
|
||||
@ -2650,14 +2594,87 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_setting_smooth, 4, 3, 1, 1)
|
||||
|
||||
self.lineEdit_timedelay_take = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_timedelay_take.setObjectName(u"lineEdit_timedelay_take")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_timedelay_take.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_timedelay_take.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_timedelay_take.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_timedelay_take, 3, 1, 1, 1)
|
||||
|
||||
self.lineEdit_setting_height = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_setting_height.setObjectName(u"lineEdit_setting_height")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_setting_height.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_setting_height.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_setting_height.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_setting_height, 5, 1, 1, 1)
|
||||
|
||||
self.label_29 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_29.setObjectName(u"label_29")
|
||||
sizePolicy4.setHeightForWidth(self.label_29.sizePolicy().hasHeightForWidth())
|
||||
self.label_29.setSizePolicy(sizePolicy4)
|
||||
self.label_29.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_29, 2, 0, 1, 1)
|
||||
|
||||
self.label_87 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_87.setObjectName(u"label_87")
|
||||
sizePolicy4.setHeightForWidth(self.label_87.sizePolicy().hasHeightForWidth())
|
||||
self.label_87.setSizePolicy(sizePolicy4)
|
||||
self.label_87.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_87, 3, 0, 1, 1)
|
||||
|
||||
self.lineEdit_take_addr = QLineEdit(self.lineEdit_setting_height1)
|
||||
self.lineEdit_take_addr.setObjectName(u"lineEdit_take_addr")
|
||||
sizePolicy1.setHeightForWidth(self.lineEdit_take_addr.sizePolicy().hasHeightForWidth())
|
||||
self.lineEdit_take_addr.setSizePolicy(sizePolicy1)
|
||||
self.lineEdit_take_addr.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.lineEdit_take_addr, 0, 3, 1, 1)
|
||||
|
||||
self.label_52 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_52.setObjectName(u"label_52")
|
||||
sizePolicy4.setHeightForWidth(self.label_52.sizePolicy().hasHeightForWidth())
|
||||
self.label_52.setSizePolicy(sizePolicy4)
|
||||
self.label_52.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_52, 1, 2, 1, 1)
|
||||
|
||||
self.label_89 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_89.setObjectName(u"label_89")
|
||||
sizePolicy4.setHeightForWidth(self.label_89.sizePolicy().hasHeightForWidth())
|
||||
self.label_89.setSizePolicy(sizePolicy4)
|
||||
self.label_89.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_89, 4, 2, 1, 1)
|
||||
|
||||
self.label_86 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_86.setObjectName(u"label_86")
|
||||
sizePolicy4.setHeightForWidth(self.label_86.sizePolicy().hasHeightForWidth())
|
||||
self.label_86.setSizePolicy(sizePolicy4)
|
||||
self.label_86.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_86, 4, 0, 1, 1)
|
||||
|
||||
self.label_96 = QLabel(self.lineEdit_setting_height1)
|
||||
self.label_96.setObjectName(u"label_96")
|
||||
sizePolicy4.setHeightForWidth(self.label_96.sizePolicy().hasHeightForWidth())
|
||||
self.label_96.setSizePolicy(sizePolicy4)
|
||||
self.label_96.setStyleSheet(u"color: rgb(255, 255, 255);")
|
||||
|
||||
self.gridLayout_6.addWidget(self.label_96, 5, 0, 1, 1)
|
||||
|
||||
self.gridLayout_6.setRowStretch(0, 1)
|
||||
self.gridLayout_6.setRowStretch(1, 1)
|
||||
self.gridLayout_6.setRowStretch(2, 1)
|
||||
self.gridLayout_6.setRowStretch(3, 1)
|
||||
self.gridLayout_6.setRowStretch(4, 1)
|
||||
self.gridLayout_6.setRowStretch(5, 1)
|
||||
self.gridLayout_6.setRowStretch(6, 1)
|
||||
|
||||
self.verticalLayout_18.addWidget(self.frame_29)
|
||||
self.verticalLayout_18.addWidget(self.lineEdit_setting_height1)
|
||||
|
||||
self.verticalLayout_18.setStretch(0, 7)
|
||||
|
||||
@ -3962,17 +3979,18 @@ class Ui_MainWindow(object):
|
||||
self.label_24.setText(QCoreApplication.translate("MainWindow", u"Z4:", None))
|
||||
self.label_36.setText(QCoreApplication.translate("MainWindow", u"U1:", None))
|
||||
self.label_17.setText(QCoreApplication.translate("MainWindow", u"Z2:", None))
|
||||
self.label_28.setText(QCoreApplication.translate("MainWindow", u"\u751f\u4ea7\u901f\u5ea6\uff1a", None))
|
||||
self.label_94.setText(QCoreApplication.translate("MainWindow", u"\u590d\u4f4d\u901f\u5ea6\uff1a", None))
|
||||
self.label_86.setText(QCoreApplication.translate("MainWindow", u"\u629b\u888b\u5ef6\u65f6\uff1a", None))
|
||||
self.pushButton_saveSeting.setText(QCoreApplication.translate("MainWindow", u"\u4fdd\u5b58\u8bbe\u7f6e", None))
|
||||
self.label_29.setText(QCoreApplication.translate("MainWindow", u"\u8c03\u8bd5\u901f\u5ea6\uff1a", None))
|
||||
self.label_51.setText(QCoreApplication.translate("MainWindow", u"\u6293\u53d6\u70b9\u4f4d:", None))
|
||||
self.label_52.setText(QCoreApplication.translate("MainWindow", u"\u629b\u888b\u70b9\u4f4d\uff1a", None))
|
||||
self.label_54.setText(QCoreApplication.translate("MainWindow", u"\u6447\u6643\u70b9\u4f4d:", None))
|
||||
self.label_87.setText(QCoreApplication.translate("MainWindow", u"\u6293\u53d6\u5ef6\u65f6\uff1a", None))
|
||||
self.label_85.setText(QCoreApplication.translate("MainWindow", u"\u6447\u6643\u5ef6\u65f6\uff1a", None))
|
||||
self.label_94.setText(QCoreApplication.translate("MainWindow", u"\u590d\u4f4d\u901f\u5ea6\uff1a", None))
|
||||
self.label_28.setText(QCoreApplication.translate("MainWindow", u"\u751f\u4ea7\u901f\u5ea6\uff1a", None))
|
||||
self.label_29.setText(QCoreApplication.translate("MainWindow", u"\u8c03\u8bd5\u901f\u5ea6\uff1a", None))
|
||||
self.label_87.setText(QCoreApplication.translate("MainWindow", u"\u6293\u53d6\u5ef6\u65f6\uff1a", None))
|
||||
self.label_52.setText(QCoreApplication.translate("MainWindow", u"\u629b\u888b\u70b9\u4f4d\uff1a", None))
|
||||
self.label_89.setText(QCoreApplication.translate("MainWindow", u"\u5e73\u6ed1\u7cfb\u6570\uff1a", None))
|
||||
self.label_86.setText(QCoreApplication.translate("MainWindow", u"\u629b\u888b\u5ef6\u65f6\uff1a", None))
|
||||
self.label_96.setText(QCoreApplication.translate("MainWindow", u"\u52a8\u6001\u9ad8\u5ea6\uff1a", None))
|
||||
self.pushButton_j3_add.setText("")
|
||||
self.pushButton_j5_add.setText("")
|
||||
self.pushButton_j6_sub.setText("")
|
||||
|
||||
Reference in New Issue
Block a user