diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 377282ec2..a9e665b3f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package plotjuggler ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* add "prefix and merge" checkbox +* fix warning "transparent.png" +* fix issue `#912 `_ +* Contributors: Davide Faconti + 3.8.6 (2024-01-09) ------------------ * fix issue `#906 `_: support nanoseconds timestamp in csv diff --git a/CMakeLists.txt b/CMakeLists.txt index 013a17514..0c12d11a5 100644 --- a/CMakeLists.txt +++ b/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.7) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/plotjuggler_app/mainwindow.cpp b/plotjuggler_app/mainwindow.cpp index 2b0c249f9..28ae36301 100644 --- a/plotjuggler_app/mainwindow.cpp +++ b/plotjuggler_app/mainwindow.cpp @@ -758,8 +758,12 @@ QStringList MainWindow::initializePlugins(QString directory_name) } else if (message_parser) { - _parser_factories.insert( - std::make_pair(message_parser->encoding(), message_parser)); + QStringList encodings = QString(message_parser->encoding()).split(";"); + auto parser_ptr = std::shared_ptr(message_parser); + for(const QString& encoding: encodings) + { + _parser_factories[encoding] = parser_ptr; + } } else if (streamer) { diff --git a/plotjuggler_base/include/PlotJuggler/messageparser_base.h b/plotjuggler_base/include/PlotJuggler/messageparser_base.h index f57d00e5d..f45f4cda8 100644 --- a/plotjuggler_base/include/PlotJuggler/messageparser_base.h +++ b/plotjuggler_base/include/PlotJuggler/messageparser_base.h @@ -143,6 +143,7 @@ class ParserFactoryPlugin : public PlotJugglerPlugin // provide an identifier of the provided encoding. // example "ros1", "ros2", "json", "protobuf", etc. + // If more than one, separate the name using semicolon virtual const char* encoding() const = 0; // create an instance of MessageParser, already configured to