Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

autopep8 #1

Merged
merged 1 commit into from
Oct 20, 2018
Merged

autopep8 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/rqt_msg/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@


class Messages(Plugin):

def __init__(self, context):
super(Messages, self).__init__(context)
self.setObjectName('Messages')
Expand Down
1 change: 1 addition & 0 deletions src/rqt_msg/messages_tree_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@


class MessagesTreeModel(MessageTreeModel):

def __init__(self, parent=None):
super(MessagesTreeModel, self).__init__()
self.setHorizontalHeaderLabels([self.tr('Tree'),
Expand Down
1 change: 1 addition & 0 deletions src/rqt_msg/messages_tree_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@


class MessagesTreeView(MessageTreeWidget):

def __init__(self, parent=None):
super(MessagesTreeView, self).__init__()
self.setModel(MessagesTreeModel(self))
Expand Down
30 changes: 16 additions & 14 deletions src/rqt_msg/messages_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@


class MessagesWidget(QWidget):

"""
This class is intended to be able to handle msg, srv & action (actionlib).
The name of the class is kept to use message, by following the habit of
rosmsg (a script that can handle both msg & srv).
"""

def __init__(self, mode=rosmsg.MODE_MSG,
pkg_name='rqt_msg',
ui_filename='messages.ui'):
Expand Down Expand Up @@ -89,7 +91,7 @@ def _refresh_packages(self, mode=rosmsg.MODE_MSG):
elif self._mode == rosaction.MODE_ACTION:
packages = sorted([pkg_tuple[0]
for pkg_tuple in rosaction.iterate_packages(
self._rospack, self._mode)])
self._rospack, self._mode)])
self._package_list = packages
rospy.logdebug('pkgs={}'.format(self._package_list))
self._package_combo.clear()
Expand All @@ -101,16 +103,16 @@ def _refresh_msgs(self, package=None):
return
self._msgs = []
if (self._mode == rosmsg.MODE_MSG or
self._mode == rosaction.MODE_ACTION):
self._mode == rosaction.MODE_ACTION):
msg_list = rosmsg.list_msgs(package)
elif self._mode == rosmsg.MODE_SRV:
msg_list = rosmsg.list_srvs(package)

rospy.logdebug('_refresh_msgs package={} msg_list={}'.format(package,
msg_list))
rospy.logdebug(
'_refresh_msgs package={} msg_list={}'.format(package, msg_list))
for msg in msg_list:
if (self._mode == rosmsg.MODE_MSG or
self._mode == rosaction.MODE_ACTION):
self._mode == rosaction.MODE_ACTION):
msg_class = roslib.message.get_message_class(msg)
elif self._mode == rosmsg.MODE_SRV:
msg_class = roslib.message.get_service_class(msg)
Expand All @@ -134,30 +136,30 @@ def _add_message(self):
rospy.logdebug('_add_message msg={}'.format(msg))

if (self._mode == rosmsg.MODE_MSG or
self._mode == rosaction.MODE_ACTION):
self._mode == rosaction.MODE_ACTION):
msg_class = roslib.message.get_message_class(msg)()
if self._mode == rosmsg.MODE_MSG:
text_tree_root = 'Msg Root'
elif self._mode == rosaction.MODE_ACTION:
text_tree_root = 'Action Root'
self._messages_tree.model().add_message(msg_class,
self.tr(text_tree_root), msg, msg)
self.tr(text_tree_root), msg, msg)

elif self._mode == rosmsg.MODE_SRV:
msg_class = roslib.message.get_service_class(msg)()
self._messages_tree.model().add_message(msg_class._request_class,
self.tr('Service Request'),
msg, msg)
self.tr('Service Request'),
msg, msg)
self._messages_tree.model().add_message(msg_class._response_class,
self.tr('Service Response'),
msg, msg)
self.tr('Service Response'),
msg, msg)
self._messages_tree._recursive_set_editable(
self._messages_tree.model().invisibleRootItem(), False)
self._messages_tree.model().invisibleRootItem(), False)

def _handle_mouse_press(self, event,
old_pressEvent=QTreeView.mousePressEvent):
if (event.buttons() & Qt.RightButton and
event.modifiers() == Qt.NoModifier):
event.modifiers() == Qt.NoModifier):
self._rightclick_menu(event)
event.accept()
return old_pressEvent(self._messages_tree, event)
Expand Down Expand Up @@ -194,7 +196,7 @@ def _rightclick_menu(self, event):
browsetext = None
try:
if (self._mode == rosmsg.MODE_MSG or
self._mode == rosaction.MODE_ACTION):
self._mode == rosaction.MODE_ACTION):
browsetext = rosmsg.get_msg_text(selected_type,
action == raw_action)
elif self._mode == rosmsg.MODE_SRV:
Expand Down