Style changes (#143)

* Style changes

* Indentation

* ROS2 compatible style changes

* Style

* Adding style changes based on PR feedback

* minor fixup

rqt_gui/CHANGELOG.rst

@@ -39,7 +39,7 @@ Changelog for package rqt_gui
 0.2.9 (2013-06-06)
 ------------------
 * make plugin resources relative to plugin.xml (`ros-visualization/qt_gui_core#16 <https://github.com/ros-visualization/qt_gui_core/issues/16>`_)
-* use standard rospy function to filter remapping arguments (`#76 <https://github.com/ros-visualization/rqt/issues/76>`_) 
+* use standard rospy function to filter remapping arguments (`#76 <https://github.com/ros-visualization/rqt/issues/76>`_)
 * fix help provider
 
 0.2.8 (2013-01-11)

rqt_gui/setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(

rqt_gui/src/rqt_gui/main.py

@@ -35,11 +35,11 @@
 import os
 import sys
 
-import rospy
-from rospkg.rospack import RosPack
-
 from qt_gui.main import Main as Base
 
+from rospkg.rospack import RosPack
+import rospy
+
 
 class Main(Base):
 
@@ -59,8 +59,10 @@ def main(self, argv=None, standalone=None, plugin_argument_provider=None):
         argv = rospy.myargv(argv)
 
         return super(
-            Main, self).main(argv, standalone=standalone, plugin_argument_provider=plugin_argument_provider,
-                             plugin_manager_settings_prefix=str(hash(os.environ['ROS_PACKAGE_PATH'])))
+            Main, self).main(argv, standalone=standalone,
+                             plugin_argument_provider=plugin_argument_provider,
+                             plugin_manager_settings_prefix=str(
+                                hash(os.environ['ROS_PACKAGE_PATH'])))
 
     def create_application(self, argv):
         from python_qt_binding.QtGui import QIcon

rqt_gui/src/rqt_gui/ros_plugin_provider.py

@@ -41,11 +41,9 @@
 
 from qt_gui.plugin_descriptor import PluginDescriptor
 from qt_gui.plugin_provider import PluginProvider
-from qt_gui.ros_package_helper import get_package_path
 
 
 class RosPluginProvider(PluginProvider):
-
     """Base class for providing plugins based on the ROS package system."""
 
     def __init__(self, export_tag, base_class_type):
@@ -59,6 +57,7 @@ def __init__(self, export_tag, base_class_type):
     def discover(self, discovery_data):
         """
         Discover the plugins.
+
         The information of the `PluginDescriptor`s are extracted from the plugin manifests.
         """
         # search for plugins
@@ -83,8 +82,11 @@ def load(self, plugin_id, plugin_context):
             qCritical('RosPluginProvider.load(%s): raised an exception:\n%s' % (plugin_id, e))
             return None
         except Exception as e:
-            qCritical('RosPluginProvider.load(%s) exception raised in __builtin__.__import__(%s, [%s]):\n%s' % (
-                plugin_id, attributes['module_name'], attributes['class_from_class_type'], traceback.format_exc()))
+            qCritical('RosPluginProvider.load(%s) exception raised in '
+                      '__builtin__.__import__(%s, [%s]):\n%s' % (
+                          plugin_id, attributes['module_name'],
+                          attributes['class_from_class_type'],
+                          traceback.format_exc()))
             raise e
 
         class_ref = getattr(module, attributes['class_from_class_type'], None)
@@ -113,15 +115,15 @@ def _parse_plugin_xml(self, package_name, plugin_xml):
         plugin_descriptors = []
 
         if not os.path.isfile(plugin_xml):
-            qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" not found' %
-                      (plugin_xml, package_name))
+            qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" '
+                      'not found' % (plugin_xml, package_name))
             return plugin_descriptors
 
         try:
             root = ElementTree.parse(plugin_xml)
         except Exception:
-            qCritical('RosPluginProvider._parse_plugin_xml() could not parse "%s" in package "%s"' %
-                      (plugin_xml, package_name))
+            qCritical('RosPluginProvider._parse_plugin_xml() could not parse "%s" in package "%s"'
+                      % (plugin_xml, package_name))
             return plugin_descriptors
         for library_el in root.getiterator('library'):
             library_path = library_el.attrib['path']

rqt_gui_cpp/CMakeLists.txt

@@ -3,8 +3,8 @@ project(rqt_gui_cpp)
 # Load catkin and all dependencies required for this package
 find_package(catkin REQUIRED COMPONENTS qt_gui qt_gui_cpp roscpp nodelet)
 catkin_package(
-	INCLUDE_DIRS include 
-	LIBRARIES ${PROJECT_NAME} 
+	INCLUDE_DIRS include
+	LIBRARIES ${PROJECT_NAME}
 	CATKIN_DEPENDS qt_gui qt_gui_cpp roscpp nodelet
 )
 
@@ -26,7 +26,7 @@ qt5_wrap_cpp(rqt_gui_cpp_MOCS ${rqt_gui_cpp_HDRS})
 add_library(${PROJECT_NAME} ${rqt_gui_cpp_SRCS} ${rqt_gui_cpp_MOCS})
 target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} Qt5::Widgets)
 
-if(APPLE) 
+if(APPLE)
   set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 endif()
 

rqt_gui_cpp/package.xml

@@ -23,7 +23,7 @@
   <run_depend version_gte="0.3.0">qt_gui_cpp</run_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>nodelet</run_depend>
-  
+
   <export>
     <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lrqt_gui_cpp"/>
     <qt_gui plugin="${prefix}/plugin.xml"/>

rqt_gui_py/package.xml

@@ -21,7 +21,7 @@
   <run_depend version_gte="0.3.0">qt_gui</run_depend>
   <run_depend version_gte="0.3.0">rqt_gui</run_depend>
   <run_depend>rospy</run_depend>
-  
+
   <export>
     <rqt_gui plugin="${prefix}/plugin.xml"/>
   </export>

rqt_gui_py/setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
+
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(

rqt_gui_py/src/rqt_gui_py/plugin.py

@@ -34,10 +34,11 @@
 
 
 class Plugin(Base):
-
     """
     Interface for Python plugins which use the ROS client library.
-    User-defined plugins may either subclass `rqt_gui_py.plugin.Plugin` or according to duck typing implement only the needed methods.
+
+    User-defined plugins may either subclass `rqt_gui_py.plugin.Plugin` or according to duck typing
+    implement only the needed methods.
     A plugin must not call rospy.init_node() as this is performed once by the framework.
     The name of the ROS node consists of the prefix "rqt_gui_py_node_" and the process id.
     """
@@ -48,6 +49,7 @@ def __init__(self, context):
     def shutdown_plugin(self):
         """
         Shutdown and clean up the plugin before unloading.
+
         I.e. unregister subscribers and stop timers.
         """
         pass

rqt_gui_py/src/rqt_gui_py/ros_py_plugin_provider.py

@@ -34,12 +34,12 @@
 
 import rospy
 
+from python_qt_binding.QtCore import qDebug, Qt, Signal
+from python_qt_binding.QtWidgets import QMessageBox
+
 from qt_gui.composite_plugin_provider import CompositePluginProvider
 from qt_gui.errors import PluginLoadError
 
-from python_qt_binding.QtCore import qDebug, Qt, qWarning, Signal
-from python_qt_binding.QtWidgets import QMessageBox
-
 from rqt_gui.rospkg_plugin_provider import RospkgPluginProvider
 
 
@@ -70,11 +70,13 @@ def _check_for_master(self):
         # spawn thread to detect when master becomes available
         self._wait_for_master_thread = threading.Thread(target=self._wait_for_master)
         self._wait_for_master_thread.start()
-        self._wait_for_master_dialog = QMessageBox(QMessageBox.Question,
-                                                   self.tr('Waiting for ROS master'),
-                                                   self.tr("Could not find ROS master. Either start a 'roscore' or "
-                                                           "abort loading the plugin."),
-                                                   QMessageBox.Abort)
+        self._wait_for_master_dialog = QMessageBox(
+            QMessageBox.Question,
+            self.tr('Waiting for ROS master'),
+            self.tr(
+                "Could not find ROS master. Either start a 'roscore' or abort loading the plugin."),
+            QMessageBox.Abort)
+
         self._master_found_signal.connect(self._wait_for_master_dialog.done, Qt.QueuedConnection)
         button = self._wait_for_master_dialog.exec_()
         # check if master existence was not detected by background thread