From 2cbce4f113b8cd4f5418ad156ca2902b32a7d94e Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 19 Aug 2022 13:26:25 +0200 Subject: [PATCH] RED-5022: Add figure detection values the same way as normal images --- .../server/redaction/model/image/ImageServiceResponse.java | 2 ++ .../redaction/v1/server/segmentation/ImageService.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java index d795a52f..e91864c7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java @@ -21,6 +21,8 @@ public class ImageServiceResponse { @JsonAttribute(alternativeNames = {"imageMetadata"}) private List data = new ArrayList<>(); + private List dataCV = new ArrayList<>(); + @JsonProperty(value = "imageMetadata") @JsonAlias("data") @JsonAttribute(alternativeNames = {"imageMetadata"}) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageService.java index 5daceb37..fca3dbc6 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/ImageService.java @@ -42,6 +42,12 @@ public class ImageService { .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification,imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber())); }); + imageServiceResponse.getDataCV().forEach(imageMetadata -> { + var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)) : ImageType.OTHER; + images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>()) + .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification,imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber())); + }); + return images; }