From f8f7564911c9d7bfb9f00a2b9a210c4276566fa2 Mon Sep 17 00:00:00 2001 From: Maurice ONeal Date: Sat, 17 Dec 2022 20:40:52 -0500 Subject: [PATCH] v1.5.t12 Turned off caching for all web interface pages. Opencv will no longer be compiled from source as part the setup.sh script, instead the libopencv-dev package will be installed. --- .gitignore | 6 +----- setup.sh | 17 ++--------------- src/common.h | 2 +- src/logger.cpp | 3 +++ src/web.cpp | 6 ++++++ 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7f8a1b3..6620139 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,7 @@ target_wrapper.* # QtCreator CMake CMakeLists.txt.user* -# QtCreator 4.8< compilation database +# QtCreator 4.8< compilation database compile_commands.json # QtCreator local machine specific files for imported projects @@ -57,7 +57,3 @@ compile_commands.json # Build folders /.build-mow -/.build-opencv - -# Opencv src folder -/src/opencv diff --git a/setup.sh b/setup.sh index 19e23af..363673f 100644 --- a/setup.sh +++ b/setup.sh @@ -3,22 +3,9 @@ apt update -y apt install -y pkg-config apt install -y cmake g++ wget unzip git ffmpeg gstreamer1.0* libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev +apt install -y x264 libx264-dev +apt install -y libopencv-dev apache2 add-apt-repository -y ppa:ubuntu-toolchain-r/test apt update -y apt install -y gcc-10 gcc-10-base gcc-10-doc g++-10 apt install -y libstdc++-10-dev libstdc++-10-doc -cd ./src -if [ -d "./opencv" ] -then - cd ./opencv - git pull origin - cd .. -else - git clone https://github.com/opencv/opencv.git -fi -cd .. -mkdir -p ./.build-opencv -cd ./.build-opencv -cmake ../src/opencv -make -j4 -make install diff --git a/src/common.h b/src/common.h index 3505b05..e95ea05 100644 --- a/src/common.h +++ b/src/common.h @@ -35,7 +35,7 @@ using namespace cv; using namespace std; using namespace std::filesystem; -#define APP_VER "1.5.t11" +#define APP_VER "1.5.t12" #define APP_NAME "Motion Watch" struct shared_t diff --git a/src/logger.cpp b/src/logger.cpp index bbecd07..7ba30e3 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -76,6 +76,9 @@ void initLogFrontPage(const string &filePath, const string &logLinesFile) htmlText += "};\n"; htmlText += "\n"; htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; htmlText += "\n"; htmlText += "\n"; htmlText += "\n"; diff --git a/src/web.cpp b/src/web.cpp index 10809d5..9adae51 100644 --- a/src/web.cpp +++ b/src/web.cpp @@ -22,6 +22,9 @@ void genHTMLul(const string &outputDir, const string &title, shared_t *share) htmlText += "\n"; htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; htmlText += "\n"; htmlText += "\n"; htmlText += "\n"; @@ -90,6 +93,9 @@ void genHTMLvid(const string &outputVid, shared_t *share) htmlText += "\n"; htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; + htmlText += "\n"; htmlText += "\n"; htmlText += "\n"; htmlText += "\n";