From fda3f1001f4d036dc1bcb25e0c56d35973c1aaf5 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 6 May 2024 14:53:47 +0200 Subject: [PATCH] akra-certificate: wip --- .../layoutparser/processor/LayoutParsingPipeline.java | 4 ++-- .../processor/docstrum/model/ColumnDetector.java | 2 +- .../layoutparser/processor/model/text/RedTextPosition.java | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java index d0f1ce0..6db3724 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java @@ -121,7 +121,7 @@ public class LayoutParsingPipeline { tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.tablesFileStorageId().get()); } - ClassificationDocument classificationDocument = parseLayout(layoutParsingRequest.layoutParsingType(), + ClassificationDocument classificationDocument = parseLayout(LayoutParsingType.CLARIFYND_PARAGRAPH_DEBUG, originFile, imageServiceResponse, tableServiceResponse, @@ -130,7 +130,7 @@ public class LayoutParsingPipeline { log.info("Building document graph for {}", layoutParsingRequest.identifier()); - Document documentGraph = observeBuildDocumentGraph(layoutParsingRequest.layoutParsingType(), classificationDocument); + Document documentGraph = observeBuildDocumentGraph(LayoutParsingType.CLARIFYND_PARAGRAPH_DEBUG, classificationDocument); log.info("Creating viewer document for {}", layoutParsingRequest.identifier()); diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/ColumnDetector.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/ColumnDetector.java index c8601dd..de3f2ec 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/ColumnDetector.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/ColumnDetector.java @@ -11,7 +11,7 @@ import java.util.Set; public class ColumnDetector { public static final double MAX_VALUE_THRESHOLD = 0.5; - final static int bins_num = 128; + final static int bins_num = 512; final static int globalStartIdx = 0; // ignore outer parts completely, we don't expect columns there final static int globalEndIdx = bins_num; // i chose 7, since thirds seems a likely split for columns, therefore divided by 6 would eliminate those. public static final double DERIVATIVE_ZERO_THRESHOLD = 1e-10; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/RedTextPosition.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/RedTextPosition.java index 710d7eb..c25e857 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/RedTextPosition.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/RedTextPosition.java @@ -76,15 +76,14 @@ public class RedTextPosition extends BoundingBox { pos.setBBoxDirAdj(dirAdjPosition); AffineTransform affineTransform = getRotationMatrix(TextDirection.fromDegrees(textPosition.getDir()), textPosition.getPageWidth(), textPosition.getPageHeight()); - Rectangle2D initialUserSpacePositionRect = affineTransform.createTransformedShape(dirAdjPosition).getBounds2D(); + Rectangle2D bBoxInitialUserSpace = affineTransform.createTransformedShape(dirAdjPosition).getBounds2D(); - pos.setBBoxInitialUserSpace(initialUserSpacePositionRect); // These are definitely correct + pos.setBBoxInitialUserSpace(bBoxInitialUserSpace); // These are definitely correct return pos; } - private static AffineTransform getRotationMatrix(TextDirection textDirection, float pageWidth, float pageHeight) { AffineTransform transform = new AffineTransform();