Merge remote-tracking branch 'origin/0.10.0' into feature/Stereo

SolarFramework · Jul 27, 2021 · 142d8e5 · 142d8e5
2 parents 0b58a8f + ab6c0c8
commit 142d8e5
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/JenkinsFile b/JenkinsFile
@@ -1,25 +1,18 @@
 node("master") {
 
-    SolArModulePipeline {
-        moduleName="FiducialMarker"
-        dirName="SolARBuild"
-        buildDir="SolARSample_FiducialMarker_Mono"
-        android=false
-        packageScripts="bundleSamples"
-    }
-
     SolArModulePipeline {
         moduleName="SolARPipeline_FiducialMarker"
         dirName="SolARBuild"
         buildDir="SolARPipeline_FiducialMarker"
         android=true
-        packageScripts="bundleSamples"        
+        makeTarget="install install_deps"       
     }
 
     SolArModulePipeline {
-        moduleName="FiducialMarker_Test"
+        moduleName="SolARSample_FiducialMarker"
         dirName="SolARBuild"
-        buildDir="SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker"
+        buildDir="SolARSample_FiducialMarker_Mono,SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker"
+        makeTarget="install install_deps"
         android=false
         packageScripts="bundleSamples"
     }

diff --git a/SolARPipeline_FiducialMarker/SolARPipeline_FiducialMarker.pro b/SolARPipeline_FiducialMarker/SolARPipeline_FiducialMarker.pro
@@ -2,11 +2,13 @@
 QT       -= core gui
 CONFIG -= qt
 
+QMAKE_PROJECT_DEPTH = 0
+
 ## global defintions : target lib name, version
 INSTALLSUBDIR = SolARBuild
 TARGET = SolARPipeline_FiducialMarker
 FRAMEWORK = $$TARGET
-VERSION=0.9.3
+VERSION=0.10.0
 
 DEFINES += MYVERSION=$${VERSION}
 DEFINES += TEMPLATE_LIBRARY

diff --git a/SolARPipeline_FiducialMarker/packagedependencies.txt b/SolARPipeline_FiducialMarker/packagedependencies.txt
@@ -1 +1 @@
-SolARFramework|0.9.3|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+SolARFramework|0.10.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
diff --git a/...iducialMarker/tests/SolARPipelineTest_FiducialMarker/SolARPipelineTest_FiducialMarker.pro b/...iducialMarker/tests/SolARPipelineTest_FiducialMarker/SolARPipelineTest_FiducialMarker.pro
@@ -4,7 +4,7 @@ CONFIG -= qt
 
 ## global defintions : target lib name, version
 TARGET = SolARPipelineTest_FiducialMarker
-VERSION=0.9.3
+VERSION=0.10.0
 
 DEFINES += MYVERSION=$${VERSION}
 CONFIG += c++1z

diff --git a/...alMarker/tests/SolARPipelineTest_FiducialMarker/SolARPipelineTest_FiducialMarker_conf.xml b/...alMarker/tests/SolARPipelineTest_FiducialMarker/SolARPipelineTest_FiducialMarker_conf.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <xpcf-registry autoAlias="true" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<module uuid="63b4282f-94cf-44d0-8ec0-9e8b0639fff6" name="SolARPipeline_FiducialMarker" path="$XPCF_MODULE_ROOT/SolARBuild/SolARPipeline_FiducialMarker/0.9.3/lib/x86_64/shared" description="The module embedding a pipeline to estimate the pose based on a squared fiducial marker">
+	<module uuid="63b4282f-94cf-44d0-8ec0-9e8b0639fff6" name="SolARPipeline_FiducialMarker" path="$XPCF_MODULE_ROOT/SolARBuild/SolARPipeline_FiducialMarker/0.10.0/lib/x86_64/shared" description="The module embedding a pipeline to estimate the pose based on a squared fiducial marker">
 		<component uuid="3898cc3b-3986-4edc-b7c8-f4fba0f6c22a" name="PipelineFiducialMarker" description="A pipeline to estimate the pose based on a squared fiducial marker">
 			<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
 			<interface uuid="b5a6225e-6a91-4050-b298-886f4c17d9d2" name="IPoseEstimationPipeline" description="The interface to define a video see-throuh pipeline" />
 		</component>
 	</module>
-	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/0.9.3/lib/x86_64/shared" description="OpenCV">
+	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/0.10.0/lib/x86_64/shared" description="OpenCV">
 		<component uuid="5B7396F4-A804-4F3C-A0EB-FB1D56042BB4" name="SolARCameraOpencv" description="SolARCameraOpencv">
 			<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
 			<interface uuid="5DDC7DF0-8377-437F-9C81-3643F7676A5B" name="ICamera" description="ICamera" />
@@ -72,7 +72,7 @@
 			<interface uuid="b485f37d-a8ea-49f6-b361-f2b30777d9ba" name="IProject" description="IProject"/>
 		</component>
 	</module>
-	<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleTools/0.9.3/lib/x86_64/shared" description="Module Tools">
+	<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleTools/0.10.0/lib/x86_64/shared" description="Module Tools">
 		<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">
 			<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect" />
 			<interface uuid="79c5b810-d557-11e7-9296-cec278b6b50a" name="ISBPatternReIndexer" description="ISBPatternReIndexer" />
@@ -105,7 +105,7 @@
 			<!--PipelineFiducialMarker-->
 		</configure>
 		<configure component="SolARCameraOpencv">
-			<property name="calibrationFile" type="string" value="camera_calibration.json" description="path of the .yml file describing the calibration parameter of the camera." />
+			<property name="calibrationFile" type="string" value="camera_calibration.json" description="path of the .json file describing the calibration parameter of the camera." />
             <property name="deviceID" type="uint" value="0" description="ID of the camera (default = 0)" />
 			<!--SolARCameraOpencv-->
 		</configure>

diff --git a/SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker/packagedependencies.txt b/SolARPipeline_FiducialMarker/tests/SolARPipelineTest_FiducialMarker/packagedependencies.txt
@@ -1 +1 @@
-SolARFramework|0.9.3|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+SolARFramework|0.10.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
diff --git a/SolARSample_FiducialMarker_Mono/SolARSample_FiducialMarker_Mono.pro b/SolARSample_FiducialMarker_Mono/SolARSample_FiducialMarker_Mono.pro
@@ -2,9 +2,11 @@
 QT       -= core gui
 CONFIG -= qt
 
+QMAKE_PROJECT_DEPTH = 0
+
 ## global defintions : target lib name, version
 TARGET = SolARSample_FiducialMarker_Mono
-VERSION=0.9.3
+VERSION=0.10.0
 
 DEFINES += MYVERSION=$${VERSION}
 CONFIG += c++1z

diff --git a/SolARSample_FiducialMarker_Mono/SolARSample_FiducialMarker_Mono_conf.xml b/SolARSample_FiducialMarker_Mono/SolARSample_FiducialMarker_Mono_conf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <xpcf-registry autoAlias="true" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/0.9.3/lib/x86_64/shared" description="OpenCV">
+	<module uuid="15e1990b-86b2-445c-8194-0cbe80ede970" name="SolARModuleOpenCV" path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleOpenCV/0.10.0/lib/x86_64/shared" description="OpenCV">
 		<component uuid="5B7396F4-A804-4F3C-A0EB-FB1D56042BB4" name="SolARCameraOpencv" description="SolARCameraOpencv">
 			<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
 			<interface uuid="5DDC7DF0-8377-437F-9C81-3643F7676A5B" name="ICamera" description="ICamera"/>
@@ -63,7 +63,7 @@
 		</component>
 	</module>
 
-	<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools"  path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleTools/0.9.3/lib/x86_64/shared" description="Tools">
+	<module uuid="28b89d39-41bd-451d-b19e-d25a3d7c5797" name="SolARModuleTools"  path="$XPCF_MODULE_ROOT/SolARBuild/SolARModuleTools/0.10.0/lib/x86_64/shared" description="Tools">
 		<component uuid="a2ef5542-029e-4fce-9974-0aea14b29d6f" name="SolARSBPatternReIndexer" description="SolARSBPatternReIndexer">
 			<interface uuid="125f2007-1bf9-421d-9367-fbdc1210d006" name="IComponentIntrospect" description="IComponentIntrospect"/>
 			<interface uuid="79c5b810-d557-11e7-9296-cec278b6b50a" name="ISBPatternReIndexer" description="ISBPatternReIndexer"/>

diff --git a/SolARSample_FiducialMarker_Mono/packagedependencies.txt b/SolARSample_FiducialMarker_Mono/packagedependencies.txt
@@ -1 +1 @@
-SolARFramework|0.9.3|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+SolARFramework|0.10.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
diff --git a/bundleSamples.bat b/bundleSamples.bat
@@ -1,7 +1,7 @@
 @echo off
 SETLOCAL EnableDelayedExpansion
 
-SET version=0.9.0
+SET version=0.10.0
 
 SET filename=SolAR_Fiducial_%version%
 SET arg1=%1

diff --git a/bundleSamples.sh b/bundleSamples.sh
@@ -1,5 +1,5 @@
 
-Version="0.9.0"
+Version="0.10.0"
 
 if [ -z "$1" ]
 then

diff --git a/packagedependencies.txt b/packagedependencies.txt
@@ -1,3 +1,6 @@
-SolARModuleOpenCV|0.9.3|SolARModuleOpenCV|SolARBuild@github|https://github.com/SolarFramework/SolarModuleOpenCV/releases/download
-SolARModuleTools|0.9.3|SolARModuleTools|SolARBuild@github|https://github.com/SolarFramework/SolARModuleTools/releases/download
+SolARModuleOpenCV|0.10.0|SolARModuleOpenCV|SolARBuild@github|https://github.com/SolarFramework/SolarModuleOpenCV/releases/download
+SolARModuleTools|0.10.0|SolARModuleTools|SolARBuild@github|https://github.com/SolarFramework/SolARModuleTools/releases/download
+SolARPipeline_FiducialMarker|0.10.0|SolARPipeline_FiducialMarker|SolARBuild@github|https://github.com/SolarFramework/Sample-FiducialMarker/releases/download
+
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SolARFramework\|0.9.3\|SolARFramework\|SolARBuild@github\|https://github.com/SolarFramework/SolarFramework/releases/download
		SolARFramework\|0.10.0\|SolARFramework\|SolARBuild@github\|https://github.com/SolarFramework/SolarFramework/releases/download