From 7632e825cb045b305ab7af512761e1578e32e4a9 Mon Sep 17 00:00:00 2001 From: Stu Murray Date: Mon, 9 Oct 2023 23:13:28 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d291c13..04cb2ed 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Activate the environment (if not already active): ``` conda activate appenv ``` -Run the application: +Navigate to the qt/ directory, then Run the application: ``` python app.py ``` From 2ee89f4ace0bc5ad0bd6d246cc4faee6cb2bcf11 Mon Sep 17 00:00:00 2001 From: Stu Murray Date: Tue, 10 Oct 2023 21:26:37 +0100 Subject: [PATCH 2/5] Update README.md Add Jupyter install step --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 04cb2ed..750a1fc 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ Finally, set up the environment by running environment.py: ``` python environment.py ``` -If desired, deactivate the environment: +If you also want to be able to run the notebooks, install Jupyter: +``` +pip install jupyter +``` +Finally, once finished, deactivate the environment: ``` conda deactivate ``` From 4a4eaf6ef303353a49661b4d6d177260a944a178 Mon Sep 17 00:00:00 2001 From: Stu Murray Date: Tue, 10 Oct 2023 21:30:18 +0100 Subject: [PATCH 3/5] Update requirements.txt Prefer binary openCV --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cda5e85..ef98311 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ numpy matplotlib ipywidgets scipy -opencv-python-headless +opencv-python-headless --prefer-binary voila PyQt5 From 3216bee8482592fdbc5a1cee2c5255380421e553 Mon Sep 17 00:00:00 2001 From: Stu Murray Date: Tue, 10 Oct 2023 21:31:49 +0100 Subject: [PATCH 4/5] Update requirements.txt Prefer binary for openCV --- qt/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/requirements.txt b/qt/requirements.txt index 6ee3160..949bc0a 100644 --- a/qt/requirements.txt +++ b/qt/requirements.txt @@ -1,6 +1,6 @@ PyQt5 pillow -opencv-python-headless==3.4.2.17 +opencv-python-headless --prefer-binary scipy==1.7.1 qtawesome cx_Freeze==6.11.1 From 4e1a7a4ef927edb049e3eeae4fea792268793ea5 Mon Sep 17 00:00:00 2001 From: Stu Murray Date: Tue, 10 Oct 2023 22:35:00 +0100 Subject: [PATCH 5/5] v0.1.1 Add license text, update copyright --- qt/app.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/qt/app.py b/qt/app.py index c2d2f30..3ae2ea2 100644 --- a/qt/app.py +++ b/qt/app.py @@ -37,12 +37,12 @@ from time import perf_counter # Tuple to store major, minor and revision numbers -version = (0,1,0) +version = (0,1,1) versionText = "Gore Sim Eye v{0}.{1}.{2}".format(*version) aboutText = """ -University of St Andrews 2022 +University of St Andrews 2023 Credits: @@ -51,7 +51,27 @@ Stuart Murray William J. Williams -Copyright University of St Andrews 2022 (TBC) +MIT License + +Copyright (c) 2023 University of St Andrews, UK + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. """ @@ -1073,4 +1093,4 @@ def main(): sys.exit( app.exec_() ) if __name__ == "__main__": - main() \ No newline at end of file + main()