Skip to content

Commit

Permalink
apply clang format and move PlotJuggler/fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
facontidavide committed Mar 8, 2024
1 parent b3a5349 commit 7df5162
Show file tree
Hide file tree
Showing 129 changed files with 10,293 additions and 7,645 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: false
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: true
BreakConstructorInitializers: BeforeComma
BinPackParameters: true
ColumnLimit: 90
ConstructorInitializerAllOnOneLineOrOnePerLine: true
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ Describe the problem and the expected behavior. Use screenshots or a video, if a
2. Compile and try the latest version in the **main** branch and check if the problem persists.
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".
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.

2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
libprotoc-dev \
libzmq3-dev \
liblz4-dev libzstd-dev
- name: Build Plotjuggler
run: |
cmake -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Sync repository
uses: actions/checkout@v2

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
steps:
- name: Sync repository
uses: actions/checkout@v2

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
with:
path: '${{ github.workspace }}/qt_installation/'
key: ${{ runner.os }}-QtCache

- name: Install Qt
uses: jurplel/[email protected]
with:
Expand All @@ -39,4 +39,3 @@ jobs:
run: >
cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
cmake --build build --target install
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# See https://github.com/pre-commit/pre-commit

exclude: ^3rdparty/|3rdparty
exclude: ^3rdparty/|3rdparty|^plotjuggler_base/include/PlotJuggler/contrib/
repos:

# Standard hooks
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Changelog for package plotjuggler
3.6.0 (2022-08-13)
------------------
* More memes
* Refactoring of the MessageParser plugins
* Refactoring of the MessageParser plugins
* Mcap support (`#722 <https://github.com/facontidavide/PlotJuggler/issues/722>`_)
* Improve CSV loader error handling (`#721 <https://github.com/facontidavide/PlotJuggler/issues/721>`_)
* Fix plotwidget drag and drop bug (Issue `#716 <https://github.com/facontidavide/PlotJuggler/issues/716>`_) (`#717 <https://github.com/facontidavide/PlotJuggler/issues/717>`_)
Expand Down Expand Up @@ -1527,7 +1527,7 @@ Changelog for package plotjuggler
0.10.0 (2017-02-12)
-------------------
* auto loading of streamer based on saved layout
* refactoring of the ROS plugins
* refactoring of the ROS plugins
* REFACTORING to allow future improvements of drag&drop
* trying to fix a compilation problem
* Update README.md
Expand Down
2 changes: 1 addition & 1 deletion COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ brew install cmake qt@5 protobuf mosquitto zeromq zstd
If a newer version of qt is installed, you may need to temporarily link to qt5

```shell
brew link qt@5 --override
brew link qt@5 --override
# brew link qt --override # Run once you are done building to restore the original linking
```

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ RUN mkdir -p /opt/plotjuggler
COPY . /opt/plotjuggler
RUN mkdir /opt/plotjuggler/build
WORKDIR /opt/plotjuggler/build
RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr
RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr
RUN make -j `nproc`
RUN make install DESTDIR=AppDir
RUN /opt/plotjuggler/appimage/AppImage.sh

FROM scratch as exporter
COPY --from=builder /opt/plotjuggler/build/PlotJuggler-x86_64.AppImage /

16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PlotJuggler is a tool to visualize time series that is **fast**, **powerful** an
Noteworthy features:

- Simple Drag & Drop user interface.
- Load __data from file__.
- Load __data from file__.
- Connect to live __streaming__ of data.
- Save the visualization layout and configurations to re-use them later.
- Fast **OpenGL** visualization.
Expand Down Expand Up @@ -46,7 +46,7 @@ You can manipulate your time series using a simple and extendable Transform Edit
![](docs/function_editor.png)

Alternatively, you may use the Custom Function Editor, which allows you to create Multi-input / Single-output functions
using a scripting language based on [Lua](https://www.tutorialspoint.com/lua/index.htm).
using a scripting language based on [Lua](https://www.tutorialspoint.com/lua/index.htm).

If you are not familiar with Lua, don't be afraid, you won't need more than 5 minutes to learn it ;)

Expand Down Expand Up @@ -79,7 +79,7 @@ If you want a simple example to learn how to write your own plugins, have a look

## Snap (recommended in Ubuntu, to ROS users too)

The snap contains a version of PlotJuggler that can work with either ROS1 or ROS2.
The snap contains a version of PlotJuggler that can work with either ROS1 or ROS2.

![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)

Expand All @@ -99,12 +99,12 @@ sudo snap install plotjuggler-ros

This installer does __not__ include ROS plugins.

**Windows Installer**:
**Windows Installer**:
[PlotJuggler-Windows-3.9.0-installer](https://github.com/facontidavide/PlotJuggler/releases/download/3.9.0/PlotJuggler-Windows-3.9.0-installer.exe)

### Debian packages for ROS User

Install the ROS packages with:
Install the ROS packages with:

```
sudo apt install ros-$ROS_DISTRO-plotjuggler-ros
Expand Down Expand Up @@ -132,13 +132,13 @@ You can find the detailed instructions here: [COMPILE.md](COMPILE.md).

# Sponsorship and commercial support

PlotJuggler required a lot of work to develop and maintain; my goal is to build the most
PlotJuggler required a lot of work to develop and maintain; my goal is to build the most
intuitive and powerful tool to visualize data and timeseries.

If you find PlotJuggler useful, consider donating [PayPal](https://www.paypal.me/facontidavide) or becoming a
If you find PlotJuggler useful, consider donating [PayPal](https://www.paypal.me/facontidavide) or becoming a
[Github Sponsor](https://github.com/sponsors/facontidavide).

If you need to extend any of the functionalities of PlotJuggler to cover a specific
If you need to extend any of the functionalities of PlotJuggler to cover a specific
need or to parse your custom data formats, you can receive commercial
support from the main author, [Davide Faconti](mailto:[email protected]).

Expand Down
3 changes: 1 addition & 2 deletions appimage/AppImage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ cd linuxdeploy-plugin-qt
mv squashfs-root/AppRun squashfs-root/linuxdeploy-plugin-qt
cd -

PATH=$PATH:linuxdeploy-plugin-qt/squashfs-root ./linuxdeploy/squashfs-root/AppRun --appdir $APPDIRPATH -d ../PlotJuggler.desktop -i ../plotjuggler.png --plugin qt --output appimage

PATH=$PATH:linuxdeploy-plugin-qt/squashfs-root ./linuxdeploy/squashfs-root/AppRun --appdir $APPDIRPATH -d ../PlotJuggler.desktop -i ../plotjuggler.png --plugin qt --output appimage
2 changes: 1 addition & 1 deletion cmake/FindZeroMQ.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
include ( FindPackageHandleStandardArgs )
# handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR )
find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR )
10 changes: 4 additions & 6 deletions contributors.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
Main developer:
Main developer:
Davide Faconti

Contributors:
Alexandre Audes (@aeudes)
Arturo Martín-de-Nicolás
Celal Savur (@csavur)
Dorian Scholz
Dorian Scholz
Eddy Scott
Hilario Tome'
Jorge Rodriguez (@veimox)
Marcel Soler
Marcel Soler
Mazin Ali (@mazinms)
Mikael Arguedas
Kartik Mohta
Robin Vanhove (@1r0b1n0)
Shitij Kumar (@spk4422)
Tobias Fischer (@TobiasRobotics)
Victor Lopez


8 changes: 4 additions & 4 deletions datasamples/default.snippets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<global></global>
<equation>$$PLOT_A$$ + $$PLOT_B$$</equation>
</snippet>

<snippet name="1st_derivative">
<global>
var prevX = 0
Expand All @@ -19,7 +19,7 @@ prevY = value
return dy/dx
</equation>
</snippet>

<snippet name="1st_order_low_pass">
<global>
var prevY = 0
Expand All @@ -31,14 +31,14 @@ prevY = alpha * value + (1.-alpha) * prevY
return prevY
</equation>
</snippet>

<snippet name="quaternion_to_euler">
<global/>
<equation>
return quaternionToEulerAngle($$x$$, $$y$$, $$z$$, $$w$$)[2]; // yaw in degrees
</equation>
</snippet>

<snippet name="geographic_coordinates_distance">
<global>
// see https://geographiclib.sourceforge.io/1.49/js
Expand Down
2 changes: 1 addition & 1 deletion datasamples/rosbag2_test/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ rosbag2_bagfile_information:
name: /pose
type: geometry_msgs/msg/PoseStamped
serialization_format: cdr
message_count: 1565
message_count: 1565
1 change: 0 additions & 1 deletion installer/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
<DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary>
<RunProgram>@TargetDir@/PlotJuggler</RunProgram>
</Installer>

4 changes: 2 additions & 2 deletions installer/io.plotjuggler.application/meta/installscript.qs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ Component.prototype.createOperations = function()
component.addOperation("CreateShortcut", "@TargetDir@/PlotJuggler.exe", "@StartMenuDir@/PlotJuggler.lnk",
"workingDirectory=@TargetDir@", "iconId=0", "description=Launch PlotJuggler");
component.addOperation("CreateShortcut", "@TargetDir@/PlotJuggler.exe", "@DesktopDir@/PlotJuggler.lnk",
"workingDirectory=@TargetDir@", "iconId=0", "description=Launch PlotJuggler");
}
"workingDirectory=@TargetDir@", "iconId=0", "description=Launch PlotJuggler");
}
} catch (e) {
console.log(e);
}
Expand Down
1 change: 0 additions & 1 deletion installer/io.plotjuggler.application/meta/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@
<Default>script</Default>
<Script>installscript.qs</Script>
</Package>

9 changes: 5 additions & 4 deletions plotjuggler_app/curvelist_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
//-------------------------------------------------

CurveListPanel::CurveListPanel(PlotDataMapRef& mapped_plot_data,
const TransformsMap& mapped_math_plots,
QWidget* parent)
const TransformsMap& mapped_math_plots, QWidget* parent)
: QWidget(parent)
, ui(new Ui::CurveListPanel)
, _plot_data(mapped_plot_data)
Expand Down Expand Up @@ -562,10 +561,12 @@ void CurveListPanel::on_pushButtonTrash_clicked(bool)
QSettings settings;
QString theme = settings.value("StyleSheet::theme", "light").toString();

QPushButton* buttonAll = msgBox.addButton(tr("Delete All"), QMessageBox::DestructiveRole);
QPushButton* buttonAll =
msgBox.addButton(tr("Delete All"), QMessageBox::DestructiveRole);
buttonAll->setIcon(LoadSvg(":/resources/svg/clear.svg"));

QPushButton* buttonPoints = msgBox.addButton(tr("Delete Points"), QMessageBox::DestructiveRole);
QPushButton* buttonPoints =
msgBox.addButton(tr("Delete Points"), QMessageBox::DestructiveRole);
buttonPoints->setIcon(LoadSvg(":/resources/svg/point_chart.svg"));

msgBox.addButton(QMessageBox::Cancel);
Expand Down
Loading

0 comments on commit 7df5162

Please sign in to comment.