From a3decd292d814846aade144781f2d53f26adf562 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 2 May 2024 23:00:22 +0200 Subject: [PATCH] RED-8825: general layoutparsing improvements * fix RulingCleaningService --- .../model/text/TextPositionSequence.java | 1 - .../services/RulingCleaningService.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java index 1d99460..2958fb7 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java @@ -146,7 +146,6 @@ public class TextPositionSequence extends BoundingBox implements CharSequence { this.pageHeight = textPositions.get(0).getPageHeight(); this.pageWidth = textPositions.get(0).getPageWidth(); setToBBoxOfComponents(getTextPositions()); - ; } diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java index 87b128e..e89ea3a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java @@ -103,30 +103,30 @@ public class RulingCleaningService { private static Rectangle2D getOverlapRectangle(Ruling ruling) { - float top; - float left; + float y; + float x; float w; float h; if (ruling.x1 < ruling.x2) { - left = ruling.x1; + x = ruling.x1; w = ruling.x2 - ruling.x1; } else { - left = ruling.x2; + x = ruling.x2; w = ruling.x1 - ruling.x2; } if (ruling.y1 < ruling.y2) { - top = ruling.y1; + y = ruling.y1; h = ruling.y2 - ruling.y1; } else { - top = ruling.y2; + y = ruling.y2; h = ruling.y1 - ruling.y2; } if (ruling.isHorizontal()) { - return new Rectangle2D.Double(top - THRESHOLD_Y_HORIZONTAL, left - THRESHOLD_X_HORIZONTAL, w + 2 * THRESHOLD_X_HORIZONTAL, h + 2 * THRESHOLD_Y_HORIZONTAL); + return new Rectangle2D.Double(x - THRESHOLD_Y_HORIZONTAL, y - THRESHOLD_X_HORIZONTAL, w + 2 * THRESHOLD_X_HORIZONTAL, h + 2 * THRESHOLD_Y_HORIZONTAL); } else { - return new Rectangle2D.Double(top - THRESHOLD_Y_VERTICAL, left - THRESHOLD_X_VERTICAL, w + 2 * THRESHOLD_X_VERTICAL, h + 2 * THRESHOLD_Y_VERTICAL); + return new Rectangle2D.Double(x - THRESHOLD_Y_VERTICAL, y - THRESHOLD_X_VERTICAL, w + 2 * THRESHOLD_X_VERTICAL, h + 2 * THRESHOLD_Y_VERTICAL); } }