From 0e411f6a8a3eed9c4fa3822309a7ed6123c0387b Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Mon, 7 Oct 2019 14:58:16 +0100 Subject: [PATCH 01/12] add button to group identities in idtrackerai plugging --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 3dcc986..3266028 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 3dcc9861619b9975204af592b97ef3f6e8624f19 +Subproject commit 32660280957bd0a020c8296ac9e442e2c0421131 From d47df913c82065bca336f4431ff07053097ee00c Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Sat, 9 Nov 2019 12:14:57 +0000 Subject: [PATCH 02/12] update idtrackerai plugin --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 3266028..df8d81e 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 32660280957bd0a020c8296ac9e442e2c0421131 +Subproject commit df8d81ef19490074fc7bd2a70483ccf38326e4c0 From acaf072cb086a82ab317a0ec1d42a29e8572f2c2 Mon Sep 17 00:00:00 2001 From: pacorofe Date: Fri, 21 Feb 2020 15:31:28 +0000 Subject: [PATCH 03/12] conflict solved merging master to idtrackerai_developed --- .github/ISSUE_TEMPLATE/bug_report.md | 31 +++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ .../pythonvideoannotator-module-idtrackerai | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..865cb3e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. macOS Catalina, Windows 10 1903, Ubuntu 19.10] + - Python Video Annotator Version [e.g. 3.306] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 2d12c69..fc15cbd 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 2d12c690780c8b92e7c7729a18b7fb01c498e75d +Subproject commit fc15cbd0bdb7fa7db2a71a964d7906ed7422e2ef From d8b3f5bd20cf5ca9dde172c79c4cb5804ba3246f Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Tue, 12 May 2020 14:13:04 +0100 Subject: [PATCH 04/12] update idtracker_ai to pytorch branch --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 16dbf3e..fc15cbd 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 16dbf3ec1fc18c25913057d34a3eef160a2c9428 +Subproject commit fc15cbd0bdb7fa7db2a71a964d7906ed7422e2ef From 22b6d3b725a28b46b9a7f40f180f42562587d848 Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Fri, 31 Jul 2020 15:44:40 +0200 Subject: [PATCH 05/12] adding groundtruth button to idtrackerai plugin --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index fc15cbd..f77b719 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit fc15cbd0bdb7fa7db2a71a964d7906ed7422e2ef +Subproject commit f77b719deda602233d365d402c301cecd5942a8a From 2386be4579b91c213aa00ec874f1762d7168390b Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Fri, 31 Jul 2020 16:29:07 +0200 Subject: [PATCH 06/12] update with groundtruth button --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index f77b719..fffe878 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit f77b719deda602233d365d402c301cecd5942a8a +Subproject commit fffe87846ab877530e92925dde3c2a27c0368ea7 From aaba337ff33e1a1c2b5ee15c71ca2aa5f740eb3f Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Mon, 3 Aug 2020 08:43:53 +0200 Subject: [PATCH 07/12] add blob info feature to idtrackerai submodule --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index fffe878..31d029f 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit fffe87846ab877530e92925dde3c2a27c0368ea7 +Subproject commit 31d029f4cdcb66c05829cd6e2365723aba41195a From b47c71cf4748ce404746c00eea7cfd670be88bac Mon Sep 17 00:00:00 2001 From: Paco Romero Ferrero Date: Thu, 22 Jul 2021 15:20:00 +0100 Subject: [PATCH 08/12] update idtrackerai plugging --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 31d029f..1e7b029 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 31d029f4cdcb66c05829cd6e2365723aba41195a +Subproject commit 1e7b029bd9bb491495b37c2cfa04dd320da94219 From 2a42b47294db4ad2b81c42b0ba5b95e892698222 Mon Sep 17 00:00:00 2001 From: Francisco Romero Date: Tue, 9 Nov 2021 10:52:48 +0100 Subject: [PATCH 09/12] update idtrackerai plugin --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 1e7b029..0f831cf 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 1e7b029bd9bb491495b37c2cfa04dd320da94219 +Subproject commit 0f831cfbf076e19dc094f56d339320b745446446 From 3f956b8686ac6453c0dd014701667b10d2b26e5f Mon Sep 17 00:00:00 2001 From: Francisco Romero Date: Tue, 9 Nov 2021 10:56:56 +0100 Subject: [PATCH 10/12] update idtrackerai plugin version --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 0f831cf..1602d7e 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 0f831cfbf076e19dc094f56d339320b745446446 +Subproject commit 1602d7ec8cf9fa4d991666d88daf1eaf69babfd7 From 9caf92ccea5115f89872be76bcd5e6cadfe55508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Teixeira?= Date: Fri, 12 Nov 2021 15:42:21 +0000 Subject: [PATCH 11/12] Update Mac installation instructions on README --- README.md | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ab11bf7..4468cf7 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,8 @@ How to install: pip install python-video-annotator ``` -If you are having issues (e.g., MacOS Catalina): +## Intel Mac installation +### MacOS Catalina 1. Start with a fresh Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.6: * example with Anaconda in Anaconda Prompt @@ -62,6 +63,49 @@ If you are having issues (e.g., MacOS Catalina): pip install python-video-annotator ``` +### MacOS Mojave + +1. Start with a fresh Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.8: + * example with Anaconda in Anaconda Prompt + + ```bash + conda create -n videoannotator python=3.8 + + ... + + conta activate videoannotator + ``` + +2. Install PyFormsGUI 5 first + + ```bash + pip install pyforms-gui==5 + ``` + +3. Downgrade PyQt5 and QScintilla: + + ```bash + pip install --upgrade qscintilla==2.11.4 pyqt5==5.14.1 pyqtwebengine==5.14.0 + ``` + +4. Install missing packages + + ```bash + pip install opencv-python-headless PyOpenGL_accelerate + ``` + +5. Install Python Video Annotator, ignoring dependencies (will be installed afterwards since it has a conflict with opencv version) + + ```bash + pip install python-video-annotator==3.306 --no-deps + ``` + +6. Install python-video-annotator dependencies except the one that created conflicts (older version of opencv-python) + + ```bash + pip install geometry-designer modular-computer-vision-api modular-computer-vision-api-gui pypi-xmlrpc python-video-annotator-models python-video-annotator-models-gui python-video-annotator-module-background-finder python-video-annotator-module-contours-images python-video-annotator-module-create-paths python-video-annotator-module-deeplab python-video-annotator-module-distances python-video-annotator-module-eventstats python-video-annotator-module-find-orientation python-video-annotator-module-import-export python-video-annotator-module-motion-counter python-video-annotator-module-path-editor python-video-annotator-module-path-map python-video-annotator-module-regions-filter python-video-annotator-module-smooth-paths python-video-annotator-module-timeline python-video-annotator-module-tracking python-video-annotator-module-virtual-object-generator scipy send2trash simplejson sklearn + ``` + How to run: 1. After the installation completes, you can start Python Video Annotator with: From 44f130cb0ba2c597d466966a2c53b65a151842b2 Mon Sep 17 00:00:00 2001 From: Francisco Romero Date: Wed, 17 Nov 2021 12:49:54 +0000 Subject: [PATCH 12/12] update idtrackerai plugin version --- plugins/pythonvideoannotator-module-idtrackerai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pythonvideoannotator-module-idtrackerai b/plugins/pythonvideoannotator-module-idtrackerai index 1602d7e..24866ee 160000 --- a/plugins/pythonvideoannotator-module-idtrackerai +++ b/plugins/pythonvideoannotator-module-idtrackerai @@ -1 +1 @@ -Subproject commit 1602d7ec8cf9fa4d991666d88daf1eaf69babfd7 +Subproject commit 24866ee28a514a8f1b0a3186800e84280c1d4cd4