From 0fad620f89f29a93682c5f4ff8ab78afa261ad45 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Wed, 7 Jun 2017 09:11:22 -0400 Subject: [PATCH 01/11] update download links to point to new dev portal --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 72dac6d..a59d738 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,14 @@ Dependencies Installation ------------ -- Download Affdex SDK [from here](http://developer.affectiva.com/downloads) *Windows* +- Download Affdex SDK [from here](https://affectiva.readme.io/docs/getting-started-with-the-emotion-sdk-for-windows) - Install the SDK using MSI installer. - The additional dependencies get installed automatically by NuGet. *Ubuntu* +- Download Affdex SDK [from here](https://affectiva.readme.io/docs/getting-started-with-the-affectiva-sdk-for-linux) ```bashrc sudo apt-get install build-essential libopencv-dev libboost1.55-all-dev libcurl4-openssl uuid-dev cmake From c3337c0a0de8c15423920896b2cdc267cbbeeaa0 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Wed, 7 Jun 2017 09:21:28 -0400 Subject: [PATCH 02/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a59d738..4bac9a7 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,12 @@ Installation *Windows* -- Download Affdex SDK [from here](https://affectiva.readme.io/docs/getting-started-with-the-emotion-sdk-for-windows) +- Download Affdex SDK [from here](https://knowledge.affectiva.com/docs/getting-started-with-the-emotion-sdk-for-windows) - Install the SDK using MSI installer. - The additional dependencies get installed automatically by NuGet. *Ubuntu* -- Download Affdex SDK [from here](https://affectiva.readme.io/docs/getting-started-with-the-affectiva-sdk-for-linux) +- Download Affdex SDK [from here](https://knowledge.affectiva.com/docs/getting-started-with-the-affectiva-sdk-for-linux) ```bashrc sudo apt-get install build-essential libopencv-dev libboost1.55-all-dev libcurl4-openssl uuid-dev cmake From 2b06127ae092ffc934f1a44242f090a28c144ebc Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Wed, 7 Jun 2017 09:52:02 -0400 Subject: [PATCH 03/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4bac9a7..d939b0a 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/affdex-sdk/lib ``` *CentOS* +- Download Affdex SDK [from here](https://knowledge.affectiva.com/docs/getting-started-with-the-affectiva-sdk-for-linux) ```bashrc sudo yum install libcurl-devel.x86_64 libuuid-devel.x86_64 opencv-devel cmake.x86_64 From 84ea5ab0fa642ef152d108b53c07fc34b6992a79 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Mon, 3 Jul 2017 09:50:23 -0400 Subject: [PATCH 04/11] add issue template --- ISSUE_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..abdee2f --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,11 @@ +For questions or issues related to using one of Affectiva's SDKs, please use [StackOverflow](https://stackoverflow.com/questions/tagged/affdex-sdk) with the `affdex-sdk` tag. + + + + +For more general discussion about our SDKs, see the [SDK forum](https://discuss.affectiva.com/c/emotion-sdk) + + + + +If you have a question or problem with the samples in this repo (not with the SDK itself), please proceed to create an issue here. If you create an issue here that is not related to this repo, you will be asked to move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most effectively. From ac37acf5ba091700e72cb27121f7eec9f4d082ca Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Mon, 3 Jul 2017 10:08:28 -0400 Subject: [PATCH 05/11] replace markdown-based issue template with plain text one --- ISSUE_TEMPATE.txt | 14 ++++++++++++++ ISSUE_TEMPLATE.md | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 ISSUE_TEMPATE.txt delete mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPATE.txt b/ISSUE_TEMPATE.txt new file mode 100644 index 0000000..37a9a16 --- /dev/null +++ b/ISSUE_TEMPATE.txt @@ -0,0 +1,14 @@ +For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the `affdex-sdk` tag. The Affectiva team monitors StackOverflow for these questions and will respond there. This approach also helps other developers with the same questions or problems find solutions more quickly. + +(https://stackoverflow.com/questions/tagged/affdex-sdk) + + +For more general discussion about our SDKs, please leverage our SDK forum: + +https://discuss.affectiva.com/c/emotion-sdk + + + + +If you have a question or problem directly related to the samples in this repo (not with the SDK itself), please proceed to create an issue here. If you create an issue here that is not related to this repo, we will ask you to move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most effectively. + Thanks for your cooperation. \ No newline at end of file diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index abdee2f..0000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,11 +0,0 @@ -For questions or issues related to using one of Affectiva's SDKs, please use [StackOverflow](https://stackoverflow.com/questions/tagged/affdex-sdk) with the `affdex-sdk` tag. - - - - -For more general discussion about our SDKs, see the [SDK forum](https://discuss.affectiva.com/c/emotion-sdk) - - - - -If you have a question or problem with the samples in this repo (not with the SDK itself), please proceed to create an issue here. If you create an issue here that is not related to this repo, you will be asked to move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most effectively. From a23645516689cb726bd39b160e36745c6c79dadf Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Mon, 3 Jul 2017 10:45:22 -0400 Subject: [PATCH 06/11] issue template fixes --- ISSUE_TEMPATE.txt | 14 -------------- ISSUE_TEMPLATE.txt | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 ISSUE_TEMPATE.txt create mode 100644 ISSUE_TEMPLATE.txt diff --git a/ISSUE_TEMPATE.txt b/ISSUE_TEMPATE.txt deleted file mode 100644 index 37a9a16..0000000 --- a/ISSUE_TEMPATE.txt +++ /dev/null @@ -1,14 +0,0 @@ -For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the `affdex-sdk` tag. The Affectiva team monitors StackOverflow for these questions and will respond there. This approach also helps other developers with the same questions or problems find solutions more quickly. - -(https://stackoverflow.com/questions/tagged/affdex-sdk) - - -For more general discussion about our SDKs, please leverage our SDK forum: - -https://discuss.affectiva.com/c/emotion-sdk - - - - -If you have a question or problem directly related to the samples in this repo (not with the SDK itself), please proceed to create an issue here. If you create an issue here that is not related to this repo, we will ask you to move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most effectively. - Thanks for your cooperation. \ No newline at end of file diff --git a/ISSUE_TEMPLATE.txt b/ISSUE_TEMPLATE.txt new file mode 100644 index 0000000..f615d98 --- /dev/null +++ b/ISSUE_TEMPLATE.txt @@ -0,0 +1,19 @@ +For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the "affdex-sdk" tag. +The Affectiva team monitors StackOverflow for these questions and will respond there. This approach also helps other +developers with the same questions or problems find solutions more quickly. + +https://stackoverflow.com/questions/tagged/affdex-sdk + + +For more general discussion about our SDKs, please leverage our SDK forum: + +https://discuss.affectiva.com/c/emotion-sdk + + + + +If you have a question or problem directly related to the samples in this repo (not with the SDK itself), please +proceed to create an issue here. If you create an issue here that is not related to this repo, we will ask you to +move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most +effectively. + Thanks for your cooperation. \ No newline at end of file From c82a4dbf618ad9a63fa782b85eb0defbaa776857 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Mon, 3 Jul 2017 11:07:48 -0400 Subject: [PATCH 07/11] reformatting issue template --- ISSUE_TEMPLATE.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/ISSUE_TEMPLATE.txt b/ISSUE_TEMPLATE.txt index f615d98..c537c71 100644 --- a/ISSUE_TEMPLATE.txt +++ b/ISSUE_TEMPLATE.txt @@ -1,6 +1,7 @@ -For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the "affdex-sdk" tag. -The Affectiva team monitors StackOverflow for these questions and will respond there. This approach also helps other -developers with the same questions or problems find solutions more quickly. +For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the +"affdex-sdk" tag. The Affectiva team monitors StackOverflow for these questions and will respond +there. This approach also helps other developers with the same questions or problems find +solutions more quickly. https://stackoverflow.com/questions/tagged/affdex-sdk @@ -10,10 +11,8 @@ For more general discussion about our SDKs, please leverage our SDK forum: https://discuss.affectiva.com/c/emotion-sdk - - -If you have a question or problem directly related to the samples in this repo (not with the SDK itself), please -proceed to create an issue here. If you create an issue here that is not related to this repo, we will ask you to -move it to one of the locations above, as this helps ensure it gets to the right people and is addressed most -effectively. - Thanks for your cooperation. \ No newline at end of file +If you have a question or problem directly related to the samples in this repo (not with the SDK +itself), please proceed to create an issue here. If you create an issue here that is not +related to this repo, we will ask you to move it to one of the locations above, as this helps +ensure it gets to the right people and is addressed most effectively. Thanks for your +cooperation. From 1efba0e3f600cd6f6f63cef4de03b3e8d1d39934 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Fri, 7 Jul 2017 10:05:09 -0400 Subject: [PATCH 08/11] "leverage" -> "use" --- ISSUE_TEMPLATE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ISSUE_TEMPLATE.txt b/ISSUE_TEMPLATE.txt index c537c71..a0053fe 100644 --- a/ISSUE_TEMPLATE.txt +++ b/ISSUE_TEMPLATE.txt @@ -6,7 +6,7 @@ solutions more quickly. https://stackoverflow.com/questions/tagged/affdex-sdk -For more general discussion about our SDKs, please leverage our SDK forum: +For more general discussion about our SDKs, please use our SDK forum: https://discuss.affectiva.com/c/emotion-sdk From 5f0d0d26e8b7d6c02039d4babcdc4dec13c00f93 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Fri, 7 Jul 2017 10:34:17 -0400 Subject: [PATCH 09/11] a couple of readme fixes -boost version 1.55 -update dev portal links to point to new portal --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d939b0a..1b5a4c9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Dependencies *Additional dependencies* - OpenCV 2.4 -- Boost 1.59 +- Boost 1.55 - libuuid - libcurl - libopenssl @@ -79,7 +79,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/affdex-sdk/lib OpenCV-webcam-demo (c++) ------------------ -Project for demoing the [FrameDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-frames/). It grabs frames from the camera, analyzes them and displays the results on screen. +Project for demoing the [FrameDetector class](https://knowledge.affectiva.com/docs/analyze-a-video-frame-stream-3). It grabs frames from the camera, analyzes them and displays the results on screen. The following command line arguments can be used to run it: @@ -99,7 +99,7 @@ The following command line arguments can be used to run it: Video-demo (c++) ---------- -Project for demoing the Windows SDK [VideoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-video/) and [PhotoDetector class](http://developer.affectiva.com/v3_2/cpp/analyze-photo/). It processs video or image files, displays the emotion metrics and exports the results in a csv file. +Project for demoing the Windows SDK [VideoDetector class](https://knowledge.affectiva.com/docs/analyze-a-recorded-video-file) and [PhotoDetector class](https://knowledge.affectiva.com/docs/analyze-a-photo-4). It processs video or image files, displays the emotion metrics and exports the results in a csv file. The following command line arguments can be used to run it: From b1dda73d5002e76d1341ba9fb37cef0e4410541d Mon Sep 17 00:00:00 2001 From: Abdelrahman Mahmoud Date: Fri, 20 Oct 2017 17:45:38 -0400 Subject: [PATCH 10/11] Fix 3.4 bug (#36) Enable using SDK 3.4 --- .travis.yml | 4 ++-- affdex-win-samples.sln | 4 +++- appveyor.yml | 16 +++++++++++----- opencv-webcam-demo/opencv-webcam-demo.vcxproj | 10 +++++----- video-demo/video-demo.vcxproj | 12 ++++++------ 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06e4344..ebfae6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ -dist: trusty +dist: xenial-xerus language: cpp compiler: - gcc-4.8 before_script: - sudo apt-get install -y gcc-4.8 g++-4.8 libopencv-dev libboost1.55-all-dev cmake - - wget https://download.affectiva.com/linux/affdex-cpp-sdk-3.1-396-linux-64bit.tar.gz -O /tmp/affdex-sdk.tar.gz + - wget https://download.affectiva.com/linux/https://download.affectiva.com/linux/affdex-cpp-sdk-3.3-40-ubuntu-xenial-xerus-x86_64bit.tar.gz -O /tmp/affdex-sdk.tar.gz - mkdir /tmp/affdex-sdk - tar -xzvf /tmp/affdex-sdk.tar.gz -C /tmp/affdex-sdk - mkdir build diff --git a/affdex-win-samples.sln b/affdex-win-samples.sln index 653a244..d210858 100644 --- a/affdex-win-samples.sln +++ b/affdex-win-samples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv-webcam-demo", "opencv-webcam-demo\opencv-webcam-demo.vcxproj", "{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}" EndProject @@ -13,7 +13,9 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.ActiveCfg = Release|x64 + {8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.Build.0 = Release|x64 {5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.ActiveCfg = Release|x64 + {5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.yml b/appveyor.yml index ec6656c..f83f9ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,21 +2,27 @@ version: 1.0.{build} image: - Visual Studio 2013 - Visual Studio 2015 +configuration: Release +platform: x64 before_build: - cmd: >- - appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.1-368-win64.exe -FileName AffdexSDK-3.1-368-win64.exe + appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.4.1-575-win64.exe -FileName AffdexSDK-win64.exe - AffdexSDK-3.1-368-win64.exe /S + AffdexSDK-win64.exe /S nuget restore affdex-win-samples.sln + build: + project: affdex-win-samples.sln parallel: true verbosity: detailed artifacts: -- path: '\x64\Release' +- path: 'x64\Release' deploy: - provider: GitHub - release: 3.1 + release: 3.4 + artifact: 'x64\Release.zip' auth_token: secure: sjCE8t4b8ME8j2D6e0kRpNib8STOljgGVPdexj4n0gXU/nYxFkdaI9GXRukRHri5 - artifact: Release.zip + on: + branch: master # release from master branch only diff --git a/opencv-webcam-demo/opencv-webcam-demo.vcxproj b/opencv-webcam-demo/opencv-webcam-demo.vcxproj index 3911b9a..f89bafb 100644 --- a/opencv-webcam-demo/opencv-webcam-demo.vcxproj +++ b/opencv-webcam-demo/opencv-webcam-demo.vcxproj @@ -44,18 +44,18 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true - C:\Program Files\Affectiva\Affdex SDK\include;../common/;%(AdditionalDependencies) + C:\Program Files\Affectiva\AffdexSDK\include;../common/;%(AdditionalDependencies) Console true true true - C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)" -xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\" + xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)" +xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\" @@ -116,4 +116,4 @@ xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\" - \ No newline at end of file + diff --git a/video-demo/video-demo.vcxproj b/video-demo/video-demo.vcxproj index ef1f29e..104b09e 100644 --- a/video-demo/video-demo.vcxproj +++ b/video-demo/video-demo.vcxproj @@ -44,19 +44,19 @@ true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) true - C:\Program Files\Affectiva\Affdex SDK\include;../common;%(AdditionalDependencies) + C:\Program Files\Affectiva\AffdexSDK\include;../common;%(AdditionalDependencies) Console true true true - C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;%(AdditionalDependencies) + C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;%(AdditionalDependencies) - xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)" -xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)" -xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\" + xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)" +xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)" +xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\" @@ -117,4 +117,4 @@ xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\" - \ No newline at end of file + From 59a63054b721311a972a72f2add54fa9e5bbfab2 Mon Sep 17 00:00:00 2001 From: toby cabot Date: Fri, 17 Nov 2017 16:07:02 -0500 Subject: [PATCH 11/11] Fix SDK download URL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ebfae6c..b9b1c44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: - gcc-4.8 before_script: - sudo apt-get install -y gcc-4.8 g++-4.8 libopencv-dev libboost1.55-all-dev cmake - - wget https://download.affectiva.com/linux/https://download.affectiva.com/linux/affdex-cpp-sdk-3.3-40-ubuntu-xenial-xerus-x86_64bit.tar.gz -O /tmp/affdex-sdk.tar.gz + - wget https://download.affectiva.com/linux/affdex-cpp-sdk-3.3-40-ubuntu-xenial-xerus-x86_64bit.tar.gz -O /tmp/affdex-sdk.tar.gz - mkdir /tmp/affdex-sdk - tar -xzvf /tmp/affdex-sdk.tar.gz -C /tmp/affdex-sdk - mkdir build