Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/stuwilmur/sim-eye into main
Browse files Browse the repository at this point in the history
  • Loading branch information
stuwilmur committed Mar 9, 2024
2 parents f99e3ef + 4e1a7a4 commit 511ae35
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
8 changes: 6 additions & 2 deletions README.md
Expand Up @@ -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
```
Expand All @@ -36,7 +40,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
```
Expand Down
28 changes: 24 additions & 4 deletions qt/app.py
Expand Up @@ -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:
Expand All @@ -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.
"""

Expand Down Expand Up @@ -1073,4 +1093,4 @@ def main():
sys.exit( app.exec_() )

if __name__ == "__main__":
main()
main()

0 comments on commit 511ae35

Please sign in to comment.