diff --git a/.gitignore b/.gitignore index 6c40a98..74c5b72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.vscode-extensions +animation_workbench.zip # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/animation_workbench/core/animation_controller.py b/animation_workbench/core/animation_controller.py index 0409a82..c9ae5cc 100644 --- a/animation_workbench/core/animation_controller.py +++ b/animation_workbench/core/animation_controller.py @@ -240,7 +240,10 @@ def create_job_for_frame(self, frame: int) -> Optional[RenderJob]: # inefficient, but we can rework later if needed! jobs = self.create_jobs() for _ in range(frame + 1): - job = next(jobs) + try: # hacky fix for crash experienced by a user TODO + job = next(jobs) + except: + pass return job def create_jobs(self) -> Iterator[RenderJob]: diff --git a/animation_workbench/metadata.txt b/animation_workbench/metadata.txt index 9a813eb..981eb67 100644 --- a/animation_workbench/metadata.txt +++ b/animation_workbench/metadata.txt @@ -6,5 +6,13 @@ version=1.2 qgisMinimumVersion=3.0 author=Tim Sutton, Nyall Dawson, Jeremy Prior email=tim@kartoza.com +<<<<<<< HEAD repository=https://github.com/timlinux/QGISAnimationWorkbench +||||||| 5ec0741 +repository=https://github.com/timlinux/QGISAnimationPlugin +======= +repository=https://github.com/timlinux/QGISAnimationWorkbench +tracker=https://github.com/timlinux/QGISAnimationWorkbench/issues +homepage=https://timlinux.github.io/QGISAnimationWorkbench/ +>>>>>>> 8a8d08a4bc35d732b1853cf6c4fcd466ed01191e license=GPLv2 diff --git a/default.nix b/default.nix index fa1e6f3..81cfa59 100644 --- a/default.nix +++ b/default.nix @@ -23,6 +23,7 @@ in pkgs.mkShell rec { python3Packages.pyqt5 python3Packages.gdal python3Packages.pytest + zip # This executes some shell code to initialize a venv in $venvDir before # dropping into the shell diff --git a/docs/mkdocs-base.yml b/docs/mkdocs-base.yml index 76cdf50..ba2bcff 100644 --- a/docs/mkdocs-base.yml +++ b/docs/mkdocs-base.yml @@ -12,6 +12,7 @@ copyright: Copyright Tim Sutton and Contributors, 2022 nav: +<<<<<<< HEAD - Home: - Home: index.md - Code of Conduct: about/code-of-conduct.md @@ -60,3 +61,94 @@ nav: - Overview: developer/documentation/overview.md - Context Help: developer/documentation/context-help.md +||||||| 5ec0741 + - Home: + - Home: index.md + - Code of Conduct: about/code-of-conduct.md + - Contribute: about/contribute.md + - License: about/license.md + - Credits: about/credits.md + - User: + - user/index.md + - Quickstart: + - Installation: user/quickstart/install.md + - Initial Configuration: user/quickstart/configure.md + - Using the Workbench: user/quickstart/using.md + - Guide: + - user/guide/index.md + - 1 Points on a Line: user/guide/tutorial1.md + - 2 Dynamic Markers: user/guide/tutorial2.md + - 3 Flying Points: user/guide/tutorial3.md + - 4 Spinning Globe: user/guide/tutorial4.md + - 5 Planar Map: user/guide/tutorial5.md + - Manual: + - user/manual/index.md + - Preparing your project: user/manual/project_preparation.md + - The workbench user interface: user/manual/workbench_ui.md + - Expression Variables: library/variables.md + - Expression Examples: library/snippets.md + - Under the hood: user/manual/under_the_hood.md + - FAQ: user/manual/faq.md + - Developer: + - developer/index.md + - Guide: + - developer/guide/index.md + - Architecture: developer/guide/architecture.md + - Prerequisites: developer/guide/prerequisites.md + - Design: developer/guide/design.md + - IDE Setup: developer/guide/ide-setup.md + - Cloning: developer/guide/cloning.md + - Configuration: developer/guide/configuration.md + - Building: developer/guide/building.md + - Workflows: developer/guide/workflows.md + - Testing: developer/guide/testing.md + - Documentation: developer/guide/docs.md + - Manual: + - developer/manual/index.md + - API: + - developer/api/index.md + - Reference: developer/api/manual/index.md + - Guide: developer/api/guide/index.md + - Documentation Writing: + - developer/documentation/index.md + - Overview: developer/documentation/overview.md + - Context Help: developer/documentation/context-help.md +# - DevOps: +# - devops/index.md +# - Guide: devops/guide/index.md +# - Manual: devops/manual/index.md +# - About: +# - About: about/index.md +# - License: about/license.md +# - Contributing: about/contributing.md + +======= + - Home: index.md + - Quickstart: + - Installation: start/install.md + - Initial Configuration: start/configure.md + - Using the Workbench: start/using.md + - Manual: + - Preparing your project: manual/project_preparation.md + - The workbench user interface: manual/workbench_ui.md + - Under the hood: manual/under_the_hood.md + - Tutorials: + - QGIS: tutorials/index.md + - 1 Points on a Line: tutorials/tutorial1.md + - 2 Dynamic Markers: tutorials/tutorial2.md + - 3 Flying Points: tutorials/tutorial3.md + - 4 Spinning Globe: tutorials/tutorial4.md + - 5 Planar Map: tutorials/tutorial5.md + - Library: + - Expression Variables: library/variables.md + - Expression Examples: library/snippets.md + - FAQ: faq/faq.md + - Develop: + - Setup: develop/setup.md + - Design: develop/design.md + - Documentation: develop/docs.md + - Contribute: + - Contribute: contribute/contribute.md + - Credits: + - Credits: credits/credits.md +>>>>>>> 8a8d08a4bc35d732b1853cf6c4fcd466ed01191e diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.cpg b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.cpg new file mode 100644 index 0000000..3ad133c --- /dev/null +++ b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.dbf b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.dbf new file mode 100644 index 0000000..491026c Binary files /dev/null and b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.dbf differ diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.gpkg b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.gpkg new file mode 100644 index 0000000..353d29a Binary files /dev/null and b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.gpkg differ diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.prj b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.prj new file mode 100644 index 0000000..f45cbad --- /dev/null +++ b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.prj @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]] \ No newline at end of file diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qgz b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qgz new file mode 100644 index 0000000..0d9078c Binary files /dev/null and b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qgz differ diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qmd b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qmd new file mode 100644 index 0000000..fbd352e --- /dev/null +++ b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qmd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + 0 + 0 + + + + + false + + + + diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shp b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shp new file mode 100644 index 0000000..3159a90 Binary files /dev/null and b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shp differ diff --git a/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shx b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shx new file mode 100644 index 0000000..53faeba Binary files /dev/null and b/examples/tutorial_6_flying_countries/tutorial_6_flying_countries.shx differ diff --git a/list-vscode-extensions.sh b/list-vscode-extensions.sh new file mode 100755 index 0000000..ad896c3 --- /dev/null +++ b/list-vscode-extensions.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +code --extensions-dir=".vscode-extensions" --list-extensions | xargs -L 1 echo code --extensions-dir=".vscode-extensions" --install-extension diff --git a/package-plugin.sh b/package-plugin.sh new file mode 100755 index 0000000..30188e4 --- /dev/null +++ b/package-plugin.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +version=$(grep '^version=' animation_workbench/metadata.txt | cut -d '=' -f 2| tr -d '\n') +echo $version +version="1.2" +rm animation_workbench*.zip +cd animation_workbench +rm -rf __pycache__ core/__pycache__/ gui/__pycache__/ +cd .. +zip -r animation_workbench-${version}.zip animation_workbench +cd .. +ls -lah animation_workbench-${version}.zip diff --git a/scrap.txt b/scrap.txt new file mode 100644 index 0000000..1f43d4b --- /dev/null +++ b/scrap.txt @@ -0,0 +1,103 @@ + +<<<<<<< HEAD + - Home: + - Home: index.md + - Code of Conduct: about/code-of-conduct.md + - Contribute: about/contribute.md + - License: about/license.md + - Credits: about/credits.md + - User: + - user/index.md + - Quickstart: + - Installation: user/quickstart/install.md + - Initial Configuration: user/quickstart/configure.md + - Using the Workbench: user/quickstart/using.md + - Guide: + - user/guide/index.md + - 1 Points on a Line: user/guide/tutorial1.md + - 2 Dynamic Markers: user/guide/tutorial2.md + - 3 Flying Points: user/guide/tutorial3.md + - 4 Spinning Globe: user/guide/tutorial4.md + - 5 Planar Map: user/guide/tutorial5.md + - Manual: + - user/manual/index.md + - Preparing your project: user/manual/project_preparation.md + - The workbench user interface: user/manual/workbench_ui.md + - Expression Variables: library/variables.md + - Expression Examples: library/snippets.md + - Under the hood: user/manual/under_the_hood.md + - FAQ: user/manual/faq.md + - Developer: + - developer/index.md + - Guide: + - developer/guide/index.md + - Architecture: developer/guide/architecture.md + - Prerequisites: developer/guide/prerequisites.md + - Design: developer/guide/design.md + - IDE Setup: developer/guide/ide-setup.md + - Cloning: developer/guide/cloning.md + - Configuration: developer/guide/configuration.md + - Building: developer/guide/building.md + - Workflows: developer/guide/workflows.md + - Testing: developer/guide/testing.md + - Documentation: developer/guide/docs.md + - Manual: + - developer/manual/index.md + - API: + - developer/api/index.md + - Reference: developer/api/manual/index.md + - Guide: developer/api/guide/index.md + - Documentation Writing: + - developer/documentation/index.md + - Overview: developer/documentation/overview.md + - Context Help: developer/documentation/context-help.md +======= + - Home: + - Home: index.md + - Code of Conduct: about/code-of-conduct.md + - Contribute: about/contribute.md + - License: about/license.md + - Credits: about/credits.md + - User: + - user/index.md + - Quickstart: + - user/quickstart/index.md + - Installation: user/quickstart/install.md + - Initial Configuration: user/quickstart/configure.md + - Using the Workbench: user/quickstart/using.md + - Guide: + - user/guide/index.md + - 1 Points on a Line: user/guide/tutorial1.md + - 2 Dynamic Markers: user/guide/tutorial2.md + - 3 Flying Points: user/guide/tutorial3.md + - 4 Spinning Globe: user/guide/tutorial4.md + - 5 Planar Map: user/guide/tutorial5.md + - Manual: + - user/manual/index.md + - Preparing your project: user/manual/project_preparation.md + - The workbench user interface: user/manual/workbench_ui.md + - Expression Variables: user/manual/variables.md + - Expression Examples: user/manual/snippets.md + - Under the hood: user/manual/under_the_hood.md + - FAQ: user/manual/faq.md + - Developer: + - developer/index.md + - Guide: + - developer/guide/index.md + - Architecture: developer/guide/architecture.md + - Prerequisites: developer/guide/prerequisites.md + - Design: developer/guide/design.md + - IDE Setup: developer/guide/ide-setup.md + - Cloning: developer/guide/cloning.md + - Configuration: developer/guide/configuration.md + - Building: developer/guide/building.md + - Workflows: developer/guide/workflows.md + - Testing: developer/guide/testing.md + - Manual: + - developer/manual/index.md + - Documentation Writing: + - developer/documentation/index.md + - Overview: developer/documentation/overview.md + - Context Help: developer/documentation/context-help.md + +>>>>>>> 172ef3bf0af4719b54be46f50d6a292b881a66a5 diff --git a/vscode.sh b/vscode.sh new file mode 100755 index 0000000..1d2fa4a --- /dev/null +++ b/vscode.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +echo "🪛 Installing VSCode Extensions:" +echo "--------------------------------" +code --extensions-dir=".vscode-extensions" --install-extension donjayamanne.python-environment-manager +code --extensions-dir=".vscode-extensions" --install-extension donjayamanne.python-extension-pack +code --extensions-dir=".vscode-extensions" --install-extension hbenl.vscode-test-explorer +code --extensions-dir=".vscode-extensions" --install-extension jamesqquick.python-class-generator +code --extensions-dir=".vscode-extensions" --install-extension KevinRose.vsc-python-indent +code --extensions-dir=".vscode-extensions" --install-extension littlefoxteam.vscode-python-test-adapter +code --extensions-dir=".vscode-extensions" --install-extension ms-python.debugpy +code --extensions-dir=".vscode-extensions" --install-extension ms-python.python +code --extensions-dir=".vscode-extensions" --install-extension ms-python.vscode-pylance +code --extensions-dir=".vscode-extensions" --install-extension ms-vscode.test-adapter-converter +code --extensions-dir=".vscode-extensions" --install-extension njpwerner.autodocstring +code --extensions-dir=".vscode-extensions" --install-extension VisualStudioExptTeam.intellicode-api-usage-examples +code --extensions-dir=".vscode-extensions" --install-extension VisualStudioExptTeam.vscodeintellicode + +code --extensions-dir=".vscode-extensions" .