Skip to content

Commit 7c1b2f2

Browse files
committed
Merge tag '3.9.3' into rti_main
2 parents 58ab1ac + 238b203 commit 7c1b2f2

File tree

630 files changed

+171741
-111790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

630 files changed

+171741
-111790
lines changed

.clang-format

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ AllowAllParametersOfDeclarationOnNextLine: false
88
AllowShortIfStatementsOnASingleLine: false
99
AllowShortLoopsOnASingleLine: false
1010
AllowShortFunctionsOnASingleLine: None
11-
AllowShortLoopsOnASingleLine: false
1211
AlwaysBreakTemplateDeclarations: true
1312
AlwaysBreakBeforeMultilineStrings: false
1413
BreakBeforeBinaryOperators: false
1514
BreakBeforeTernaryOperators: false
16-
BreakConstructorInitializersBeforeComma: true
15+
BreakConstructorInitializers: BeforeComma
1716
BinPackParameters: true
1817
ColumnLimit: 90
1918
ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -52,16 +51,15 @@ BreakBeforeBraces: Custom
5251

5352
# Control of individual brace wrapping cases
5453
BraceWrapping: {
55-
AfterClass: 'true'
56-
AfterControlStatement: 'true'
57-
AfterEnum : 'true'
58-
AfterFunction : 'true'
59-
AfterNamespace : 'true'
60-
AfterStruct : 'true'
61-
AfterUnion : 'true'
62-
BeforeCatch : 'true'
63-
BeforeElse : 'true'
54+
AfterClass: 'true',
55+
AfterControlStatement: 'true',
56+
AfterEnum : 'true',
57+
AfterFunction : 'true',
58+
AfterNamespace : 'true',
59+
AfterStruct : 'true',
60+
AfterUnion : 'true',
61+
BeforeCatch : 'true',
62+
BeforeElse : 'true',
6463
IndentBraces : 'false'
6564
}
6665
...
67-

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Dockerfile
2+
.git/

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
Thanks for contributing to PlotJuggler. You are great!
2-
31
# Problem description
42

5-
Describe the problem and the expected behavior. Use screenshots of video if approriate.
6-
7-
# Steps to reproduce (important)
3+
Describe the problem and the expected behavior. Use screenshots or a video, if applicable.
84

9-
- Describe your platform / Operative System.
10-
- Check if the problem can be reproduced using the dummy data created by the command line argument "-t" or one of the files in the folder "datasamples".
11-
- If it can't be reproduced with the dummy data, __please__ share the CSV file or the rosbag that can be used to reproduce the problem.
5+
# Answer these questions (or I will ignore your issue)
126

7+
1. Describe your platform / Operative System and the **version of PlotJuggler** you are using.
8+
2. Compile and try the latest version in the **main** branch and check if the problem persists.
9+
3. Check if the problem can be reproduced using the dummy data created by the command line argument "-t" or one of the files in the folder "datasamples".
10+
4. If it can't be reproduced with the dummy data, __please__ share the CSV file or the rosbag that can be used to reproduce the problem.

.github/workflows/codeql.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ 'main' ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ 'main' ]
9+
schedule:
10+
- cron: '28 15 * * 2'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: ubuntu-latest
16+
permissions:
17+
actions: read
18+
contents: read
19+
security-events: write
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
language: [ 'cpp', 'python' ]
25+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
26+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
27+
28+
steps:
29+
- name: Checkout repository
30+
uses: actions/checkout@v3
31+
32+
# Initializes the CodeQL tools for scanning.
33+
- name: Initialize CodeQL
34+
uses: github/codeql-action/init@v2
35+
with:
36+
languages: ${{ matrix.language }}
37+
# If you wish to specify custom queries, you can do so here or in a config file.
38+
# By default, queries listed here will override any specified in a config file.
39+
# Prefix the list here with "+" to use these queries and those in the config file.
40+
41+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
42+
queries: +security-and-quality
43+
44+
- name: Install apt packages
45+
run: |
46+
sudo apt update && sudo apt -y install \
47+
software-properties-common \
48+
qtbase5-dev \
49+
libqt5svg5-dev \
50+
libqt5websockets5-dev \
51+
libqt5opengl5-dev \
52+
libqt5x11extras5-dev \
53+
libprotoc-dev \
54+
libzmq3-dev \
55+
liblz4-dev libzstd-dev
56+
57+
- name: Build Plotjuggler
58+
run: |
59+
cmake -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
60+
cmake --build build --target install
61+
62+
# ℹ️ Command-line programs to run using the OS shell.
63+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
64+
65+
# If the Autobuild fails above, remove it and uncomment the following three lines.
66+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
67+
68+
# - run: |
69+
# echo "Run, Build Application using script"
70+
# ./location_of_script_within_repo/buildscript.sh
71+
72+
- name: Perform CodeQL Analysis
73+
uses: github/codeql-action/analyze@v2
74+
with:
75+
category: "/language:${{matrix.language}}"

.github/workflows/macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Sync repository
1717
uses: actions/checkout@v2
18-
18+
1919
- name: Cache Qt
2020
id: cache-qt
2121
uses: actions/cache@v1 # not v2!

.github/workflows/pre-commit.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: pre-commit
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
8+
jobs:
9+
pre-commit:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-python@v3
14+
- uses: pre-commit/[email protected]

.github/workflows/ros1.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ jobs:
77
strategy:
88
matrix:
99
env:
10-
- {ROS_DISTRO: melodic, ROS_REPO: main}
1110
- {ROS_DISTRO: noetic, ROS_REPO: main}
1211
runs-on: ubuntu-latest
1312
steps:
14-
- uses: actions/checkout@v1
13+
- uses: actions/checkout@v3
1514
- uses: 'ros-industrial/industrial_ci@master'
1615
env: ${{matrix.env}}
1716
with:
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: ros2-rolling
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
industrial_ci:
7+
strategy:
8+
matrix:
9+
env:
10+
- {ROS_DISTRO: rolling, ROS_REPO: main}
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
- uses: 'ros-industrial/industrial_ci@master'
15+
env: ${{matrix.env}}
16+
with:
17+
package-name: plotjuggler

.github/workflows/ros2.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ jobs:
77
strategy:
88
matrix:
99
env:
10-
- {ROS_DISTRO: foxy, ROS_REPO: main}
11-
- {ROS_DISTRO: galactic, ROS_REPO: main}
12-
- {ROS_DISTRO: rolling, ROS_REPO: main}
10+
- {ROS_DISTRO: humble, ROS_REPO: main}
11+
- {ROS_DISTRO: iron, ROS_REPO: main}
1312
runs-on: ubuntu-latest
1413
steps:
15-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v3
1615
- uses: 'ros-industrial/industrial_ci@master'
1716
env: ${{matrix.env}}
1817
with:
Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
1-
name: snap
1+
name: snap_core20
22
on:
33
push:
44
tags:
55
- '*'
6-
branches:
7-
- main
8-
pull_request:
9-
branches:
10-
- main
116
workflow_dispatch:
127

138
jobs:
149
build:
1510
runs-on: ubuntu-latest
1611
outputs:
17-
snap-file: ${{ steps.build-snap.outputs.snap }}
12+
snap-file: ${{ steps.build-snap20.outputs.snap }}
1813
steps:
1914
- uses: actions/checkout@v2
2015
with:
2116
# full history for latest tag name
2217
fetch-depth: 0
18+
- run: mv snap_core20 snap
2319
- uses: snapcore/action-build@v1
24-
id: build-snap
20+
id: build-snap20
2521

2622
# Make sure the snap is installable
2723
- run: |
28-
sudo snap install --dangerous ${{ steps.build-snap.outputs.snap }}
24+
sudo snap install --dangerous ${{ steps.build-snap20.outputs.snap }}
2925
3026
- uses: actions/upload-artifact@v3
3127
with:
32-
name: plotjuggler-snap
33-
path: ${{ steps.build-snap.outputs.snap }}
28+
name: plotjuggler-snap20
29+
path: ${{ steps.build-snap20.outputs.snap }}
3430

3531
publish:
3632
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
@@ -39,7 +35,7 @@ jobs:
3935
steps:
4036
- uses: actions/download-artifact@v3
4137
with:
42-
name: plotjuggler-snap
38+
name: plotjuggler-snap20
4339
path: .
4440
- uses: snapcore/action-publish@v1
4541
env:

0 commit comments

Comments
 (0)