PlotJuggler with Fast-CDR-2.x.x (#932)

facontidavide · Feb 20, 2024 · 5493e7a · 5493e7a
1 parent 4d06f95
commit 5493e7a
Show file tree

Hide file tree

Showing 36 changed files with 12,229 additions and 8,773 deletions.
diff --git a/plotjuggler_app/main.cpp b/plotjuggler_app/main.cpp
@@ -114,7 +114,7 @@ QPixmap getFunnySplashscreen()
   srand(time(nullptr));
 
   auto getNum = []() {
-    const int last_image_num = 93;
+    const int last_image_num = 94;
     int n = rand() % (last_image_num + 2);
     if (n > last_image_num)
     {

diff --git a/plotjuggler_app/resource.qrc b/plotjuggler_app/resource.qrc
@@ -109,6 +109,7 @@
         <file>resources/memes/meme_91.jpg</file>
         <file>resources/memes/meme_92.jpg</file>
         <file>resources/memes/meme_93.jpg</file>
+        <file>resources/memes/meme_94.jpg</file>
         <file>resources/office_chart_line_stacked.png</file>
         <file>resources/plotjuggler.svg</file>
         <file>resources/skin/about_window_body.html</file>

diff --git a/plotjuggler_app/resources/memes/meme_94.jpg b/plotjuggler_app/resources/memes/meme_94.jpg
diff --git a/plotjuggler_plugins/ParserROS/CMakeLists.txt b/plotjuggler_plugins/ParserROS/CMakeLists.txt
@@ -3,6 +3,10 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 
 SET(INTROSPECTION_TESTS OFF CACHE BOOL "Compile the tests")
+
+# Check if default fastCdr library generation is needed
+find_package(fastcdr QUIET)
+
 add_subdirectory(rosx_introspection)
 
 include_directories( rosx_introspection/include )

diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/configure.ac b/plotjuggler_plugins/ParserROS/rosx_introspection/3rdparty/Fast-CDR/configure.ac
@@ -19,9 +19,9 @@
 #
 # Define variables for the FastCDR version number.
 #
-m4_define([version_major],[1])
-m4_define([version_minor],[0])
-m4_define([version_micro],[24])
+m4_define([version_major],[2])
+m4_define([version_minor],[1])
+m4_define([version_micro],[3])
 
 AC_INIT([fastcdr], [version_major.version_minor.version_micro], [[email protected]], [eProsima FastCDR], [http://eprosima.com/])
 CONFIG_ARGS="$*"