Merging branches

.gitignore

@@ -1,3 +1,5 @@
+.vscode-extensions
+animation_workbench.zip
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

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]:

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

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

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

examples/tutorial_6_flying_countries/tutorial_6_flying_countries.cpg

@@ -0,0 +1 @@
+UTF-8

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]]

examples/tutorial_6_flying_countries/tutorial_6_flying_countries.qmd

@@ -0,0 +1,27 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis version="3.35.0-Master">
+  <identifier></identifier>
+  <parentidentifier></parentidentifier>
+  <language></language>
+  <type></type>
+  <title></title>
+  <abstract></abstract>
+  <links/>
+  <dates/>
+  <fees></fees>
+  <encoding></encoding>
+  <crs>
+    <spatialrefsys nativeFormat="Wkt">
+      <wkt></wkt>
+      <proj4></proj4>
+      <srsid>0</srsid>
+      <srid>0</srid>
+      <authid></authid>
+      <description></description>
+      <projectionacronym></projectionacronym>
+      <ellipsoidacronym></ellipsoidacronym>
+      <geographicflag>false</geographicflag>
+    </spatialrefsys>
+  </crs>
+  <extent/>
+</qgis>

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

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

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

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" .