From b09ff1a19afff08fffcb8949c08d6c14d17ecdf7 Mon Sep 17 00:00:00 2001 From: Zii Date: Thu, 14 Sep 2023 14:53:18 -0400 Subject: [PATCH] v3.2 - added fuse3 to setup.sh since imagemagic depends on it - fixed the double program name bug in the detection log - releasing to main --- setup.sh | 2 +- src/camera.cpp | 2 +- src/common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.sh b/setup.sh index 075d907..e20843f 100644 --- a/setup.sh +++ b/setup.sh @@ -2,6 +2,6 @@ export DEBIAN_FRONTEND=noninteractive apt update -y apt install -y pkg-config cmake make g++ -apt install -y ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev x264 libx264-dev libilmbase-dev qt6-base-dev qtchooser qmake6 qt6-base-dev-tools libxkbcommon-dev libfuse-dev +apt install -y ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev x264 libx264-dev libilmbase-dev qt6-base-dev qtchooser qmake6 qt6-base-dev-tools libxkbcommon-dev libfuse-dev fuse3 cp ./bin/magick /usr/bin/magick chmod +x /usr/bin/magick diff --git a/src/camera.cpp b/src/camera.cpp index a8a5dab..6e54dd3 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -539,7 +539,7 @@ bool DetectLoop::exec() } else { - detLog(extComp.program() + " " + args.join(" ") + " --result: " + QString::number(score), shared); + detLog(args.join(" ") + " --result: " + QString::number(score), shared); if (score >= shared->imgThresh) { diff --git a/src/common.h b/src/common.h index 5d84f00..78a7f0e 100644 --- a/src/common.h +++ b/src/common.h @@ -30,7 +30,7 @@ using namespace std; -#define APP_VER "3.2.t3" +#define APP_VER "3.2" #define APP_NAME "Motion Watch" #define APP_BIN "mow" #define REC_LOG_NAME "rec_log_lines.html"