Merge branch 'develop'

video-annotator · Sep 29, 2020 · dacba88 · dacba88
2 parents 7603b79 + 0daa743
commit dacba88
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -14,37 +14,73 @@ Features:
 
 [![Video](docs/youtube.png)](https://www.youtube.com/watch?v=9C4Zr8fhqFo&t=63s)
 
+![Video annotator screenshot](docs/screenshot.png "Screen")
 
-### Developers
+## Installation & Running
 
-* Ricardo Ribeiro - collaborator of the [Scientific Software Platform](http://neuro.fchampalimaud.org/en/research/platforms/staff/Scientific%20Software/) of the [Champalimaud Foundation](http://fchampalimaud.org).
-* Hugo Cachitas - working collaborator of the [Innate Behavior Lab](http://neuro.fchampalimaud.org/en/research/investigators/research-groups/group/Vasconcelos/) of the [Champalimaud Foundation](http://fchampalimaud.org).
-* Carlos Mão de Ferro - collaborator of the [Scientific Software Platform](http://neuro.fchampalimaud.org/en/research/platforms/staff/Scientific%20Software/) of the [Champalimaud Foundation](http://fchampalimaud.org).
+How to install:
 
+1. Create a Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.6:
+   * example with Anaconda in Anaconda Prompt
 
-![Video annotator screenshot](docs/screenshot.png "Screen")
+    ```bash
+    conda create -n videoannotator python=3.6
 
-## Installation & Running
+    ...
 
-How to install:
+    conda activate videoannotator
+    ```
+
+2. Make sure you are in the just created virtual environment and install PythonVideoAnnotator with pip:
+
+    ```bash
+    pip install python-video-annotator
+    ```
+
+If you are having issues (e.g., MacOS Catalina):
 
-1. Install Python 3.6 from  [python.org](https://www.python.org/)
+1. Start with a fresh Virtual Environment (highly recommended) on your preferred Python distribution with Python 3.6:
+   * example with Anaconda in Anaconda Prompt
 
-2. Install PythonVideoAnnotator from Pypi:
-```
-pip install python-video-annotator
-```
+    ```bash
+    conda create -n videoannotator python=3.6
+
+    ...
+
+    conta activate videoannotator
+    ```
+
+2. Install some of the dependencies that might present issues as:
+
+    ```bash
+    pip install opencv-python-headless pyqt5==5.14.1 pyqtwebengine==5.14.0
+    ```
+
+3. Install Python Video Annotator
+
+    ```bash
+    pip install python-video-annotator
+    ```
 
 How to run:
 
-```
-start-video-annotator
-```
+1. After the installation completes, you can start Python Video Annotator with:
 
-### For developers:
+    ```bash
+    start-video-annotator
+    ```
 
-[Follow the steps described here](https://pythonvideoannotator.readthedocs.io/en/master/user-docs/install_and_run/index.html)
+### For developers
 
+[Follow the steps described here](https://pythonvideoannotator.readthedocs.io/en/master/user-docs/install_and_run/index.html#for-developers)
+
+
+## Developers
+
+* Ricardo Ribeiro - collaborator of the [Scientific Software Platform](http://neuro.fchampalimaud.org/en/research/platforms/staff/Scientific%20Software/) of the [Champalimaud Foundation](http://fchampalimaud.org).
+* Hugo Cachitas working - collaborator of the [Innate Behavior Lab](http://neuro.fchampalimaud.org/en/research/investigators/research-groups/group/Vasconcelos/) of the [Champalimaud Foundation](http://fchampalimaud.org).
+* Carlos Mão de Ferro - collaborator of the [Scientific Software Platform](http://neuro.fchampalimaud.org/en/research/platforms/staff/Scientific%20Software/) of the [Champalimaud Foundation](http://fchampalimaud.org).
+* Luís Teixeira - collaborator of the [Scientific Software Platform](http://neuro.fchampalimaud.org/en/research/platforms/staff/Scientific%20Software/) of the [Champalimaud Foundation](http://fchampalimaud.org).
 
 ## Collaboration
 

diff --git a/base/pythonvideoannotator/pythonvideoannotator/settings.py b/base/pythonvideoannotator/pythonvideoannotator/settings.py
@@ -100,4 +100,7 @@
     #'Go to the next event and then click the mark the point button.':           'Ctrl+I',
     #'Select the path of the next object and click the mark the point button.':  'Ctrl+U',
     #'"Click" the Mark Point button in the current Path.':                       'Ctrl++'
-}
+}
+
+from AnyQt.QtWidgets import QColorDialog, QFileDialog
+PYFORMS_COLORDIALOGS_OPTIONS = QColorDialog.ShowAlphaChannel