diff --git a/docs/xml/examples/04-metrics/README.md b/docs/xml/examples/04-metrics/README.md index 0bf03008..4b121735 100644 --- a/docs/xml/examples/04-metrics/README.md +++ b/docs/xml/examples/04-metrics/README.md @@ -63,7 +63,7 @@ Conversions that don't make sense for a given metric will fail with a suitable m ## Controllable units -Some units can be controlled by the command line, so instead of using a particular unit, you can also use one of the following +Some units can be controlled by the command line, so instead of using a particular unit, you can also use on eof the following | Unit | Meaning | |---------------|------------------------------------| diff --git a/docs/xml/examples/05-moving-map/05-moving-map-0.png b/docs/xml/examples/05-moving-map/05-moving-map-0.png index e580b301..33ac6a3c 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-0.png and b/docs/xml/examples/05-moving-map/05-moving-map-0.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-1.png b/docs/xml/examples/05-moving-map/05-moving-map-1.png index 350ef36b..e200d80a 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-1.png and b/docs/xml/examples/05-moving-map/05-moving-map-1.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-10.png b/docs/xml/examples/05-moving-map/05-moving-map-10.png index b9687faa..6876f661 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-10.png and b/docs/xml/examples/05-moving-map/05-moving-map-10.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-11.png b/docs/xml/examples/05-moving-map/05-moving-map-11.png index cdd442fa..c4864562 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-11.png and b/docs/xml/examples/05-moving-map/05-moving-map-11.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-2.png b/docs/xml/examples/05-moving-map/05-moving-map-2.png index 8d65ef0b..03e843bc 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-2.png and b/docs/xml/examples/05-moving-map/05-moving-map-2.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-3.png b/docs/xml/examples/05-moving-map/05-moving-map-3.png index 5dfb2a5a..a475177a 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-3.png and b/docs/xml/examples/05-moving-map/05-moving-map-3.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-4.png b/docs/xml/examples/05-moving-map/05-moving-map-4.png index 44e1a639..468b3c2d 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-4.png and b/docs/xml/examples/05-moving-map/05-moving-map-4.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-5.png b/docs/xml/examples/05-moving-map/05-moving-map-5.png index 2952711c..3707b5c9 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-5.png and b/docs/xml/examples/05-moving-map/05-moving-map-5.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-6.png b/docs/xml/examples/05-moving-map/05-moving-map-6.png index c01c33e1..2e87c0d8 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-6.png and b/docs/xml/examples/05-moving-map/05-moving-map-6.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-7.png b/docs/xml/examples/05-moving-map/05-moving-map-7.png index 68022f71..4f72d4c6 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-7.png and b/docs/xml/examples/05-moving-map/05-moving-map-7.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-8.png b/docs/xml/examples/05-moving-map/05-moving-map-8.png index 46f34771..dd776912 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-8.png and b/docs/xml/examples/05-moving-map/05-moving-map-8.png differ diff --git a/docs/xml/examples/05-moving-map/05-moving-map-9.png b/docs/xml/examples/05-moving-map/05-moving-map-9.png index e580b301..33ac6a3c 100644 Binary files a/docs/xml/examples/05-moving-map/05-moving-map-9.png and b/docs/xml/examples/05-moving-map/05-moving-map-9.png differ diff --git a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-0.png b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-0.png index a68edcbe..d81b4b21 100644 Binary files a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-0.png and b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-0.png differ diff --git a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-1.png b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-1.png index baede04a..731740d1 100644 Binary files a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-1.png and b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-1.png differ diff --git a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-2.png b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-2.png index 0782134a..802a56e2 100644 Binary files a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-2.png and b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-2.png differ diff --git a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-3.png b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-3.png index a3d36141..f8bd268b 100644 Binary files a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-3.png and b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-3.png differ diff --git a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-4.png b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-4.png index 15ecd75a..795ce1f5 100644 Binary files a/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-4.png and b/docs/xml/examples/06-cairo-circuit-map/06-cairo-circuit-map-4.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-10.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-10.png index f5b8b1ea..7f0c003e 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-10.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-10.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-11.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-11.png index f5b8b1ea..7cb07ef7 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-11.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-11.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-12.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-12.png index 7f0c003e..f5b8b1ea 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-12.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-12.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-13.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-13.png index 7cb07ef7..817b569f 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-13.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-13.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-14.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-14.png index 817b569f..682e384d 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-14.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-14.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-15.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-15.png index 682e384d..16761547 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-15.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-15.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-16.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-16.png index 16761547..c57dade3 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-16.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-16.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-17.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-17.png index 00b320f1..deabcd9b 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-17.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-17.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-18.png b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-18.png index c57dade3..00b320f1 100644 Binary files a/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-18.png and b/docs/xml/examples/06-cairo-gauge-round-annotated/06-cairo-gauge-round-annotated-18.png differ diff --git a/docs/xml/examples/06-cairo-gauge-round-annotated/README.md b/docs/xml/examples/06-cairo-gauge-round-annotated/README.md index cffb3327..724873f7 100644 --- a/docs/xml/examples/06-cairo-gauge-round-annotated/README.md +++ b/docs/xml/examples/06-cairo-gauge-round-annotated/README.md @@ -103,29 +103,23 @@ The following are available to change: `background-rgb`, `major-ann-rgb`, `minor ```xml - + ``` ![06-cairo-gauge-round-annotated-10.png](06-cairo-gauge-round-annotated-10.png) ```xml - + ``` ![06-cairo-gauge-round-annotated-11.png](06-cairo-gauge-round-annotated-11.png) ```xml - + ``` ![06-cairo-gauge-round-annotated-12.png](06-cairo-gauge-round-annotated-12.png) -```xml - -``` -![06-cairo-gauge-round-annotated-13.png](06-cairo-gauge-round-annotated-13.png) - - # Transparency Any colour that is completely transparent will disappear... this can be used to change the appearance of the widget quite a bit. @@ -134,36 +128,36 @@ Any colour that is completely transparent will disappear... this can be used to ```xml ``` -![06-cairo-gauge-round-annotated-14.png](06-cairo-gauge-round-annotated-14.png) +![06-cairo-gauge-round-annotated-13.png](06-cairo-gauge-round-annotated-13.png) ```xml ``` -![06-cairo-gauge-round-annotated-15.png](06-cairo-gauge-round-annotated-15.png) +![06-cairo-gauge-round-annotated-14.png](06-cairo-gauge-round-annotated-14.png) ```xml ``` -![06-cairo-gauge-round-annotated-16.png](06-cairo-gauge-round-annotated-16.png) +![06-cairo-gauge-round-annotated-15.png](06-cairo-gauge-round-annotated-15.png) ```xml - + ``` -![06-cairo-gauge-round-annotated-17.png](06-cairo-gauge-round-annotated-17.png) +![06-cairo-gauge-round-annotated-16.png](06-cairo-gauge-round-annotated-16.png) ```xml - + ``` -![06-cairo-gauge-round-annotated-18.png](06-cairo-gauge-round-annotated-18.png) +![06-cairo-gauge-round-annotated-17.png](06-cairo-gauge-round-annotated-17.png) ```xml - + ``` -![06-cairo-gauge-round-annotated-19.png](06-cairo-gauge-round-annotated-19.png) +![06-cairo-gauge-round-annotated-18.png](06-cairo-gauge-round-annotated-18.png) diff --git a/docs/xml/examples/06-journey-map/06-journey-map-0.png b/docs/xml/examples/06-journey-map/06-journey-map-0.png index 14a9587a..39ae1f32 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-0.png and b/docs/xml/examples/06-journey-map/06-journey-map-0.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-1.png b/docs/xml/examples/06-journey-map/06-journey-map-1.png index 1aba957f..edabaeda 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-1.png and b/docs/xml/examples/06-journey-map/06-journey-map-1.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-2.png b/docs/xml/examples/06-journey-map/06-journey-map-2.png index 3987a960..7f03495d 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-2.png and b/docs/xml/examples/06-journey-map/06-journey-map-2.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-3.png b/docs/xml/examples/06-journey-map/06-journey-map-3.png index a09c6b8b..9574a987 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-3.png and b/docs/xml/examples/06-journey-map/06-journey-map-3.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-4.png b/docs/xml/examples/06-journey-map/06-journey-map-4.png index 5f159b73..02477669 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-4.png and b/docs/xml/examples/06-journey-map/06-journey-map-4.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-5.png b/docs/xml/examples/06-journey-map/06-journey-map-5.png index 690dcfb0..037a48b7 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-5.png and b/docs/xml/examples/06-journey-map/06-journey-map-5.png differ diff --git a/docs/xml/examples/06-journey-map/06-journey-map-6.png b/docs/xml/examples/06-journey-map/06-journey-map-6.png index ffa8db12..92bc2b0e 100644 Binary files a/docs/xml/examples/06-journey-map/06-journey-map-6.png and b/docs/xml/examples/06-journey-map/06-journey-map-6.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-0.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-0.png index 59ba331e..ea14c68f 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-0.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-0.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-1.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-1.png index c60b1664..600fc906 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-1.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-1.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-2.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-2.png index 7fddac88..9b8e8572 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-2.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-2.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-3.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-3.png index 4c31eb7f..285bc053 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-3.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-3.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-4.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-4.png index d7f8ef05..5225f15d 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-4.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-4.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-5.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-5.png index 538608fb..23a20b02 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-5.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-5.png differ diff --git a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-6.png b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-6.png index bb8d2499..d57ec81f 100644 Binary files a/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-6.png and b/docs/xml/examples/06-moving-journey-map/06-moving-journey-map-6.png differ diff --git a/docs/xml/examples/09-frame/09-frame-4.png b/docs/xml/examples/09-frame/09-frame-4.png index 2b8674da..265dd5dc 100644 Binary files a/docs/xml/examples/09-frame/09-frame-4.png and b/docs/xml/examples/09-frame/09-frame-4.png differ diff --git a/docs/xml/examples/09-frame/09-frame-5.png b/docs/xml/examples/09-frame/09-frame-5.png index 50fa865b..644bc300 100644 Binary files a/docs/xml/examples/09-frame/09-frame-5.png and b/docs/xml/examples/09-frame/09-frame-5.png differ diff --git a/docs/xml/examples/09-frame/09-frame-6.png b/docs/xml/examples/09-frame/09-frame-6.png index b8febd58..fb54fcf4 100644 Binary files a/docs/xml/examples/09-frame/09-frame-6.png and b/docs/xml/examples/09-frame/09-frame-6.png differ diff --git a/gopro_overlay/widgets/cairo/circuit.py b/gopro_overlay/widgets/cairo/circuit.py index 84a7123b..89af0438 100644 --- a/gopro_overlay/widgets/cairo/circuit.py +++ b/gopro_overlay/widgets/cairo/circuit.py @@ -124,7 +124,9 @@ def journey(self): self._journey = Journey() self.framemeta.process(self._journey.accept) bbox = self._journey.bounding_box - self._size = bbox.size() * 1.1 + size = bbox.size() * 1.1 + + self._size = max(size.x, size.y) self._mid = Coordinate( x=((bbox.max.lat - bbox.min.lat) / 2) + bbox.min.lat, @@ -133,8 +135,8 @@ def journey(self): return self._journey def scale(self, point): - x = ((point.lat - self._mid.x) / self._size.x) - y = ((point.lon - self._mid.y) / self._size.y) + x = ((point.lat - self._mid.x) / self._size) + y = ((point.lon - self._mid.y) / self._size) return x, y def draw(self, context: cairo.Context): diff --git a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_defaults.approved.png b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_defaults.approved.png index aa854755..668b41b9 100644 Binary files a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_defaults.approved.png and b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_defaults.approved.png differ diff --git a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_fill.approved.png b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_fill.approved.png index f8807d84..bb8b8a0f 100644 Binary files a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_fill.approved.png and b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_fill.approved.png differ diff --git a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_line_width.approved.png b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_line_width.approved.png index 149cb07d..bd05ddac 100644 Binary files a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_line_width.approved.png and b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_line_width.approved.png differ diff --git a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_location.approved.png b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_location.approved.png index 0ece778d..fd3f22b3 100644 Binary files a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_location.approved.png and b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_location.approved.png differ diff --git a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_outline.approved.png b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_outline.approved.png index e2c3ad5d..11274110 100644 Binary files a/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_outline.approved.png and b/tests/widgets/approvals/test_widgets_circuit_cairo_circuit_outline.approved.png differ diff --git a/tests/widgets/test_widgets_circuit.py b/tests/widgets/test_widgets_circuit.py index 9fa589fb..12c1a066 100644 --- a/tests/widgets/test_widgets_circuit.py +++ b/tests/widgets/test_widgets_circuit.py @@ -6,8 +6,8 @@ from gopro_overlay.widgets.cairo.cairo import CairoAdapter, CairoWidget from gopro_overlay.widgets.cairo.circuit import CairoCircuit, Line from gopro_overlay.widgets.map import Circuit -from tests.widgets import test_widgets_setup from tests.approval import approve_image +from tests.widgets import test_widgets_setup from tests.widgets.test_widgets import time_rendering ts = test_widgets_setup.ts