Merge branch 'master' into jsk_rviz_plugins_msgs

jsk-ros-pkg · May 11, 2024 · 75fbb14 · 75fbb14
2 parents 0b674cf + 8bb999d
commit 75fbb14
Show file tree

Hide file tree

Showing 15 changed files with 175 additions and 88 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -26,7 +26,9 @@ jobs:
             CONTAINER: ubuntu:18.04
           - ROS_DISTRO: noetic
             CONTAINER: ubuntu:20.04
-            USE_DEB : false # to use .travis.rosinstall.noetic for face_detector
+          - ROS_DISTRO: noetic
+            CONTAINER: ubuntu:20.04
+            BEFORE_SCRIPT: "pip3 install -U --user pyyaml"
 
     container: ${{ matrix.CONTAINER }}
     steps:

diff --git a/.travis.rosinstall.noetic b/.travis.rosinstall.noetic
diff --git a/jsk_interactive_markers/jsk_interactive_marker/scripts/transformable_markers_client.py b/jsk_interactive_markers/jsk_interactive_marker/scripts/transformable_markers_client.py
@@ -26,6 +26,11 @@
 import rospy
 
 
+# Python2's xrange equals Python3's range, and xrange is removed on Python3
+if not hasattr(__builtins__, 'xrange'):
+    xrange = range
+
+
 class TransformableMarkersClient(object):
 
     def __init__(self):

diff --git a/jsk_rqt_plugins/package.xml b/jsk_rqt_plugins/package.xml
@@ -30,8 +30,6 @@
   <exec_depend>image_view2</exec_depend>
   <exec_depend version_gte="4.3.0" >jsk_gui_msgs</exec_depend>
   <exec_depend>cv_bridge</exec_depend>
-  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-urlgrabber</exec_depend>
-  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-urlgrabber</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-sklearn</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-sklearn</exec_depend>
   <exec_depend>message_runtime</exec_depend>

diff --git a/jsk_rqt_plugins/plugin.xml b/jsk_rqt_plugins/plugin.xml
@@ -43,9 +43,9 @@
          base_class_type="rqt_gui_py::Plugin">
     <qtgui>
       <group>
-        <label>Visualization</label>
+        <label>Services</label>
         <icon type="theme">folder</icon>
-        <statustip>Plugins related to visualization.</statustip>
+        <statustip>Plugins related to services.</statustip>
       </group>
       <label>ServiceButton</label>
       <icon type="theme">utilities-system-monitor</icon>
@@ -56,9 +56,9 @@
          base_class_type="rqt_gui_py::Plugin">
     <qtgui>
       <group>
-        <label>Visualization</label>
+        <label>Services</label>
         <icon type="theme">folder</icon>
-        <statustip>Plugins related to visualization.</statustip>
+        <statustip>Plugins related to services.</statustip>
       </group>
       <label>ServiceRadioButton</label>
       <icon type="theme">utilities-system-monitor</icon>
@@ -127,9 +127,9 @@
     <description>Simple yes or no button with service call.</description>
     <qtgui>
       <group>
-        <label>Visualization</label>
+        <label>Services</label>
         <icon type="theme">folder</icon>
-        <statustip>Plugins related to visualization.</statustip>
+        <statustip>Plugins related to service.</statustip>
       </group>
       <label>YesNo Button</label>
       <icon type="theme">utilities-system-monitor</icon>
@@ -141,9 +141,9 @@
          base_class_type="rqt_gui_py::Plugin">
     <qtgui>
       <group>
-        <label>Visualization</label>
+        <label>Services</label>
         <icon type="theme">folder</icon>
-        <statustip>Plugins related to visualization.</statustip>
+        <statustip>Plugins related to services.</statustip>
       </group>
       <label>ServiceTabbedButton</label>
       <icon type="theme">utilities-system-monitor</icon>

diff --git a/jsk_rqt_plugins/resource/rqt_image_view2_button.perspective b/jsk_rqt_plugins/resource/rqt_image_view2_button.perspective
@@ -259,7 +259,7 @@
               "keys": {
                 "splitter": {
                   "type": "repr(QByteArray.hex)", 
-                  "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000000000030000006400000064000000c801000000090100000002')", 
+                  "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff00000000000000030000006400000064000000c801000000090100000002')", 
                   "pretty-print": "       d d       "
                 }
               }, 
@@ -299,7 +299,7 @@
                 }, 
                 "table_splitter": {
                   "type": "repr(QByteArray.hex)", 
-                  "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000000000020000004e000000ed01000000090100000002')", 
+                  "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff00000000000000020000004e000000ed01000000090100000002')", 
                   "pretty-print": "       N       "
                 }, 
                 "highlight_filters": {
@@ -316,7 +316,7 @@
                 }, 
                 "filter_splitter": {
                   "type": "repr(QByteArray.hex)", 
-                  "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff0000000000000002000000720000007201000000090100000002')", 
+                  "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff0000000000000002000000720000007201000000090100000002')", 
                   "pretty-print": "       r r     "
                 }
               }, 
@@ -361,12 +361,12 @@
       "keys": {
         "geometry": {
           "type": "repr(QByteArray.hex)", 
-          "repr(QByteArray.hex)": "QtCore.QByteArray('01d9d0cb000100000000000a0000001c000005260000036000000012000000380000051e00000358000000000000')", 
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'01d9d0cb000100000000000a0000001c000005260000036000000012000000380000051e00000358000000000000')", 
           "pretty-print": "         & `   8   X   "
         }, 
         "state": {
           "type": "repr(QByteArray.hex)", 
-          "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000fd00000001000000030000050d000002f2fc0100000008fb00000062007200710074005f0072006f0062006f0074005f006d006f006e00690074006f0072005f005f0052006f0062006f0074004d006f006e00690074006f0072005f005f0031005f005f0052006f0062006f00740020004d006f006e00690074006f007201000000000000020e0000000000000000fc0000014f000001ac0000000000fffffffc0200000002fb00000042007200710074005f006e00610076005f0076006900650077005f005f004e0061007600690067006100740069006f006e0056006900650077005f005f0031005f005f0100000019000000f20000000000000000fb0000004c007200710074005f0063006f006e0073006f006c0065005f005f0043006f006e0073006f006c0065005f005f0031005f005f0043006f006e0073006f006c006500570069006400670065007401000000190000027a0000000000000000fc000000000000031f0000000000fffffffc0200000002fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0031005f005f00440061007400610050006c006f00740057006900640067006500740100000019000001700000000000000000fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0033005f005f00440061007400610050006c006f00740057006900640067006500740100000019000003080000000000000000fc00000000000006400000000000fffffffc0200000002fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0032005f005f00440061007400610050006c006f007400570069006400670065007401000000190000016a0000000000000000fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0034005f005f00440061007400610050006c006f00740057006900640067006500740100000019000003080000000000000000fb00000026007200710074005f007200760069007a005f005f005200560069007a005f005f0031005f005f010000034a000002f60000000000000000fb00000054006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0050006c006f007400330044005f005f0031005f005f00440061007400610050006c006f007400570069006400670065007401000000000000047c0000000000000000fb0000004c006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0049006d006100670065005600690065007700320050006c007500670069006e005f005f0031005f005f0100000000000003320000007800fffffffb00000048006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650042007500740074006f006e0073005f005f0031005f005f0100000338000001d5000000e700ffffff0000050d0000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720000000000ffffffff0000000000000000')", 
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff00000000fd00000001000000030000050d000002f2fc0100000008fb00000062007200710074005f0072006f0062006f0074005f006d006f006e00690074006f0072005f005f0052006f0062006f0074004d006f006e00690074006f0072005f005f0031005f005f0052006f0062006f00740020004d006f006e00690074006f007201000000000000020e0000000000000000fc0000014f000001ac0000000000fffffffc0200000002fb00000042007200710074005f006e00610076005f0076006900650077005f005f004e0061007600690067006100740069006f006e0056006900650077005f005f0031005f005f0100000019000000f20000000000000000fb0000004c007200710074005f0063006f006e0073006f006c0065005f005f0043006f006e0073006f006c0065005f005f0031005f005f0043006f006e0073006f006c006500570069006400670065007401000000190000027a0000000000000000fc000000000000031f0000000000fffffffc0200000002fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0031005f005f00440061007400610050006c006f00740057006900640067006500740100000019000001700000000000000000fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0033005f005f00440061007400610050006c006f00740057006900640067006500740100000019000003080000000000000000fc00000000000006400000000000fffffffc0200000002fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0032005f005f00440061007400610050006c006f007400570069006400670065007401000000190000016a0000000000000000fb00000042007200710074005f0070006c006f0074005f005f0050006c006f0074005f005f0034005f005f00440061007400610050006c006f00740057006900640067006500740100000019000003080000000000000000fb00000026007200710074005f007200760069007a005f005f005200560069007a005f005f0031005f005f010000034a000002f60000000000000000fb00000054006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0050006c006f007400330044005f005f0031005f005f00440061007400610050006c006f007400570069006400670065007401000000000000047c0000000000000000fb0000004c006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0049006d006100670065005600690065007700320050006c007500670069006e005f005f0031005f005f0100000000000003320000007800fffffffb00000048006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650042007500740074006f006e0073005f005f0031005f005f0100000338000001d5000000e700ffffff0000050d0000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720000000000ffffffff0000000000000000')", 
           "pretty-print": "                 brqt_robot_monitor__RobotMonitor__1__Robot Monitor          O                                                                                                 z                 Brqt_plot__Plot__1__DataPlotWidget          Brqt_plot__Plot__3__DataPlotWidget            @                                              j                                                                       J                                                      |                                                2 x                                          8                                                              "
         }
       }, 
@@ -383,4 +383,4 @@
       }
     }
   }
-}
+}
diff --git a/jsk_rqt_plugins/resource/rqt_service_buttons.perspective b/jsk_rqt_plugins/resource/rqt_service_buttons.perspective
@@ -46,12 +46,12 @@
       "keys": {
         "geometry": {
           "type": "repr(QByteArray.hex)",
-          "repr(QByteArray.hex)": "QtCore.QByteArray('01d9d0cb000200000000041d000000cf00000700000002ae0000041d000000ed00000700000002ae00000000000000000780')",
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'01d9d0cb000200000000041d000000cf00000700000002ae0000041d000000ed00000700000002ae00000000000000000780')",
           "pretty-print": "                         "
         },
         "state": {
           "type": "repr(QByteArray.hex)",
-          "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000fd0000000100000003000002e40000016ffc0100000006fb00000048006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650042007500740074006f006e0073005f005f0031005f005f0100000000000002e40000010000fffffffb00000050007200710074005f006400650070005f005f0052006f0073005000610063006b00470072006100700068005f005f0031005f005f0052006f0073005000610063006b00470072006100700068005500690100000000000002e40000000000000000fb00000054006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0044005200430045006e007600690072006f006e006d0065006e0074005600690065007700650072005f005f0031005f005f0100000000000002200000000000000000fb00000050007200710074005f0070006f00730065005f0076006900650077005f005f0050006f007300650056006900650077005f005f0031005f005f0047004c00560069006500770057006900640067006500740100000000000002560000000000000000fb00000052006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650052006100640069006f0042007500740074006f006e0073005f005f0031005f005f01000000000000020b0000000000000000fb0000005c006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f005900650073004e006f0042007500740074006f006e005f005f0031005f005f005900650073004e006f0042007500740074006f006e005500690100000000000002e40000000000000000000002e40000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720100000000ffffffff0000000000000000')",
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff00000000fd0000000100000003000002e40000016ffc0100000006fb00000048006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650042007500740074006f006e0073005f005f0031005f005f0100000000000002e40000010000fffffffb00000050007200710074005f006400650070005f005f0052006f0073005000610063006b00470072006100700068005f005f0031005f005f0052006f0073005000610063006b00470072006100700068005500690100000000000002e40000000000000000fb00000054006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f0044005200430045006e007600690072006f006e006d0065006e0074005600690065007700650072005f005f0031005f005f0100000000000002200000000000000000fb00000050007200710074005f0070006f00730065005f0076006900650077005f005f0050006f007300650056006900650077005f005f0031005f005f0047004c00560069006500770057006900640067006500740100000000000002560000000000000000fb00000052006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650052006100640069006f0042007500740074006f006e0073005f005f0031005f005f01000000000000020b0000000000000000fb0000005c006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f005900650073004e006f0042007500740074006f006e005f005f0031005f005f005900650073004e006f0042007500740074006f006e005500690100000000000002e40000000000000000000002e40000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720100000000ffffffff0000000000000000')",
           "pretty-print": "ServiceButtons"
         }
       },

diff --git a/jsk_rqt_plugins/resource/rqt_service_radio_buttons.perspective b/jsk_rqt_plugins/resource/rqt_service_radio_buttons.perspective
@@ -46,12 +46,12 @@
       "keys": {
         "geometry": {
           "type": "repr(QByteArray.hex)",
-          "repr(QByteArray.hex)": "QtCore.QByteArray('01d9d0cb000200000000038f00000126000005e6000003050000038f00000144000005e60000030500000000000000000780')",
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'01d9d0cb000200000000038f00000126000005e6000003050000038f00000144000005e60000030500000000000000000780')",
           "pretty-print": "       &       D         "
         },
         "state": {
           "type": "repr(QByteArray.hex)",
-          "repr(QByteArray.hex)": "QtCore.QByteArray('000000ff00000000fd00000001000000030000025800000196fc0100000001fb00000052006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650052006100640069006f0042007500740074006f006e0073005f005f0031005f005f0100000000000002580000015d00ffffff000002580000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720000000000ffffffff0000000000000000')",
+          "repr(QByteArray.hex)": "QtCore.QByteArray(b'000000ff00000000fd00000001000000030000025800000196fc0100000001fb00000052006a0073006b005f007200710074005f0070006c007500670069006e0073005f005f00530065007200760069006300650052006100640069006f0042007500740074006f006e0073005f005f0031005f005f0100000000000002580000015d00ffffff000002580000000000000004000000040000000800000008fc00000001000000030000000100000036004d0069006e0069006d0069007a006500640044006f0063006b00570069006400670065007400730054006f006f006c0062006100720000000000ffffffff0000000000000000')",
           "pretty-print": "                 Rjsk_rqt_plugins__ServiceRadioButtons__1__                            6MinimizedDockWidgetsToolbar        "
         }
       },