Merge branch 'master' into fix_834

.github/workflows/config.yml

@@ -0,0 +1,114 @@
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+env:
+  DISPLAY: ':0.0'
+
+jobs:
+  ros:
+    runs-on: ubuntu-latest
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ROS_DISTRO: indigo
+            CONTAINER: jskrobotics/ros-ubuntu:14.04
+            BEFORE_SCRIPT : "sudo pip install virtualenv==15.1.0"
+            NOT_TEST_INSTALL: true
+          - ROS_DISTRO: kinetic
+            CONTAINER: ubuntu:16.04
+            BEFORE_SCRIPT: "pip install --user matplotlib==2.2.5"
+          - ROS_DISTRO: melodic
+            CONTAINER: ubuntu:18.04
+          - ROS_DISTRO: noetic
+            CONTAINER: ubuntu:20.04
+          - ROS_DISTRO: noetic
+            CONTAINER: ubuntu:20.04
+            BEFORE_SCRIPT: "pip3 install -U --user pyyaml"
+
+    container: ${{ matrix.CONTAINER }}
+    steps:
+      - name: Install latest git ( use sudo for ros-ubuntu )
+        run: |
+          [ -e /etc/apt/sources.list.d/ubuntu-esm-infra-$(lsb_release -cs).list ] && sudo rm /etc/apt/sources.list.d/ubuntu-esm-infra-$(lsb_release -cs).list ## fix Err https://esm.ubuntu.com trusty-infra-security/main amd64 Packages, gnutls_handshake() failed: Handshake failed
+          (apt-get update && apt-get install -y sudo) || echo "OK"
+          sudo apt-get update
+          sudo apt-get install -y software-properties-common
+          sudo apt-get update
+          sudo -E add-apt-repository -y ppa:git-core/ppa
+          sudo apt-get update
+          sudo apt-get install -y git
+
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          if [ "${{ matrix.CONTAINER }}" = "jskrobotics/ros-ubuntu:14.04" ]; then
+             git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+             sudo mkdir -p /__w/
+             sudo chmod 777 -R /__w/
+             sudo chown -R $USER $HOME
+             sudo mkdir  -p /__w/_temp/_runner_file_commands/
+             sudo chown -R $USER /__w/_temp/_runner_file_commands/
+             # sudo mkdir -p /home/runner/work/_temp/_github_workflow/
+             # sudo chown -R $USER $HOME /home/runner/work/_temp/_github_workflow/
+             # ls -al /home/runner/work/_temp/_github_workflow/
+          else
+             git config --global --add safe.directory $GITHUB_WORKSPACE
+          fi
+
+      - name: Chcekout
+        uses: actions/[email protected]
+        with:
+          submodules: true
+
+      - name: Cache Download Data
+        uses: actions/[email protected]
+        with:
+          path: /github/home/.ros/data/jsk_rviz_plugins
+          key: jsk_rviz_plugins
+
+      - name: Start X server
+        run: |
+          if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then exit 0; fi
+          echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
+          sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
+          export DISPLAY=:0
+          wget https://raw.githubusercontent.com/jsk-ros-pkg/jsk_travis/master/dummy.xorg.conf -O /tmp/dummy.xorg.conf
+          sudo Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config /tmp/dummy.xorg.conf $DISPLAY &
+          sleep 3 # wait x server up
+          export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
+          xhost +local:root
+        shell: bash
+
+      - name: Start X server (for 14.04)
+        run: |
+          if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then
+            echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
+            export DISPLAY=:0
+            sudo apt-get install -y xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
+            sudo apt-get install -y x11-xserver-utils  # for xhost
+            sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
+            sleep 3 # wait x server up
+            export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
+            xhost +local:root
+          fi
+        shell: bash
+
+      - name: Run jsk_travis
+        uses: jsk-ros-pkg/jsk_travis@master
+        with:
+          ROS_PARALLEL_JOBS : "-j8"
+          CATKIN_PARALLEL_JOBS : "-p8"
+          ROS_PARALLEL_TEST_JOBS : "-j8"
+          CATKIN_PARALLEL_TEST_JOBS : "-p8"
+          BEFORE_SCRIPT : ${{ matrix.BEFORE_SCRIPT }}
+          ROS_DISTRO : ${{ matrix.ROS_DISTRO }}
+          USE_DEB :  ${{ matrix.USE_DEB }}
+          NOT_TEST_INSTALL : ${{ matrix.NOT_TEST_INSTALL }}
+          TEST_PKGS : ${{ matrix.TEST_PKGS }}
+          EXTRA_DEB : ${{ matrix.EXTRA_DEB }}

.github/workflows/python3.yml

@@ -12,9 +12,11 @@ jobs:
     steps:
       - name: Install latest git to download .git directory in actions/checkout@v2 ( use sudo for ros-ubuntu )
         run: apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: git config --global --add safe.directory $GITHUB_WORKSPACE
       - name: Chcekout
         uses: actions/checkout@v2
       - name: Check Python3
         run: |
           apt update -q && apt install -y -q python3 git 2to3
-          bash -c "ret=0; trap 'ret=1' ERR; python3 -m compileall .; 2to3 -w -f except -f execfile -f has_key -f import -f raw_input -f zip .; git diff --exit-code . :^.travis > /dev/null; echo Exitting with \$ret; exit \$ret"
+          bash -c "ret=0; trap 'ret=1' ERR; python3 -m compileall .; 2to3 -w -f except -f execfile -f has_key -f import -f raw_input -f zip .; git diff --exit-code . > /dev/null; echo Exitting with \$ret; exit \$ret"

.gitmodules

@@ -1,3 +1,3 @@
 [submodule ".travis"]
 	path = .travis
-	url = git://github.com/jsk-ros-pkg/jsk_travis
+	url = https://github.com/jsk-ros-pkg/jsk_travis.git

doc/jsk_rviz_plugins/plugins/pictogram.md

@@ -4,11 +4,11 @@
 [movie](https://www.youtube.com/watch?v=AJe1uQupsUE)
 
 Pictogram is a rviz plugin to visualize icons.
-Pictogram plugin uses [Entypo](http://entypo.com/) and [FontAwesome](http://fortawesome.github.io/Font-Awesome/).
+Pictogram plugin uses [Entypo](http://entypo.com/) and [FontAwesome](https://fontawesome.com/).
 
 You need to use [`jsk_rviz_plugins/Pictogram`](http://docs.ros.org/indigo/api/jsk_rviz_plugins/html/msg/Pictogram.html) and
 [`jsk_rviz_plugins/PictogramArray`](http://docs.ros.org/indigo/api/jsk_rviz_plugins/html/msg/PictogramArray.html) message to use it.
 
-You can find mapping with `character` and icons at [here](http://fortawesome.github.io/Font-Awesome/icons/) and [here](http://entypo.com/characters/).
+You can find mapping with `character` and icons at [here](https://fontawesome.com/v5/search?m=free) and [here](http://web.archive.org/web/20140912210715/http://entypo.com/characters/).
 
 If you set STRING_MODE, you can show the string popups.

doc/jsk_rviz_plugins/plugins/pie_chart.md

@@ -5,7 +5,79 @@ Plot a pie chart of `std_msgs/Float32` on rviz as HUD overlay.
 
 To change caption text, please [rename plugin display name](http://docs.ros.org/jade/api/rviz/html/user_guide/#naming-displays) on rviz Displays tab
 
+## Properties
+* `Topic`
+
+  `std_msgs::Float32` topic to subscribe to
+* `size`
+
+  Size of the plotter window
+* `left`
+
+  Left of the plotter window
+* `top`
+
+  Top of the plotter window
+* `foreground color`
+
+  Color to draw line
+* `foreground alpha`
+
+  Alpha belnding value for foreground
+* `foreground alpha2`
+
+  Alpha belnding value for foreground for indicator
+* `background color`
+
+  Background color
+* `background alpha`
+
+  Alpha belnding value for background
+* `text size`
+
+  Text size
+* `show caption`
+
+  Show caption
+* `max value`
+
+  Max value of pie chart
+* `min value`
+
+  Min value of pie chart
+* `auto color change`
+
+  Change the color automatically
+* `max color`
+
+  Max color of pie chart 
+
+  Only used if auto color change is set to True
+* `med color`
+
+  Med color of pie chart
+
+  Only used if auto color change is set to True
+* `max color change threshold`
+
+  Change the max color at this threshold
+
+  Only used if auto color change is set to True
+* `med color change threshold`
+
+  Change the med color at this threshold
+
+  Only used if auto color change is set to True
+* `clockwise rotate direction`
+
+  Change the rotate direction
+
+
 ## Sample
 ```
 roslaunch jsk_rviz_plugins overlay_sample.launch
+```
+  or
+```
+roslaunch jsk_rviz_plugins piechart_sample.launch
 ```

jsk_interactive_markers/jsk_interactive/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package jsk_interactive
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.8 (2022-01-11)
+------------------
+
 2.1.7 (2020-10-17)
 ------------------
 

jsk_interactive_markers/jsk_interactive/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>jsk_interactive</name>
-  <version>2.1.7</version>
+  <version>2.1.8</version>
   <description>jsk_interactive</description>
   <maintainer email="[email protected]">Yusuke Furuta</maintainer>