diff --git a/.gitlab/ci/CMakePresets.json b/.gitlab/ci/CMakePresets.json index 8e8c4832e2d6e85ea7bd954d8583c434e5b464ef..052d7fda0d3c013b617a2f4add413524d1cc5120 100644 --- a/.gitlab/ci/CMakePresets.json +++ b/.gitlab/ci/CMakePresets.json @@ -29,7 +29,7 @@ "name": "ci_ubuntu22_debug", "inherits": ["ci_common"], "filter": { - "exclude": {"name": "TestVelodyneHDLPositionReader"} + "exclude": {"name": "TestVelodyneHDLPositionReader|TestVelodyneLidarStream_HDL_64_Dual|TestExtractPointSelection"} } }, { diff --git a/.gitlab/ci/configure_ubuntu22_debug_tidy.cmake b/.gitlab/ci/configure_ubuntu22_debug_tidy.cmake index d886ef0a083dbbde7d17577cac5ca1212c20b2d6..289e917b3c2f827c9b9d6cca7521f40effe39c03 100644 --- a/.gitlab/ci/configure_ubuntu22_debug_tidy.cmake +++ b/.gitlab/ci/configure_ubuntu22_debug_tidy.cmake @@ -3,5 +3,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/configure_ubuntu22_debug.cmake") # Treats warnings as errors set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra" CACHE STRING "") +# Ignore deprecation warning to be able to build +set(LIDARVIEW_HIDE_DEPRECATION_WARNINGS ON CACHE BOOL "") + # Create a compilation database for the analize stage (clang-tidy) set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "") diff --git a/.gitlab/ci/docker/ubuntu22/Dockerfile b/.gitlab/ci/docker/ubuntu22/Dockerfile index 2b8fd2cbc4cbffa6cb0b251fc62a5e460029b175..5b91aca8bd3e05d81a05f556d64eb39623eecdd2 100644 --- a/.gitlab/ci/docker/ubuntu22/Dockerfile +++ b/.gitlab/ci/docker/ubuntu22/Dockerfile @@ -14,4 +14,5 @@ COPY install_nanoflann.sh /root/install_nanoflann.sh RUN sh /root/install_nanoflann.sh COPY install_tins.sh /root/install_tins.sh +COPY tins-fix-cmake-config-install.patch /root/tins-fix-cmake-config-install.patch RUN sh /root/install_tins.sh diff --git a/.gitlab/ci/docker/ubuntu22/install_tins.sh b/.gitlab/ci/docker/ubuntu22/install_tins.sh index f69d0b744a6f97fd359493cdfb8a605b8d649087..ede0eb7022358aca0a48b0d44a506dc40ad01a8c 100755 --- a/.gitlab/ci/docker/ubuntu22/install_tins.sh +++ b/.gitlab/ci/docker/ubuntu22/install_tins.sh @@ -18,6 +18,7 @@ curl -OL "https://github.com/mfontanini/libtins/archive/refs/tags/v$version.tar. sha256sum --check tins.sha256sum mkdir -p "$tins_src" tar -xf "$tarball" -C "$tins_src" --strip-components 1 --no-same-owner +cd "$tins_src" && git apply "/root/tins-fix-cmake-config-install.patch" tins_build () { local prefix="$1" diff --git a/.gitlab/ci/docker/ubuntu22/tins-fix-cmake-config-install.patch b/.gitlab/ci/docker/ubuntu22/tins-fix-cmake-config-install.patch new file mode 100644 index 0000000000000000000000000000000000000000..171d4cd36bd22fe631767971f218be5e7c5bf3ca --- /dev/null +++ b/.gitlab/ci/docker/ubuntu22/tins-fix-cmake-config-install.patch @@ -0,0 +1,135 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 696385f..81ad0c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) + PROJECT(libtins) + + OPTION(LIBTINS_BUILD_EXAMPLES "Build examples" ON) +@@ -317,11 +317,7 @@ ENDIF() + # CMake project configuration export + # ********************************** + +-if(UNIX) +- set(CONF_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libtins") +-else() +- set(CONF_CMAKE_INSTALL_DIR CMake) +-endif() ++set(CONF_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libtins") + + # Add all targets to the build-tree export set + EXPORT( +@@ -332,23 +328,33 @@ EXPORT( + # Export the package for use from the build-tree + # (this registers the build-tree with a global CMake-registry) + EXPORT(PACKAGE libtins) ++INCLUDE(CMakePackageConfigHelpers) + + # Create the libtinsConfig.cmake and libtinsConfigVersion.cmake files + # for the build tree +-SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include") +-CONFIGURE_FILE( ++SET(CONF_INCLUDE_DIRS "include") ++CONFIGURE_PACKAGE_CONFIG_FILE( + cmake/libtinsConfig.cmake.in +- "${PROJECT_BINARY_DIR}/libtinsConfig.cmake" @ONLY ++ "${PROJECT_BINARY_DIR}/libtinsConfig.cmake" ++ INSTALL_DESTINATION ${CONF_CMAKE_INSTALL_DIR} ++ PATH_VARS CONF_INCLUDE_DIRS + ) + CONFIGURE_FILE( + cmake/libtinsConfigVersion.cmake.in + "${PROJECT_BINARY_DIR}/libtinsConfigVersion.cmake" @ONLY + ) ++CONFIGURE_FILE( ++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindPCAP.cmake" ++ "${PROJECT_BINARY_DIR}/FindPCAP.cmake" ++ COPYONLY ++) ++ + # Install the libtinsConfig.cmake and libtinsConfigVersion.cmake + INSTALL( + FILES + "${PROJECT_BINARY_DIR}/libtinsConfig.cmake" + "${PROJECT_BINARY_DIR}/libtinsConfigVersion.cmake" ++ "${PROJECT_BINARY_DIR}/FindPCAP.cmake" + DESTINATION ${CONF_CMAKE_INSTALL_DIR} + COMPONENT dev + ) +diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake +index 388b30b..f931e31 100644 +--- a/cmake/Modules/FindPCAP.cmake ++++ b/cmake/Modules/FindPCAP.cmake +@@ -42,10 +42,18 @@ find_library(PCAP_LIBRARY + HINTS ${HINT_DIR} + ) + ++if (PCAP_LIBRARY AND PCAP_INCLUDE_DIR) ++ add_library(PCAP::pcap UNKNOWN IMPORTED) ++ set_target_properties(PCAP::pcap ++ PROPERTIES ++ IMPORTED_LOCATION "${PCAP_LIBRARY}" ++ INTERFACE_INCLUDE_DIRECTORIES "${PCAP_INCLUDE_DIR}") ++ set(PCAP_LIBRARIES PCAP::pcap) ++endif () ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(PCAP DEFAULT_MSG +- PCAP_LIBRARY +- PCAP_INCLUDE_DIR ++ PCAP_LIBRARIES PCAP_LIBRARY PCAP_INCLUDE_DIR + ) + + include(CheckCXXSourceCompiles) +diff --git a/cmake/libtinsConfig.cmake.in b/cmake/libtinsConfig.cmake.in +index 183b245..fa8fd2f 100644 +--- a/cmake/libtinsConfig.cmake.in ++++ b/cmake/libtinsConfig.cmake.in +@@ -3,14 +3,29 @@ + # LIBTINS_INCLUDE_DIRS - include directories for libtins + # LIBTINS_LIBRARIES - libraries to link against + +-# Compute paths ++@PACKAGE_INIT@ ++ ++set("${CMAKE_FIND_PACKAGE_NAME}_CMAKE_MODULE_PATH_save" "${CMAKE_MODULE_PATH}") ++list(INSERT CMAKE_MODULE_PATH 0 ++ "${CMAKE_CURRENT_LIST_DIR}") ++ + get_filename_component(LIBTINS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-set(LIBTINS_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") ++set_and_check(LIBTINS_INCLUDE_DIRS "@PACKAGE_CONF_INCLUDE_DIRS@") ++ ++include(CMakeFindDependencyMacro) ++find_dependency(PCAP) + + # Our library dependencies (contains definitions for IMPORTED targets) + if(NOT TARGET libtins AND NOT LIBTINS_BINARY_DIR) + include("${LIBTINS_CMAKE_DIR}/libtinsTargets.cmake") ++ ++ set_target_properties(tins ++ PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${LIBTINS_INCLUDE_DIRS}") + endif() + + # These are IMPORTED targets created by libtinsTargets.cmake + set(LIBTINS_LIBRARIES tins) ++ ++set(CMAKE_MODULE_PATH "${${CMAKE_FIND_PACKAGE_NAME}_CMAKE_MODULE_PATH_save}") ++unset("${CMAKE_FIND_PACKAGE_NAME}_CMAKE_MODULE_PATH_save") +\ No newline at end of file +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 88f47a2..e14f519 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -212,7 +212,7 @@ ADD_LIBRARY( + ${HEADERS} + ) + +-TARGET_LINK_LIBRARIES(tins ${PCAP_LIBRARY} ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS}) ++TARGET_LINK_LIBRARIES(tins PUBLIC ${PCAP_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS}) + + SET_TARGET_PROPERTIES(tins PROPERTIES OUTPUT_NAME tins) + SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIBTINS_VERSION} ) diff --git a/.gitlab/ci/excluded_tests.md b/.gitlab/ci/excluded_tests.md index 29513f6bac2310666f72f558ed6903452fb18778..626319bf56e116300d7bf9d66d23d417bfd2616d 100644 --- a/.gitlab/ci/excluded_tests.md +++ b/.gitlab/ci/excluded_tests.md @@ -8,3 +8,4 @@ ## ci-ubuntu22-debug - `TestVelodyneHDLPositionReader` -> doesn't find proj.db, gdal issue? +- `TestVelodyneLidarStream_HDL_64` -> Stream 2nd frame wrong since [lidarview-core!542](https://gitlab.kitware.com/LidarView/lidarview-core/-/merge_requests/542) update diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 3f9bd8e61a25a40d5e444c3422757d7930f1c6cb..e9c36bc827815f48595c8fb60cd15ac281ac274c 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -8,7 +8,7 @@ .ubuntu22: extends: .linux - image: "gitlab.kitware.com:4567/lidarview/lidarview:ci-ubuntu22-20241015" + image: "gitlab.kitware.com:4567/lidarview/lidarview:ci-ubuntu22-20241104" .ubuntu22_debug: extends: .ubuntu22 diff --git a/Application/Client/CMakeLists.txt b/Application/Client/CMakeLists.txt index 82d39c29f3ca4fe4b26394cc07f2cbea1c68690d..d6166cc530451f4ea6aaf22927895c1f04fe4f36 100644 --- a/Application/Client/CMakeLists.txt +++ b/Application/Client/CMakeLists.txt @@ -39,19 +39,11 @@ if (LIDARVIEW_USE_LIDARSLAM_PLUGIN) list(APPEND plugins_targets LidarSlam::paraview_wrapping) endif () -if (LIDARVIEW_USE_ROS2IO_PLUGIN) - list(APPEND plugins_targets Ros2IO::paraview_plugin) -endif () - -if (LIDARVIEW_USE_PCLPLUGIN_PLUGIN) - list(APPEND plugins_targets PCLPlugin::paraview_plugin) -endif () - paraview_client_add( NAME ${SOFTWARE_NAME} NAMESPACE "${SOFTWARE_NAME}" EXPORT "LidarViewClient" - VERSION ${LIDARVIEW_VERSION_FULL} + VERSION "${LIDARVIEW_VERSION_MAJOR}.${LIDARVIEW_VERSION_MINOR}.${LIDARVIEW_VERSION_PATCH}" APPLICATION_NAME "${SOFTWARE_NAME}" ORGANIZATION "${SOFTWARE_VENDOR}" TITLE "${SOFTWARE_NAME} ${LIDARVIEW_VERSION_FULL}" diff --git a/Application/Client/LidarViewMainWindow.cxx b/Application/Client/LidarViewMainWindow.cxx index fa58a0de381f75c4d7d108b98ec17926954e7b93..27584701e08a6b3475bdf0e71a54b8104f898ba6 100644 --- a/Application/Client/LidarViewMainWindow.cxx +++ b/Application/Client/LidarViewMainWindow.cxx @@ -57,6 +57,7 @@ typedef pqPythonDebugLeaksView DebugLeaksViewType; #include "lqLiveSourceScalarColoringBehavior.h" #include "lqOpenLidarReaction.h" #include "lqRecentlyUsedPcapLoader.h" +#include "lqViewFrameActionsImplementation.h" #include "lqWelcomeDialog.h" //----------------------------------------------------------------------------- @@ -107,6 +108,10 @@ LidarViewMainWindow::LidarViewMainWindow() this->tabifyDockWidget(this->Internals->propertiesDock, this->Internals->viewPropertiesDock); this->tabifyDockWidget(this->Internals->propertiesDock, this->Internals->displayPropertiesDock); + this->tabifyDockWidget(this->Internals->propertiesDock, this->Internals->comparativePanelDock); + + // Set properties panel as default dock + this->Internals->propertiesDock->raise(); // Change default properties panel modes (one dock for each) this->Internals->propertiesPanel->setPanelMode(pqPropertiesPanel::SOURCE_PROPERTIES); @@ -188,6 +193,10 @@ LidarViewMainWindow::LidarViewMainWindow() // To register ParaView interfaces. pqInterfaceTracker* pgm = pqApplicationCore::instance()->interfaceTracker(); + // Replace default views + pqParaViewBehaviors::setEnableStandardViewFrameActions(false); + pgm->addInterface(new lqViewFrameActionsImplementation(pgm)); + // Add recently used pcap interface pgm->addInterface(new lqRecentlyUsedPcapLoader(pgm)); diff --git a/Application/Client/LidarViewMainWindow.ui b/Application/Client/LidarViewMainWindow.ui index 010f5c67469894f219cf578dcbeb12b5ccf0684d..5474811c843b9781c8ee56a44e512349c57491e3 100644 --- a/Application/Client/LidarViewMainWindow.ui +++ b/Application/Client/LidarViewMainWindow.ui @@ -128,6 +128,18 @@ + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Comparative View Inspector + + + 2 + + + Properties @@ -173,6 +185,18 @@ + + + Qt::BottomDockWidgetArea|Qt::TopDockWidgetArea + + + Time Manager + + + 8 + + + false @@ -301,6 +325,12 @@ QStatusBar
lqStatusBar.h
+ + pqComparativeVisPanel + QWidget +
pqComparativeVisPanel.h
+ 1 +
pqPropertiesPanel QWidget @@ -313,6 +343,12 @@
pqProxyInformationWidget.h
1
+ + pqTimeManagerWidget + QWidget +
pqTimeManagerWidget.h
+ 1 +
pqMemoryInspectorPanel QWidget diff --git a/Application/Qt/ApplicationComponents/CMakeLists.txt b/Application/Qt/ApplicationComponents/CMakeLists.txt index 240fa5359dd8e2b7ac0f4dd0ad42d7393eb3f134..dff4602990e88e43be0c3389301b00c4f96b1db1 100644 --- a/Application/Qt/ApplicationComponents/CMakeLists.txt +++ b/Application/Qt/ApplicationComponents/CMakeLists.txt @@ -8,6 +8,7 @@ set(classes lqMainControlsToolbar lqMenuSaveAsReaction lqStatusBar + lqViewFrameActionsImplementation lqWelcomeDialog ) @@ -31,8 +32,8 @@ vtk_module_add_module(LidarViewApp::lvApplicationComponents SOURCES ${ui_files}) vtk_module_link(LidarViewApp::lvApplicationComponents PRIVATE - Qt5::Core - Qt5::Widgets) + "Qt${PARAVIEW_QT_MAJOR_VERSION}::Core" + "Qt${PARAVIEW_QT_MAJOR_VERSION}::Widgets") vtk_module_definitions(LidarViewApp::lvApplicationComponents PRIVATE QT_NO_KEYWORDS) include(FileModuleInstaller) diff --git a/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx b/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx index cddc766058372ba219f5facd569cf298914dc8e9..340e58c1f2a57437f6069131d1fc0be1dacbc845 100644 --- a/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx +++ b/Application/Qt/ApplicationComponents/lqLidarViewManager.cxx @@ -238,7 +238,8 @@ public: //----------------------------------------------------------------------------- void updateToolBarsLayout() { - QList toolbars = this->mainWindow->findChildren(); + QList toolbars = + this->mainWindow->findChildren(QString(), Qt::FindDirectChildrenOnly); nlohmann::json toolBarsConfig = this->currentJsonMode["toolbars"]; if (toolBarsConfig["show"].is_array()) diff --git a/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.cxx b/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.cxx new file mode 100644 index 0000000000000000000000000000000000000000..f153b138ef9ef73032107940f875eff69f91d889 --- /dev/null +++ b/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.cxx @@ -0,0 +1,44 @@ +/*========================================================================= + + Program: LidarView + Module: lqViewFrameActionsImplementation.cxx + + Copyright (c) Kitware, Inc. + All rights reserved. + See LICENSE or http://www.apache.org/licenses/LICENSE-2.0 for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notice for more information. + +=========================================================================*/ + +#include "lqViewFrameActionsImplementation.h" + +//----------------------------------------------------------------------------- +lqViewFrameActionsImplementation::lqViewFrameActionsImplementation(QObject* parent) + : Superclass(parent) +{ +} + +//----------------------------------------------------------------------------- +QList +lqViewFrameActionsImplementation::availableViewTypes() +{ + std::vector> option_view{ { "LidarGridView", "Render View" }, + { "ComparativeRenderView", "Comparative Render View" }, + { "RenderViewWithEDL", "Eye Dome Lighting Render View" }, + { "SpreadSheetView", "SpreadSheet View" }, + { "XYHistogramChartView", "Histogram View" }, + { "XYChartView", "Line Chart View" }, + { "PythonView", "Python View" } }; + QList views; + for (const auto& [key, value] : option_view) + { + pqStandardViewFrameActionsImplementation::ViewType info; + info.Name = QString(key.c_str()); + info.Label = QString(value.c_str()); + views.push_back(info); + } + return views; +} diff --git a/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.h b/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.h new file mode 100644 index 0000000000000000000000000000000000000000..ea0c7ad13f509973895d0819ff15572cfaff5b9e --- /dev/null +++ b/Application/Qt/ApplicationComponents/lqViewFrameActionsImplementation.h @@ -0,0 +1,45 @@ +/*========================================================================= + + Program: LidarView + Module: lqViewFrameActionsImplementation.h + + Copyright (c) Kitware, Inc. + All rights reserved. + See LICENSE or http://www.apache.org/licenses/LICENSE-2.0 for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notice for more information. + +=========================================================================*/ + +#ifndef lqViewFrameActionsImplementation_h +#define lqViewFrameActionsImplementation_h + +#include + +#include + +#include "lvApplicationComponentsModule.h" + +class LVAPPLICATIONCOMPONENTS_EXPORT lqViewFrameActionsImplementation + : public pqStandardViewFrameActionsImplementation +{ + Q_OBJECT + typedef pqStandardViewFrameActionsImplementation Superclass; + +public: + lqViewFrameActionsImplementation(QObject* parent = 0); + ~lqViewFrameActionsImplementation() override = default; + +protected: + /** + * Returns available view types in LidarView. + */ + QList availableViewTypes() override; + +private: + Q_DISABLE_COPY(lqViewFrameActionsImplementation); +}; + +#endif diff --git a/Application/Qt/Components/CMakeLists.txt b/Application/Qt/Components/CMakeLists.txt index 07f906f26b6be9362d64b521934f7a6cd28d73f7..01570a40c6a786d31bc386bd17026676455d34e9 100644 --- a/Application/Qt/Components/CMakeLists.txt +++ b/Application/Qt/Components/CMakeLists.txt @@ -25,7 +25,7 @@ vtk_module_add_module(LidarViewApp::lvComponents ${resource_files}) vtk_module_link(LidarViewApp::lvComponents PRIVATE - Qt5::Core - Qt5::Widgets) + "Qt${PARAVIEW_QT_MAJOR_VERSION}::Core" + "Qt${PARAVIEW_QT_MAJOR_VERSION}::Widgets") target_compile_definitions(lvComponents PRIVATE QT_NO_KEYWORDS) diff --git a/Application/Qt/Components/lqAboutDialog.cxx b/Application/Qt/Components/lqAboutDialog.cxx index 4bdcee081eccf047dde360f7197c49bdfae782d0..e46e37cf598482b0248f0f2c87b47eeaadd2c624 100644 --- a/Application/Qt/Components/lqAboutDialog.cxx +++ b/Application/Qt/Components/lqAboutDialog.cxx @@ -16,6 +16,8 @@ #include "lqAboutDialog.h" #include "ui_lqAboutDialog.h" +#include + #include #include @@ -94,6 +96,7 @@ void lqAboutDialog::AddClientInformation() ::addItem(tree, tr("ParaView Version"), QString(PARAVIEW_VERSION_FULL)); ::addItem(tree, tr("VTK Version"), QString(vtkVersion::GetVTKVersionFull())); ::addItem(tree, tr("Qt Version"), QT_VERSION_STR); + ::addItem(tree, tr("Libpcap Version"), pcap_lib_version()); ::addItem(tree, tr("vtkIdType size"), tr("%1bits").arg(8 * sizeof(vtkIdType))); diff --git a/Application/Qt/Components/vtk.module b/Application/Qt/Components/vtk.module index f72f4ab0745648a8734c356b2abf1071c66b5b7c..fad7ded9baf055f79dbb635bbb719545a305a7e2 100644 --- a/Application/Qt/Components/vtk.module +++ b/Application/Qt/Components/vtk.module @@ -10,4 +10,5 @@ PRIVATE_DEPENDS ParaView::pqComponents ParaView::RemotingViews VTK::CommonCore + Tins::tins EXCLUDE_WRAP diff --git a/LVCore b/LVCore index a03119a3dc6b2016cc9f4175b147ac68e5e69895..62123fe467028a65f870187430d9f5a9d5540cdc 160000 --- a/LVCore +++ b/LVCore @@ -1 +1 @@ -Subproject commit a03119a3dc6b2016cc9f4175b147ac68e5e69895 +Subproject commit 62123fe467028a65f870187430d9f5a9d5540cdc diff --git a/Plugins/LeishenPlugin b/Plugins/LeishenPlugin index ed7c81e0a792d44535f4dccf39cb41e112aecccd..5f6d3e5ff16d80ef10fc5c8c8556ea53c7463d85 160000 --- a/Plugins/LeishenPlugin +++ b/Plugins/LeishenPlugin @@ -1 +1 @@ -Subproject commit ed7c81e0a792d44535f4dccf39cb41e112aecccd +Subproject commit 5f6d3e5ff16d80ef10fc5c8c8556ea53c7463d85 diff --git a/Plugins/LivoxPlugin b/Plugins/LivoxPlugin index e25c3f71e5750ea0fc062b502ce471d226ae555f..2114d9b55204656170f762b8413b1846c11335d2 160000 --- a/Plugins/LivoxPlugin +++ b/Plugins/LivoxPlugin @@ -1 +1 @@ -Subproject commit e25c3f71e5750ea0fc062b502ce471d226ae555f +Subproject commit 2114d9b55204656170f762b8413b1846c11335d2 diff --git a/Plugins/RobosensePlugin b/Plugins/RobosensePlugin index 994d7f5053cd290839f566719cee1c558e7ebbe1..946875726b3f860da21fed89a7476db231629a09 160000 --- a/Plugins/RobosensePlugin +++ b/Plugins/RobosensePlugin @@ -1 +1 @@ -Subproject commit 994d7f5053cd290839f566719cee1c558e7ebbe1 +Subproject commit 946875726b3f860da21fed89a7476db231629a09 diff --git a/Plugins/VelodynePlugin b/Plugins/VelodynePlugin index a91c7306d050aa32b9685a0b1cb66b55fe4b660e..6f1856429da2494ed59247600a4ff4913dabff1c 160000 --- a/Plugins/VelodynePlugin +++ b/Plugins/VelodynePlugin @@ -1 +1 @@ -Subproject commit a91c7306d050aa32b9685a0b1cb66b55fe4b660e +Subproject commit 6f1856429da2494ed59247600a4ff4913dabff1c diff --git a/README.md b/README.md index b94ab2c597710b3f954686408d8b8fb98beb9424..d47fe3532776aa9b966c1689cdc62f0d180ea01d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ LidarView currently supports a variety of LiDAR models from multiple manufacture - `Velodyne`: VLP-16, VLP-32, HDL-32, HDL-64, Puck LITE, Puck Hi-Res and Alpha Prime (VLS-128). - `Hesai`: Pandar40P, Pandar40M, Pandar64, Pandar20A, Pandar20B, PandarQT, PandarXT-16, PandarXT-32, PandarXTM and Pandar128. - `Robosense`: RS16, RS32, BPerl, Helios (16 & 32), Ruby (48, 80 & 128), Ruby Plus (48, 80 & 128), M1, M2 and E1. -- `Livox`: Mid-360 and HAP. +- `Livox`: Mid-40, Tele-15, Horizon, Mid-70, Avia, Mid-360 and HAP. - `Leishen`: C16, C32 and MS_C16. Additional sensor models may be supported upon request, provided that the drivers or specifications are publicly available. diff --git a/version.txt b/version.txt index 6b244dcd6960b101b0ab4d9e5162d39632dec80c..831446cbd27a6de403344b21c9fa93a25357f43d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -5.0.1 +5.1.0