From d21a008de446e2bae4453059647fbc24c17a8cfa Mon Sep 17 00:00:00 2001 From: Sam Nosenzo Date: Tue, 21 May 2024 18:31:18 +0200 Subject: [PATCH 1/3] Update image annotations to specify origin and coordinate space of position --- schemas/typescript/CircleAnnotation.ts | 5 ++++- schemas/typescript/PointsAnnotation.ts | 5 ++++- schemas/typescript/TextAnnotation.ts | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/schemas/typescript/CircleAnnotation.ts b/schemas/typescript/CircleAnnotation.ts index 128c996..481b5e9 100644 --- a/schemas/typescript/CircleAnnotation.ts +++ b/schemas/typescript/CircleAnnotation.ts @@ -10,7 +10,10 @@ export type CircleAnnotation = { /** Timestamp of circle */ timestamp: Time; - /** Center of the circle in 2D image coordinates (pixels) */ + /** Center of the circle in 2D image coordinates (pixels) + * The coordinate uses the top-left corner of the image as the origin. + * It is not centered on the pixel, but on the top-left corner of the pixel. + */ position: Point2; /** Circle diameter in pixels */ diff --git a/schemas/typescript/PointsAnnotation.ts b/schemas/typescript/PointsAnnotation.ts index 03fa1d7..75eb974 100644 --- a/schemas/typescript/PointsAnnotation.ts +++ b/schemas/typescript/PointsAnnotation.ts @@ -14,7 +14,10 @@ export type PointsAnnotation = { /** Type of points annotation to draw */ type: PointsAnnotationType; - /** Points in 2D image coordinates (pixels) */ + /** Points in 2D image coordinates (pixels) + * The coordinate uses the top-left corner of the image as the origin. + * It is not centered on the pixel, but on the top-left corner of the pixel. + */ points: Point2[]; /** Outline color */ diff --git a/schemas/typescript/TextAnnotation.ts b/schemas/typescript/TextAnnotation.ts index d5dc6bd..cb665e6 100644 --- a/schemas/typescript/TextAnnotation.ts +++ b/schemas/typescript/TextAnnotation.ts @@ -10,7 +10,10 @@ export type TextAnnotation = { /** Timestamp of annotation */ timestamp: Time; - /** Bottom-left origin of the text label in 2D image coordinates (pixels) */ + /** Bottom-left origin of the text label in 2D image coordinates (pixels) + * The coordinate uses the top-left corner of the image as the origin. + * It is not centered on the pixel, but on the top-left corner of the pixel. + */ position: Point2; /** Text to display */ From aafde108fdce35963da020f4491521fceb726af0 Mon Sep 17 00:00:00 2001 From: Sam Nosenzo Date: Wed, 22 May 2024 15:34:10 +0200 Subject: [PATCH 2/3] update generated files --- schemas/typescript/CircleAnnotation.ts | 5 +---- schemas/typescript/PointsAnnotation.ts | 5 +---- schemas/typescript/TextAnnotation.ts | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/schemas/typescript/CircleAnnotation.ts b/schemas/typescript/CircleAnnotation.ts index 481b5e9..128c996 100644 --- a/schemas/typescript/CircleAnnotation.ts +++ b/schemas/typescript/CircleAnnotation.ts @@ -10,10 +10,7 @@ export type CircleAnnotation = { /** Timestamp of circle */ timestamp: Time; - /** Center of the circle in 2D image coordinates (pixels) - * The coordinate uses the top-left corner of the image as the origin. - * It is not centered on the pixel, but on the top-left corner of the pixel. - */ + /** Center of the circle in 2D image coordinates (pixels) */ position: Point2; /** Circle diameter in pixels */ diff --git a/schemas/typescript/PointsAnnotation.ts b/schemas/typescript/PointsAnnotation.ts index 75eb974..03fa1d7 100644 --- a/schemas/typescript/PointsAnnotation.ts +++ b/schemas/typescript/PointsAnnotation.ts @@ -14,10 +14,7 @@ export type PointsAnnotation = { /** Type of points annotation to draw */ type: PointsAnnotationType; - /** Points in 2D image coordinates (pixels) - * The coordinate uses the top-left corner of the image as the origin. - * It is not centered on the pixel, but on the top-left corner of the pixel. - */ + /** Points in 2D image coordinates (pixels) */ points: Point2[]; /** Outline color */ diff --git a/schemas/typescript/TextAnnotation.ts b/schemas/typescript/TextAnnotation.ts index cb665e6..d5dc6bd 100644 --- a/schemas/typescript/TextAnnotation.ts +++ b/schemas/typescript/TextAnnotation.ts @@ -10,10 +10,7 @@ export type TextAnnotation = { /** Timestamp of annotation */ timestamp: Time; - /** Bottom-left origin of the text label in 2D image coordinates (pixels) - * The coordinate uses the top-left corner of the image as the origin. - * It is not centered on the pixel, but on the top-left corner of the pixel. - */ + /** Bottom-left origin of the text label in 2D image coordinates (pixels) */ position: Point2; /** Text to display */ From 17b2332684a63d88c7b6535728086dc1f01035be Mon Sep 17 00:00:00 2001 From: Sam Nosenzo Date: Thu, 23 May 2024 01:53:39 +0200 Subject: [PATCH 3/3] Remove melodic ci (#147) The ros CI action to use node v20 which can no longer run on this version of ubuntu. --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ea62f8..c82ab51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,9 +131,6 @@ jobs: fail-fast: false matrix: include: - - docker_image: rostooling/setup-ros-docker:ubuntu-bionic-ros-melodic-ros-base-latest - ros_distribution: melodic - ros_version: 1 - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-noetic-ros-base-latest ros_distribution: noetic ros_version: 1