Merge pull request #101 from ESE-Peasy/updates-for-new-release

Updates for v0.3.0 release

PosturePerfection_install.sh

@@ -5,11 +5,14 @@ BLUE='\033[0;34m'
 RED='\033[0;31m'
 NO_COLOUR='\033[0m'
 
-# Download the model
-printf "Downloading the EfficientPoseRT_Lite.tflite model..\n"
-mkdir models && cd models
+# Download the model and logo
+printf "Downloading additional dependencies...\n"
+mkdir -p models && cd models
 wget https://github.com/ESE-Peasy/PosturePerfection/raw/main/models/EfficientPoseRT_LITE.tflite
 cd ..
+mkdir -p images && cd images
+wget https://github.com/ESE-Peasy/PosturePerfection/blob/main/images/logo.png  
+cd ..
 
 # Download and install the PosturePerfection build of OpenCV
 # https://github.com/ESE-Peasy/opencv/releases/tag/v4.5.1-pp
@@ -20,14 +23,14 @@ case $OS  in
     *"armv7"*)
         wget "https://github.com/ESE-Peasy/opencv/releases/download/v4.5.1-pp/opencv-4.5.1_armhf.deb"
         sudo apt install ./opencv-4.5.1_armhf.deb
-        wget "https://github.com/ESE-Peasy/PosturePerfection/releases/download/v0.2.0/PosturePerfection_0.2.0_armv7l"
-        chmod u+x PosturePerfection_0.2.0_armv7l 
+        wget "https://github.com/ESE-Peasy/PosturePerfection/releases/download/v0.3.0/PosturePerfection_0.3.0_armv7l"
+        chmod u+x PosturePerfection_0.3.0_armv7l 
         ;;
     *"x86"*)
         wget "https://github.com/ESE-Peasy/opencv/releases/download/v4.5.1-pp/opencv-4.5.1_x86.deb"
         sudo apt install ./opencv-4.5.1_x86.deb
-        wget "https://github.com/ESE-Peasy/PosturePerfection/releases/download/v0.2.0/PosturePerfection_0.2.0_x86_64"
-        chmod u+x PosturePerfection_0.2.0_x86_64
+        wget "https://github.com/ESE-Peasy/PosturePerfection/releases/download/v0.3.0/PosturePerfection_0.3.0_x86_64"
+        chmod u+x PosturePerfection_0.3.0_x86_64
         ;;
     *)
         printf -e "${RED}Unfortunately PosturePerfection is not yet supported on your system.${NO_COLOUR}\n"
@@ -39,4 +42,5 @@ sudo ldconfig
 
 printf "${B_GREEN}PosturePerfection has been successfully installed!\n\n"
 
-printf "${GREEN}Run ./PosturePerfection_0.2.0_xxx to run our graphical user interface which displays real time posture estimation. You will see the values for the co-ordinate and trustworthiness change as you move around your camera!${NO_COLOUR}\n\n"
+printf "${GREEN}Run ./PosturePerfection_0.3.0_xxx to run our graphical user interface which displays real time posture estimation. Lines are drawn between
+your Head, Neck, Shoulder and Hip to demonstrate your detected posture!${NO_COLOUR}\n\n"

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(CMAKE_CXX_STANDARD 11)
 cmake_minimum_required(VERSION 3.16) # Required by TFL
-project(PosturePerfection VERSION 0.1.0)
+project(PosturePerfection VERSION 0.3.0)
 
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic")
 

src/gui/CMakeLists.txt

@@ -38,4 +38,4 @@ target_link_libraries(PosturePerfection_gui
 )
 
 target_include_directories(PosturePerfection_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../../flatbuffers/include")
-target_link_libraries(PosturePerfection_gui ${OpenCV_LIBS})
+target_link_libraries(PosturePerfection_gui ${OpenCV_LIBS})