Merge branch 'main' of github.com:facontidavide/PlotJuggler into main

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,11 @@
-Thanks for contributing to PlotJuggler. You are great!
-
 # Problem description
 
-Describe the problem and the expected behavior. Use screenshots of video if approriate.
+Describe the problem and the expected behavior. Use screenshots or a video, if applicable.
 
-# Steps to reproduce (important)
+# Answer these questions (or I will ignore your issue)
 
-- Describe your platform / Operative System.
-- 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".
-- 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.
+1. Describe your platform / Operative System and the **version of PlotJuggler** you are using.
+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.
 

.github/workflows/snap_core20.yaml

@@ -3,11 +3,6 @@ on:
   push:
     tags:
       - '*'
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
   workflow_dispatch:
 
 jobs:

.github/workflows/snap_core22.yaml

@@ -3,11 +3,6 @@ on:
   push:
     tags:
       - '*'
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
   workflow_dispatch:
 
 jobs:

CHANGELOG.rst

@@ -2,6 +2,21 @@
 Changelog for package plotjuggler
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.8.8 (2024-01-18)
+------------------
+* new update screen
+* Update README.md
+* dig diagnostic messages
+* fix snap in CI
+* Contributors: Davide Faconti
+
+3.8.7 (2024-01-16)
+------------------
+* add "prefix and merge" checkbox
+* fix warning "transparent.png"
+* fix issue `#912 <https://github.com/facontidavide/PlotJuggler/issues/912>`_
+* Contributors: Davide Faconti
+
 3.8.6 (2024-01-09)
 ------------------
 * fix issue `#906 <https://github.com/facontidavide/PlotJuggler/issues/906>`_: support nanoseconds timestamp in csv

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2)
 
-PROJECT(plotjuggler LANGUAGES C CXX VERSION 3.8.6)
+PROJECT(plotjuggler LANGUAGES C CXX VERSION 3.8.8)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

README.md

@@ -31,8 +31,8 @@ Noteworthy features:
 
 - Load CSV files.
 - Load [ULog](https://dev.px4.io/v1.9.0/en/log/ulog_file_format.html) (PX4).
-- Subscribe to many different streaming sources: MQTT, Websockets, ZeroMQ, UDP, etc.
-- Understands data formats such as JSON, CBOR, BSON, Message Pack, etc.
+- Subscribe to many different streaming sources: MQTT, WebSockets, ZeroMQ, UDP, etc.
+- Understand data formats such as JSON, CBOR, BSON, Message Pack, etc.
 - Well integrated with [ROS](https://www.ros.org/): open *rosbags* and/or subscribe to ROS *topics* (both ROS1 and ROS2).
 - Supports the [Lab Streaming Layer](https://labstreaminglayer.readthedocs.io/info/intro.html), that is used by [many devices](https://labstreaminglayer.readthedocs.io/info/supported_devices.html).
 - Easily add your custom data source and/or formats...
@@ -45,7 +45,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, that allows you to create Multi-input / Single-output functions
+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). 
 
 If you are not familiar with Lua, don't be afraid, you won't need more than 5 minutes to learn it ;)
@@ -62,7 +62,7 @@ To learn how to use PlotJuggler, check the tutorials here:
 
 ## Supported plugins
 
-Some plugin can be found in a different repository. The individual README files
+Some plugins can be found in a different repository. The individual README files
 *should* include all the information needed to compile and use the plugin.
 
 Please submit specific issues, Pull Requests and questions on the related Github repository:
@@ -77,6 +77,24 @@ If you want a simple example to learn how to write your own plugins, have a look
 
 ## Installation
 
+## Snap (recommended in Ubuntu, to ROS users too)
+
+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)
+
+To install it in Ubuntu 22.04, with ROS2 support, run:
+
+```
+sudo snap install plotjuggler
+```
+
+If you are still using ROS1 (Ubuntu 20.04), install instead:
+
+```
+sudo snap install plotjuggler-ros
+```
+
 ### Binary installers
 
 Note that these installers do __not__ include ROS plugins.
@@ -108,37 +126,19 @@ ros2 run plotjuggler plotjuggler
 
 ROS plugins are available in a separate repository: https://github.com/PlotJuggler/plotjuggler-ros-plugins
 
-Refer to the instructions in that repository if you want to compile PJ and its ROS plugins from source.
-
-## Install with Snap
-
-This massive file will install a version of PlotJuggler that can work with both ROS1 and ROS2. 
-
-![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)
-
-To install it in Ubuntu 22.04, with ROS2 support, run:
-
-```
-sudo snap install plotjuggler
-```
-
-If you are still use ROS1 (Ubuntu 20.04), install instead:
-
-```
-sudo snap install plotjuggler-ros
-```
+Please take a look at the instructions in that repository if you want to compile PJ and its ROS plugins from source.
 
 
 ## Compile from source
 
-You can find find the detailed instructions here: [COMPILE.md](COMPILE.md).
+You can find the detailed instructions here: [COMPILE.md](COMPILE.md).
 
 # Sponsorship and commercial support
 
-PlotJuggler required a lot of work to be developed; my goal is to build the most 
-intuitive and powerfull tool to visualize data and timeseries.
+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 making a donation on [PayPal](https://www.paypal.me/facontidavide) or become 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 
@@ -148,9 +148,9 @@ support from the main author, [Davide Faconti](mailto:[email protected]).
 # License
 
 PlotJuggler is released under the [Mozilla Public License Version 2.0](LICENSE.md),
-which allows user to develop closed-source plugins.
+which allows users to develop closed-source plugins.
 
-Please note that some third party dependencies (including Qt) use the
+Please note that some third-party dependencies (including Qt) use the
 **GNU Lesser General Public License**.
 
 # Star History

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>plotjuggler</name>
-    <version>3.8.6</version>
+    <version>3.8.8</version>
     <description>PlotJuggler: juggle with data</description>
 
     <maintainer email="[email protected]">Davide Faconti</maintainer>

plotjuggler_app/CMakeLists.txt

@@ -15,6 +15,7 @@ QT5_WRAP_UI ( UI_SRC
     preferences_dialog.ui
     suggest_dialog.ui
     new_release_dialog.ui
+    changelog_dialog.ui
     multifile_prefix.ui
     colormap_editor.ui
     colormap_selector.ui
@@ -101,7 +102,7 @@ add_executable(plotjuggler
     ${PLOtJUGGLER_SRC}
     ${RES_SRC}
     ${UI_SRC}
-    ${BACKWARD_ENABLE} )
+    ${BACKWARD_ENABLE})
 
 if (NOT WIN32)
     add_backward(plotjuggler)

plotjuggler_app/changelog_dialog.ui

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChangelogDialog</class>
+ <widget class="QDialog" name="ChangelogDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>300</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>500</width>
+    <height>300</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>PlotJuggler</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:700;&quot;&gt;New Version Installed&lt;br/&gt;&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;The latest release of PlotJuggler includes several bug fixed and new features.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="buttonChangelog">
+     <property name="text">
+      <string>See changelog</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkBox">
+     <property name="text">
+      <string>Don't show again</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ChangelogDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ChangelogDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>