From 9d15aa9821a45b433527c801c54b6e133a70895c Mon Sep 17 00:00:00 2001 From: ysl-design <13178258592@163.com> Date: Fri, 26 May 2023 23:39:27 +0800 Subject: [PATCH] =?UTF-8?q?MViz=E6=96=B0=E5=A2=9E=E6=9B=B2=E7=BA=BF?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E5=90=8E=EF=BC=8C=E5=B7=B2=E7=BB=8F=E6=89=93?= =?UTF-8?q?=E5=8C=85=E4=BA=86qwt6.2.0=EF=BC=8Cslt=E6=9B=B2=E7=BA=BF?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85=E6=8C=87=E5=AF=BC=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++--- chart_plugin/CMakeLists.txt | 4 ++-- chart_plugin/doc/qwt_compile.md | 8 ++++---- third_party/{qwt-6.1.4 => qwt-6.2.0}/.gitkeep | 0 4 files changed, 10 insertions(+), 9 deletions(-) rename third_party/{qwt-6.1.4 => qwt-6.2.0}/.gitkeep (100%) diff --git a/README.md b/README.md index b3869d5..6183dfa 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ mviz_plugin是包含MViz（一款华为自研的可视化工具软件）、规 - 2.2 下载、编译Qwt依赖软件包。 ``` - 1.登录[Qwt软件包下载地址](https://sourceforge.net/projects/qwt/files/)下载安装包“qwt-6.1.4.tar.bz2“。 - 2.将下载完成的安装包拷贝到“third_party/qwt-6.1.4“目录下。 + 1.登录[Qwt软件包下载地址](https://sourceforge.net/projects/qwt/files/)下载安装包“qwt-6.2.0.tar.bz2“。 + 2.将下载完成的安装包拷贝到“third_party/qwt-6.2.0“目录下。 3.编译qwt，请参考“chart_plugin/doc/qwt_compile.md“文档。 ``` @@ -57,8 +57,9 @@ mviz_plugin是包含MViz（一款华为自研的可视化工具软件）、规 ``` cd ~/workspace/catkin_ws/ cp devel/lib/libchart_plugin.so .../MDC_Application_Visualizer-*/rviz_plugin/lib/ - cp src/third_party/qwt-6.1.4/qwt-6.1.4/build/lib/libqwt.so* .../MDC_Application_Visualizer-*/rviz_plugin/lib/ cp src/third_party/mathgl-2.4.4/mathgl-2.4.4/build/lib/libmgl* .../MDC_Application_Visualizer-*/rviz_plugin/lib/ + # 如果MViz包中已存在qwt的动态链接库，则可以不执行下面步骤 + cp src/third_party/qwt-6.2.0/qwt-6.2.0/build/lib/libqwt.so* .../MDC_Application_Visualizer-*/rviz_plugin/lib/ ``` - 4.2 将功能包的插件图标复制到MViz的发布包下。 diff --git a/chart_plugin/CMakeLists.txt b/chart_plugin/CMakeLists.txt index a49fa81..27bc85f 100755 --- a/chart_plugin/CMakeLists.txt +++ b/chart_plugin/CMakeLists.txt @@ -58,7 +58,7 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/slt_space/ui_slt_widget.cpp) link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/qwt-6.1.4/qwt-6.1.4/build/lib/ + ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/qwt-6.2.0/qwt-6.2.0/build/lib/ ${catkin_LIBRARY_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mathgl-2.4.4/mathgl-2.4.4/build/lib/ ${CMAKE_BINARY_DIR}/third_party/sysroot/opt/ros/${ROS_VERSION}/lib) @@ -71,7 +71,7 @@ target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES} mgl mg target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/qwt-6.1.4/qwt-6.1.4/build/include/ + ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/qwt-6.2.0/qwt-6.2.0/build/include/ ${catkin_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/mathgl-2.4.4/mathgl-2.4.4/build/include/ ${CMAKE_BINARY_DIR}/../devel/include/ diff --git a/chart_plugin/doc/qwt_compile.md b/chart_plugin/doc/qwt_compile.md index d3331a4..361445c 100644 --- a/chart_plugin/doc/qwt_compile.md +++ b/chart_plugin/doc/qwt_compile.md @@ -1,12 +1,12 @@ #qwt build介绍 1. 解压安装包。 - tar xjf qwt-6.1.4.tar.bz2 + tar xjf qwt-6.2.0.tar.bz2 2. 修改配置。 ``` - cd qwt-6.1.4 - sed -i 's/^\(.*QwtSvg\)/# \1/' qwtconfig.pri - sed -i 's/^\(.*QwtOpenGL\)/# \1/' qwtconfig.pri + cd qwt-6.2.0 + sed -i 's/QWT_CONFIG += QwtSvg/#QWT_CONFIG += QwtSvg/' qwtconfig.pri + sed -i 's/QWT_CONFIG += QwtOpenGL/#QWT_CONFIG += QwtOpenGL/' qwtconfig.pri INSTALL_PATH=`pwd` sed -i "s|^ *QWT_INSTALL_PREFIX.*$|QWT_INSTALL_PREFIX = $INSTALL_PATH/build|g" qwtconfig.pri diff --git a/third_party/qwt-6.1.4/.gitkeep b/third_party/qwt-6.2.0/.gitkeep similarity index 100% rename from third_party/qwt-6.1.4/.gitkeep rename to third_party/qwt-6.2.0/.gitkeep -- Gitee