Skip to content

Commit

Permalink
fix(Page_Device.qml): fix a bug.
Browse files Browse the repository at this point in the history
1. fix a bug when change stripe parameter and change page, but parameters will not apply.
2. update README.md, more clearly build document.

ci(workflows/windows.yml): update pcl from 1.12.1 to 1.14.1
  • Loading branch information
Practice3DVision committed Jun 14, 2024
1 parent 510ac44 commit d1a0fe4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,20 @@ jobs:
- name: Download and extract PCL source
run: |
cd ..
Invoke-WebRequest -Uri https://github.com/PointCloudLibrary/pcl/archive/refs/tags/pcl-1.12.1.zip -OutFile pcl-pcl-1.12.1.zip
Expand-Archive -Path pcl-pcl-1.12.1.zip -DestinationPath .
Invoke-WebRequest -Uri https://github.com/PointCloudLibrary/pcl/archive/refs/tags/pcl-1.14.1.zip -OutFile pcl-pcl-1.14.1.zip
Expand-Archive -Path pcl-pcl-1.14.1.zip -DestinationPath .
- name: Configure and build PCL
run: |
cd ../pcl-pcl-1.12.1
cd ../pcl-pcl-1.14.1
mkdir build
cd build
cmake .. -DBUILD_visualization:BOOL=ON -DBUILD_TESTS:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=OFF -DCMAKE_INSTALL_PREFIX="C:/Program Files/PCL" -DWITH_OPENNI:BOOL=OF -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=ON -DVTK_DIR="C:\Program Files\VTK\lib\cmake\vtk-9.2" -DPCL_DIR="C:\Program Files\PCL\cmake" -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DBUILD_outofcore=OFF -DBUILD_tools=OFF
cmake --build . --config Release --parallel
- name: Install PCL
run: |
cd ../pcl-pcl-1.12.1/build
cd ../pcl-pcl-1.14.1/build
cmake --install . --config Release
- uses: actions/checkout@v3
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

该软件相关博客可见公众号专栏:[从0到1搭建一套属于你自己的高精度实时结构光3D相机](https://mp.weixin.qq.com/s/E8K3892eNVJfgpMUHtf9Lw),欢迎关注公众号。

您的**Star**⭐和关注是博主源源不断的动力。有任何问题和**bug**反馈请提**Issue**。谢绝不给Star⭐,反复咨询解决方案的情况,累且心寒...
请动动小手点击右上角的**Star**⭐,您的**Star**⭐和关注是博主源源不断的动力。

有任何问题和**bug**反馈请提**Issue**。谢绝不给**Star**⭐,反复咨询解决方案的情况。

**想先体验该软件?**

Expand Down Expand Up @@ -52,7 +54,7 @@
5. 下载[PCL-1.12.1-AllInOne](https://github.com/PointCloudLibrary/pcl/releases)进行安装,安装完成后删除`PCL`安装文件夹下的除`3rdParty`外的其它任何文件,并将`3rdParty`文件夹中的`VTK`文件夹删除
6. 下载[PCL](https://github.com/PointCloudLibrary/pcl/tree/pcl-1.12.1)并选择好第三方库路径进行编译
7. 打开命令行窗口,键入`git clone --recursive https://github.com/Practice3DVision/SLMaster.git`克隆`SLMaster`
8. 打开`VSCode`编译运行`SLMasterGui`即可
8. 打开您喜欢的编译器,使用`Ninja`生成器,将编译目录设置为`${work_space}/build`编译运行`SLMasterGui`即可

> 注意!
> 每当编译好一个库都应当在系统环境变量中加入。例如,编译完成OpenCV后,设置好系统环境变量OpenCV_DIR路径。
Expand Down
Binary file modified gui/qml/res/image/wechat.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions gui/qml/ui/page/Page_Device.qml
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,11 @@ FluContentPage{
GlobalSignals.cameraParamsUpdate();
}
}

/*
Component.onCompleted: {
//CameraEngine.selectCamera(root.camera_type);
//root.updateParams();
GlobalSignals.cameraParamsUpdate();
}
*/
}

FluButton {
Expand Down

0 comments on commit d1a0fe4

Please sign in to comment.