Update parameter

cvat-core/src/quality-settings.ts

@@ -14,6 +14,11 @@ export enum TargetMetric {
     RECALL = 'recall',
 }
 
+export enum PointSizeBase {
+    IMAGE_SIZE = 'image_size',
+    GROUP_BBOX_SIZE = 'group_bbox_size',
+}
+
 export default class QualitySettings {
     #id: number;
     #targetMetric: TargetMetric;
@@ -22,7 +27,7 @@ export default class QualitySettings {
     #task: number;
     #iouThreshold: number;
     #oksSigma: number;
-    #useBboxSizeForPoints: boolean;
+    #pointSizeBase: PointSizeBase;
     #lineThickness: number;
     #lowOverlapThreshold: number;
     #orientedLines: boolean;
@@ -43,7 +48,7 @@ export default class QualitySettings {
         this.#maxValidationsPerJob = initialData.max_validations_per_job;
         this.#iouThreshold = initialData.iou_threshold;
         this.#oksSigma = initialData.oks_sigma;
-        this.#useBboxSizeForPoints = initialData.use_bbox_size_for_points;
+        this.#pointSizeBase = initialData.point_size_base as PointSizeBase;
         this.#lineThickness = initialData.line_thickness;
         this.#lowOverlapThreshold = initialData.low_overlap_threshold;
         this.#orientedLines = initialData.compare_line_orientation;
@@ -81,12 +86,12 @@ export default class QualitySettings {
         this.#oksSigma = newVal;
     }
 
-    get useBboxSizeForPoints(): boolean {
-        return this.#useBboxSizeForPoints;
+    get pointSizeBase(): PointSizeBase {
+        return this.#pointSizeBase;
     }
 
-    set useBboxSizeForPoints(newVal: boolean) {
-        this.#useBboxSizeForPoints = newVal;
+    set pointSizeBase(newVal: PointSizeBase) {
+        this.#pointSizeBase = newVal;
     }
 
     get lineThickness(): number {
@@ -207,7 +212,7 @@ export default class QualitySettings {
         const result: SerializedQualitySettingsData = {
             iou_threshold: this.#iouThreshold,
             oks_sigma: this.#oksSigma,
-            use_bbox_size_for_points: this.#useBboxSizeForPoints,
+            point_size_base: this.#pointSizeBase,
             line_thickness: this.#lineThickness,
             low_overlap_threshold: this.#lowOverlapThreshold,
             compare_line_orientation: this.#orientedLines,

cvat-core/src/server-response-types.ts

@@ -247,7 +247,7 @@ export interface SerializedQualitySettingsData {
     max_validations_per_job?: number;
     iou_threshold?: number;
     oks_sigma?: number;
-    use_bbox_size_for_points?: boolean;
+    point_size_base?: string;
     line_thickness?: number;
     low_overlap_threshold?: number;
     compare_line_orientation?: boolean;

cvat-ui/src/components/quality-control/quality-control-page.tsx

@@ -225,7 +225,7 @@ function QualityControlPage(): JSX.Element {
                 settings.compareAttributes = values.compareAttributes;
 
                 settings.oksSigma = values.oksSigma / 100;
-                settings.useBboxSizeForPoints = values.useBboxSizeForPoints;
+                settings.pointSizeBase = values.pointSizeBase;
 
                 settings.lineThickness = values.lineThickness / 100;
                 settings.lineOrientationThreshold = values.lineOrientationThreshold / 100;

cvat-ui/src/components/quality-control/task-quality/quality-settings-form.tsx

@@ -14,6 +14,7 @@ import Button from 'antd/lib/button';
 import Select from 'antd/lib/select';
 import CVATTooltip from 'components/common/cvat-tooltip';
 import { QualitySettings, TargetMetric } from 'cvat-core-wrapper';
+import { PointSizeBase } from 'cvat-core/src/quality-settings';
 
 interface Props {
     form: FormInstance;
@@ -35,7 +36,7 @@ export default function QualitySettingsForm(props: Readonly<Props>): JSX.Element
         compareAttributes: settings.compareAttributes,
 
         oksSigma: settings.oksSigma * 100,
-        useBboxSizeForPoints: settings.useBboxSizeForPoints,
+        pointSizeBase: settings.pointSizeBase,
 
         lineThickness: settings.lineThickness * 100,
         lineOrientationThreshold: settings.lineOrientationThreshold * 100,
@@ -51,7 +52,13 @@ export default function QualitySettingsForm(props: Readonly<Props>): JSX.Element
 
     const targetMetricDescription = `${settings.descriptions.targetMetric
         .replaceAll(/\* [a-z` -]+[A-Z]+/g, '')
-        .replaceAll(/\n/g, '')}.`;
+        .replaceAll(/\n/g, '')
+    }`;
+
+    const pointSizeBaseDescription = `${settings.descriptions.pointSizeBase
+        .substring(0, settings.descriptions.pointSizeBase.indexOf('\n\n\n'))
+        .replaceAll(/\n/g, ' ')
+    }`;
 
     const makeTooltipFragment = (metric: string, description: string): JSX.Element => (
         <div>
@@ -91,7 +98,7 @@ export default function QualitySettingsForm(props: Readonly<Props>): JSX.Element
     );
 
     const pointTooltip = makeTooltip(
-        makeTooltipFragment('Use image space', settings.descriptions.useBboxSizeForPoints),
+        makeTooltipFragment('Point size base', pointSizeBaseDescription),
     );
 
     const linesTooltip = makeTooltip(
@@ -267,13 +274,21 @@ export default function QualitySettingsForm(props: Readonly<Props>): JSX.Element
             <Row>
                 <Col span={12}>
                     <Form.Item
-                        name='useBboxSizeForPoints'
-                        valuePropName='checked'
+                        name='pointSizeBase'
+                        label='Point size base'
                         rules={[{ required: true }]}
                     >
-                        <Checkbox>
-                            <Text className='cvat-text-color'>Use bbox size</Text>
-                        </Checkbox>
+                        <Select
+                            style={{ width: '70%' }}
+                            virtual={false}
+                        >
+                            <Select.Option value={PointSizeBase.IMAGE_SIZE}>
+                                Image size
+                            </Select.Option>
+                            <Select.Option value={PointSizeBase.GROUP_BBOX_SIZE}>
+                                Group bbox size
+                            </Select.Option>
+                        </Select>
                     </Form.Item>
                 </Col>
             </Row>

cvat/apps/quality_control/migrations/0004_qualitysettings_point_size_base.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.15 on 2024-11-06 15:39
+
+from django.db import migrations, models
+
+import cvat.apps.quality_control.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("quality_control", "0003_qualityreport_assignee_last_updated_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="qualitysettings",
+            name="point_size_base",
+            field=models.CharField(
+                choices=[("image_size", "IMAGE_SIZE"), ("group_bbox_size", "GROUP_BBOX_SIZE")],
+                default=cvat.apps.quality_control.models.PointSizeBase["GROUP_BBOX_SIZE"],
+                max_length=32,
+            ),
+        ),
+    ]

cvat/apps/quality_control/models.py

@@ -196,6 +196,18 @@ def clean(self) -> None:
             raise ValidationError(f"Unexpected type value '{self.type}'")
 
 
+class PointSizeBase(str, Enum):
+    IMAGE_SIZE = "image_size"
+    GROUP_BBOX_SIZE = "group_bbox_size"
+
+    def __str__(self) -> str:
+        return self.value
+
+    @classmethod
+    def choices(cls):
+        return tuple((x.value, x.name) for x in cls)
+
+
 class QualitySettings(models.Model):
     task = models.OneToOneField(Task, on_delete=models.CASCADE, related_name="quality_settings")
 
@@ -205,7 +217,9 @@ class QualitySettings(models.Model):
 
     low_overlap_threshold = models.FloatField()
 
-    use_bbox_size_for_points = models.BooleanField()
+    point_size_base = models.CharField(
+        max_length=32, choices=PointSizeBase.choices(), default=PointSizeBase.GROUP_BBOX_SIZE
+    )
 
     compare_line_orientation = models.BooleanField()
     line_orientation_threshold = models.FloatField()

cvat/apps/quality_control/quality_reports.py

@@ -187,8 +187,8 @@ class ComparisonParameters(_Serializable):
     oks_sigma: float = 0.09
     "Like IoU threshold, but for points, % of the bbox area to match a pair of points"
 
-    use_bbox_size_for_points: bool = True
-    "Compare point groups using the group bbox size instead of the image size"
+    point_size_base: models.PointSizeBase = models.PointSizeBase.GROUP_BBOX_SIZE
+    "Determines how to obtain the object size for point comparisons"
 
     line_thickness: float = 0.01
     "Thickness of polylines, relatively to the (image area) ^ 0.5"
@@ -958,7 +958,7 @@ def __init__(
         # https://cocodataset.org/#keypoints-eval
         # https://github.com/cocodataset/cocoapi/blob/8c9bcc3cf640524c4c20a9c40e89cb6a2f2fa0e9/PythonAPI/pycocotools/cocoeval.py#L523
         oks_sigma: float = 0.09,
-        use_bbox_size_for_points: bool = True,
+        point_size_base: models.PointSizeBase = models.PointSizeBase.GROUP_BBOX_SIZE,
         compare_line_orientation: bool = False,
         line_torso_radius: float = 0.01,
         panoptic_comparison: bool = False,
@@ -972,8 +972,8 @@ def __init__(
         self.oks_sigma = oks_sigma
         "% of the shape area"
 
-        self.use_bbox_size_for_points = use_bbox_size_for_points
-        "Compare point groups using the group bbox size instead of the image size"
+        self.point_size_base = point_size_base
+        "Compare point groups using the group bbox size or the image size"
 
         self.compare_line_orientation = compare_line_orientation
         "Whether lines are oriented or not"
@@ -1301,9 +1301,9 @@ def _distance(a: dm.Points, b: dm.Points) -> float:
                 # Complex case: multiple points, grouped points, points with a bbox
                 # Try to align points and then return the metric
 
-                if not self.use_bbox_size_for_points:
+                if self.point_size_base == models.PointSizeBase.IMAGE_SIZE:
                     scale = img_h * img_w
-                else:
+                elif self.point_size_base == models.PointSizeBase.GROUP_BBOX_SIZE:
                     # match points in their bbox space
 
                     if dm.ops.bbox_iou(a_bbox, b_bbox) <= 0:
@@ -1312,6 +1312,8 @@ def _distance(a: dm.Points, b: dm.Points) -> float:
 
                     bbox = dm.ops.mean_bbox([a_bbox, b_bbox])
                     scale = bbox[2] * bbox[3]
+                else:
+                    assert False, f"Unknown point size base {self.point_size_base}"
 
                 a_points = np.reshape(a.points, (-1, 2))
                 b_points = np.reshape(b.points, (-1, 2))
@@ -1537,7 +1539,7 @@ def __init__(self, categories: dm.CategoriesInfo, *, settings: ComparisonParamet
             panoptic_comparison=settings.panoptic_comparison,
             iou_threshold=settings.iou_threshold,
             oks_sigma=settings.oks_sigma,
-            use_bbox_size_for_points=settings.use_bbox_size_for_points,
+            point_size_base=settings.point_size_base,
             line_torso_radius=settings.line_thickness,
             compare_line_orientation=False,  # should not be taken from outside, handled differently
         )

cvat/apps/quality_control/serializers.py

@@ -81,7 +81,7 @@ class Meta:
             "max_validations_per_job",
             "iou_threshold",
             "oks_sigma",
-            "use_bbox_size_for_points",
+            "point_size_base",
             "line_thickness",
             "low_overlap_threshold",
             "compare_line_orientation",
@@ -116,17 +116,25 @@ class Meta:
             """,
             "oks_sigma": """
                 Like IoU threshold, but for points.
-                The percent of the bbox area, used as the radius of the circle around the GT point,
+                The percent of the bbox side, used as the radius of the circle around the GT point,
                 where the checked point is expected to be.
                 Read more: https://cocodataset.org/#keypoints-eval
             """,
-            "use_bbox_size_for_points": """
-                When comparing point groups, OKS sigma defines the matching area for a GT point.
-                If enabled, the area size is based on the point group bbox size.
-                If disabled, the image size is used.
-                Useful if point groups do not represent a single object or boxes attached to points
-                do not represent object boundaries.
-            """,
+            "point_size_base": """
+                When comparing point annotations (including both separate points and point groups),
+                the OKS sigma parameter defines matching area for each GT point based to the
+                object size. The point size base parameter allows to configure how to determine
+                the object size.
+                If {image_size}, the image size is used. Useful if each point
+                annotation represents a separate object or boxes grouped with points do not
+                represent object boundaries.
+                If {group_bbox_size}, the object size is based on
+                the point group bbox size. Useful if each point group represents an object
+                or there is a bbox grouped with points, representing the object size.
+            """.format(
+                image_size=models.PointSizeBase.IMAGE_SIZE,
+                group_bbox_size=models.PointSizeBase.GROUP_BBOX_SIZE,
+            ),
             "line_thickness": """
                 Thickness of polylines, relatively to the (image area) ^ 0.5.
                 The distance to the boundary around the GT line,