upgrade i3drsgm to opencv v4.0.0

.gitignore

@@ -7,6 +7,9 @@ installer/Output/*
 /3rdparty/i3drsgm-1.0.3/token.txt
 /3rdparty/i3drsgm-1.0.3/i3drsgm
 /3rdparty/i3drsgm-1.0.3/i3drsgm-1.0.3.exe
+/3rdparty/i3drsgm-1.0.4/token.txt
+/3rdparty/i3drsgm-1.0.4/i3drsgm
+/3rdparty/i3drsgm-1.0.4/i3drsgm-1.0.4.exe
 /3rdparty/opencv-3.4.10/opencv
 /3rdparty/opencv-3.4.10/opencv-3.4.10-vc14_vc15.exe
 /3rdparty/opencv-4.4.0/opencv

3rdparty/i3drsgm-1.0.3/install_i3drsgm.bat → 3rdparty/i3drsgm-1.0.4/install_i3drsgm.bat

@@ -7,7 +7,7 @@ SET scriptpath=%~dp0
 cd %scriptpath:~0,-1%
 
 :: set i3drsgm version
-set version=1.0.3
+set version=1.0.4
 
 :: search for token in first argument
 set token_found=false
@@ -32,19 +32,15 @@ if "%~1"=="" (
 fetch --repo="https://github.com/i3drobotics/i3drsgm" --tag="v%version%" --release-asset="i3drsgm-%version%.exe" --progress --github-oauth-token=%token% ./
 :: extract self-exracting archive
 i3drsgm-%version%.exe -o"./" -y
-
-:: install opencv
-call i3drsgm\opencv-3.4.1\install_opencv.bat
+:: delete downloaded file
+del i3drsgm-%version%.exe
 
 :: install phobosIntegration
 call i3drsgm\phobosIntegration-1.0.54\install_phobosIntegration.bat %token%
 
 :: complete message
 echo I3DRSGM install complete
 
-:: delete downloaded file
-del i3drsgm-%version%.exe
-
 :: reset working directory
 cd %initcwd%
 

AppcastDevTmp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss
-	version="1.3.1a.5"
+	version="1.3.1a.6"
 	xmlns:atom="http://www.w3.org/2005/Atom"
 	xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"
 	xmlns:fervor="https://github.com/i3drobotics/fervor"
@@ -14,8 +14,8 @@
 		<atom:link href="https://raw.githubusercontent.com/i3drobotics/stereo-vision-toolkit/dev/AppcastDev.xml" rel="self" type="application/rss+xml" />
 
 		<item>
-			<title>Version 1.3.1a.5</title>
-			<pubDate>Wed, 23 September 2020 17:15 +0000</pubDate>
+			<title>Version 1.3.1a.6</title>
+			<pubDate>Thu, 24 September 2020 14:00 +0000</pubDate>
 			<guid isPermaLink="true">https://raw.githubusercontent.com/i3drobotics/stereo-vision-toolkit/dev/ReleaseNotesDev.html</guid>
 
 			<!-- One of those (<link> is preferred by Fervor, <sparkle:releaseNotesLink> is used by Sparkle) -->
@@ -28,8 +28,8 @@
 
 			<!-- Windows version. -->
 			<enclosure
-				url="https://github.com/i3drobotics/stereo-vision-toolkit/releases/download/v1.3.1a.5/StereoVisionToolkit-1.3.1a.5-Win64.exe"
-				fervor:version="1.3.1a.5"
+				url="https://github.com/i3drobotics/stereo-vision-toolkit/releases/download/v1.3.1a.6/StereoVisionToolkit-1.3.1a.6-Win64.exe"
+				fervor:version="1.3.1a.6"
 				fervor:platform="Q_OS_WIN32"
 				length="371715832"
 				type="application/octet-stream" />

ReleaseNotesDev.html

@@ -1,8 +1,7 @@
-Stereo Vision Toolkit v1.3.1a.5 [Development release]
+Stereo Vision Toolkit v1.3.1a.6 [Development release]
 
-Bug Fixes:
-- Temporary fix uses captured image size and ignores image size read from camera while vimba cameras are having issues reading this value
+Improvements
+- Upgrade I3DRSGM to OpenCV v4.4.0
 
 Known issues:
-- Currently missing I3DRSGM while migrating to OpenCV v4.0.0
 - Vimba cameras unable to read/write settings to/from cameras

ReleaseNotesDevTmp.html

@@ -1,8 +1,7 @@
-Stereo Vision Toolkit v1.3.1a.5 [Development release]
+Stereo Vision Toolkit v1.3.1a.6 [Development release]
 
-Bug Fixes:
-- Temporary fix uses captured image size and ignores image size read from camera while vimba cameras are having issues reading this value
+Improvements
+- Upgrade I3DRSGM to OpenCV v4.4.0
 
 Known issues:
-- Currently missing I3DRSGM while migrating to OpenCV v4.0.0
 - Vimba cameras unable to read/write settings to/from cameras

ReleaseNotesTmp.html

@@ -13,6 +13,7 @@
 - Add new Vimba camera serials
 - Add ML detector using YOLO or Tensorflow
 - Upgrade to OpenCV v4.0.0
+- Upgrade I3DRSGM to OpenCV v4.4.0
 
 Bug fixes:
 - Fix YAML file generates invalid Q matrix
@@ -21,4 +22,7 @@
 - Fix non rectified images saved with '_rect' suffix
 - Fix maximum point cloud z value being set incorrectly
 - Fix camera capture delay when processing load is high
-- Fix I3DRSGM failed to initalise when switching to camera with different resolution
+- Fix I3DRSGM failed to initalise when switching to camera with different resolution
+
+Known issues:
+- Vimba cameras unable to read/write settings to/from cameras

installer/installer.iss

@@ -3,7 +3,7 @@
 ; MUST be installed on x64 bit machine
 
 #define AppName "Stereo Vision Toolkit"
-#define AppVersion "1.3.1a.5"
+#define AppVersion "1.3.1a.6"
 #define InstallerName "StereoVisionToolkit"
 #define ExeName "StereoVisionToolkit.exe"
 #define IconName "i3dr_logo.ico"

scripts/3rdparty.bat

@@ -35,7 +35,7 @@ if "%option_uninstall%"=="true" (
 
 if "%option_with_i3drsgm%"=="true" (
     :: install i3drsgm
-    call ..\3rdparty\i3drsgm-1.0.2\install_i3drsgm.bat %script_params%
+    call ..\3rdparty\i3drsgm-1.0.4\install_i3drsgm.bat %script_params%
 )
 
 :: install boost (vorboss mirror specified for downloading from sourceforge optimized for EU)

stereo_vision_toolkit.pro

@@ -7,7 +7,7 @@
 #
 #-------------------------------------------------
 
-VERSION = 1.3.1a.5
+VERSION = 1.3.1a.6
 DEFINES += FV_APP_VERSION
 FV_APP_VERSION = $$VERSION
 
@@ -304,11 +304,11 @@ WITH_VIMBA {
 
 WITH_I3DRSGM {
     # I3DRSGM library and include files
-    LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/i3drsgm-1.0.3/lib/" -lI3DRSGM
-    INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/i3drsgm-1.0.3/include"
+    LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/i3drsgm-1.0.4/lib/" -lI3DRSGM
+    INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/i3drsgm-1.0.4/include"
     # PhobosIntegration library and include files (required for I3DRSGM)
-    LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/phobosIntegration-1.0.54/lib/PhobosIntegration" -lPhobosIntegration
-    INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/phobosIntegration-1.0.54/include"
+    LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/phobosIntegration-1.0.54/lib/PhobosIntegration" -lPhobosIntegration
+    INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/phobosIntegration-1.0.54/include"
 }
 
 # Basler library files
@@ -383,9 +383,9 @@ win32 {
     # I3DRSGM dlls
     WITH_I3DRSGM {
         EXTRA_FILES += \
-            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/i3drsgm-1.0.3/bin/*.dll, true) \
-            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/i3drsgm-1.0.3/bin/*.param, true) \
-            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.3/i3drsgm/phobosIntegration-1.0.54/bin/*.dll, true)
+            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/i3drsgm-1.0.4/bin/*.dll, true) \
+            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/i3drsgm-1.0.4/bin/*.param, true) \
+            $$files($$_PRO_FILE_PWD_/3rdparty/i3drsgm-1.0.4/i3drsgm/phobosIntegration-1.0.54/bin/*.dll, true)
     }
 
     # Vimba dlls