Further work. Opening robot works
This commit is contained in:
parent
fde26247f3
commit
daebe414e8
@ -93,7 +93,7 @@ class QtWrapper:
|
|||||||
def update_selected_robot_info(self,robot_info):
|
def update_selected_robot_info(self,robot_info):
|
||||||
linear_vel = math.sqrt(robot_info.linear_velocity[0]**2 + robot_info.linear_velocity[1]**2)
|
linear_vel = math.sqrt(robot_info.linear_velocity[0]**2 + robot_info.linear_velocity[1]**2)
|
||||||
|
|
||||||
self.widget.idLabel.setText('PIONIER' + str(robot_id))
|
self.widget.idLabel.setText('PIONIER' + str(robot_info.robot_id))
|
||||||
self.widget.batteryLabel.setText("{:.2f}".format(robot_info.battery_voltage))
|
self.widget.batteryLabel.setText("{:.2f}".format(robot_info.battery_voltage))
|
||||||
self.widget.linearLabel.setText("{:.2f}".format(linear_vel))
|
self.widget.linearLabel.setText("{:.2f}".format(linear_vel))
|
||||||
self.widget.angularLabel.setText("{:.2f}".format(robot_info.angular_velocity[2]))
|
self.widget.angularLabel.setText("{:.2f}".format(robot_info.angular_velocity[2]))
|
||||||
|
@ -155,7 +155,8 @@ class ROSWrapper:
|
|||||||
# Restarting connection timer to avoid raising robot_connection_lost_callback
|
# Restarting connection timer to avoid raising robot_connection_lost_callback
|
||||||
self.restart_connection_timer()
|
self.restart_connection_timer()
|
||||||
|
|
||||||
_robot_info = RobotInfo(0).update_robot_info(msg)
|
_robot_info = RobotInfo(0)
|
||||||
|
_robot_info.update_robot_info(msg)
|
||||||
self.selected_robot_info_update_callback(_robot_info)
|
self.selected_robot_info_update_callback(_robot_info)
|
||||||
|
|
||||||
def handle_master_stop_update(self,msg):
|
def handle_master_stop_update(self,msg):
|
||||||
|
@ -21,7 +21,12 @@ class UserInfo:
|
|||||||
self.robots_id_list = robots_id_list
|
self.robots_id_list = robots_id_list
|
||||||
|
|
||||||
def update_selected_robot_info(self,new_robot_info):
|
def update_selected_robot_info(self,new_robot_info):
|
||||||
raise NotImplementedError
|
self.selected_robot.robot_id = new_robot_info.robot_id
|
||||||
|
self.selected_robot.battery_voltage = new_robot_info.battery_voltage
|
||||||
|
self.selected_robot.linear_velocity = new_robot_info.linear_velocity
|
||||||
|
self.selected_robot.angular_velocity = new_robot_info.angular_velocity
|
||||||
|
self.selected_robot.state = new_robot_info.state
|
||||||
|
self.selected_robot.clutch = new_robot_info.clutch
|
||||||
|
|
||||||
def get_user_stop_state(self):
|
def get_user_stop_state(self):
|
||||||
return self.user_stop_state
|
return self.user_stop_state
|
||||||
|
@ -130,6 +130,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -137,6 +140,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -144,6 +150,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -151,6 +160,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -158,6 +170,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -165,6 +180,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p align="center">-</p></body></html></string>
|
<string><html><head/><body><p align="center">-</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
Loading…
Reference in New Issue
Block a user