From 0ad0cd45d64f27a139910a17174c8206ab2fa950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Fri, 8 Mar 2024 14:20:28 +0100 Subject: [PATCH] RED-7141: Moved docstrum to root level of processor package --- .../docstrum/DocstrumSegmentationService.java | 16 ++++++++-------- .../docstrum/model/AngleFilter.java | 4 ++-- .../docstrum/model/BoundingBox.java | 7 ++----- .../{services => }/docstrum/model/Character.java | 4 ++-- .../{services => }/docstrum/model/Histogram.java | 2 +- .../{services => }/docstrum/model/Line.java | 2 +- .../{services => }/docstrum/model/Neighbor.java | 2 +- .../{services => }/docstrum/model/UnionFind.java | 2 +- .../{services => }/docstrum/model/Zone.java | 2 +- .../docstrum/service/LineBuilderService.java | 10 +++++----- .../service/NearestNeighbourService.java | 6 +++--- .../docstrum/service/ReadingOrderService.java | 8 ++++---- .../docstrum/service/SpacingService.java | 10 +++++----- .../docstrum/service/ZoneBuilderService.java | 10 +++++----- .../docstrum/utils/DoubleUtils.java | 2 +- .../{services => }/docstrum/utils/FastAtan2.java | 2 +- .../DocstrumBlockificationService.java | 4 ++-- 17 files changed, 45 insertions(+), 48 deletions(-) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/DocstrumSegmentationService.java (71%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/AngleFilter.java (87%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/BoundingBox.java (64%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/Character.java (92%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/Histogram.java (96%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/Line.java (98%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/Neighbor.java (90%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/UnionFind.java (89%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/model/Zone.java (93%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/service/LineBuilderService.java (79%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/service/NearestNeighbourService.java (93%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/service/ReadingOrderService.java (93%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/service/SpacingService.java (77%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/service/ZoneBuilderService.java (92%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/utils/DoubleUtils.java (82%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{services => }/docstrum/utils/FastAtan2.java (96%) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/DocstrumSegmentationService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/DocstrumSegmentationService.java similarity index 71% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/DocstrumSegmentationService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/DocstrumSegmentationService.java index 019b4a8..eb62ce2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/DocstrumSegmentationService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/DocstrumSegmentationService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum; +package com.knecon.fforesight.service.layoutparser.processor.docstrum; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import java.util.stream.Collectors; import org.springframework.stereotype.Service; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.LineBuilderService; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.NearestNeighbourService; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.ReadingOrderService; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.SpacingService; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.ZoneBuilderService; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.LineBuilderService; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.NearestNeighbourService; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.ReadingOrderService; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.SpacingService; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.ZoneBuilderService; import lombok.RequiredArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/AngleFilter.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/AngleFilter.java similarity index 87% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/AngleFilter.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/AngleFilter.java index c7fd0a6..a51051d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/AngleFilter.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/AngleFilter.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; public class AngleFilter { @@ -7,7 +7,7 @@ public class AngleFilter { public AngleFilter(double lowerAngle, double upperAngle) { - + this.lowerAngle = lowerAngle < -Math.PI / 2 ? lowerAngle + Math.PI : lowerAngle; this.upperAngle = upperAngle >= Math.PI / 2 ? upperAngle - Math.PI : upperAngle; } diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/BoundingBox.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/BoundingBox.java similarity index 64% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/BoundingBox.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/BoundingBox.java index 79647ed..8e6785c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/BoundingBox.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/BoundingBox.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import java.awt.geom.Rectangle2D; @@ -42,10 +42,7 @@ public abstract class BoundingBox { public boolean contains(Rectangle2D contained, double tolerance) { - return bBox.getX() <= contained.getX() + tolerance - && bBox.getY() <= contained.getY() + tolerance - && bBox.getX() + bBox.getWidth() >= contained.getX() + contained.getWidth() - tolerance - && bBox.getY() + bBox.getHeight() >= contained.getY() + contained.getHeight() - tolerance; + return bBox.getX() <= contained.getX() + tolerance && bBox.getY() <= contained.getY() + tolerance && bBox.getX() + bBox.getWidth() >= contained.getX() + contained.getWidth() - tolerance && bBox.getY() + bBox.getHeight() >= contained.getY() + contained.getHeight() - tolerance; } diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Character.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Character.java similarity index 92% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Character.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Character.java index 7df77ea..b4e2616 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Character.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Character.java @@ -1,11 +1,11 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.FastAtan2; import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.FastAtan2; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Histogram.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Histogram.java similarity index 96% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Histogram.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Histogram.java index fb34ac6..3f4c09a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Histogram.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Histogram.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; public class Histogram { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Line.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Line.java similarity index 98% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Line.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Line.java index 3f96195..fa85249 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Line.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Line.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import java.awt.geom.Rectangle2D; import java.util.ArrayList; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Neighbor.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Neighbor.java similarity index 90% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Neighbor.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Neighbor.java index b06d5e0..651f73f 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Neighbor.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Neighbor.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import lombok.Getter; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/UnionFind.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/UnionFind.java similarity index 89% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/UnionFind.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/UnionFind.java index aaa2c37..11932f4 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/UnionFind.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/UnionFind.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Zone.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Zone.java similarity index 93% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Zone.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Zone.java index d5651d8..85facd2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Zone.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/model/Zone.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.model; import java.awt.geom.Rectangle2D; import java.util.Comparator; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/LineBuilderService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/LineBuilderService.java similarity index 79% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/LineBuilderService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/LineBuilderService.java index 06cd65e..66536a5 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/LineBuilderService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/LineBuilderService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.service; import java.util.ArrayList; import java.util.Comparator; @@ -7,10 +7,10 @@ import java.util.List; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.AngleFilter; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.UnionFind; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.AngleFilter; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Line; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.UnionFind; @Service public class LineBuilderService { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/NearestNeighbourService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/NearestNeighbourService.java similarity index 93% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/NearestNeighbourService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/NearestNeighbourService.java index cf402d8..842e3df 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/NearestNeighbourService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/NearestNeighbourService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.service; import java.util.ArrayList; import java.util.Comparator; @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Neighbor; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Neighbor; @Service public class NearestNeighbourService { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ReadingOrderService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ReadingOrderService.java similarity index 93% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ReadingOrderService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ReadingOrderService.java index e084d88..590a091 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ReadingOrderService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ReadingOrderService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.service; import java.util.ArrayList; import java.util.Comparator; @@ -9,9 +9,9 @@ import java.util.Map; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.BoundingBox; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.DoubleUtils; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.DoubleUtils; @Service public class ReadingOrderService { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/SpacingService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/SpacingService.java similarity index 77% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/SpacingService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/SpacingService.java index 2aab22d..71d0f9d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/SpacingService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/SpacingService.java @@ -1,13 +1,13 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.service; import java.util.List; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.AngleFilter; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Histogram; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Neighbor; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.AngleFilter; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Histogram; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Neighbor; @Service public class SpacingService { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ZoneBuilderService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ZoneBuilderService.java similarity index 92% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ZoneBuilderService.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ZoneBuilderService.java index c7bdaa8..316cdfc 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ZoneBuilderService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/service/ZoneBuilderService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.service; import java.util.ArrayList; import java.util.Comparator; @@ -8,10 +8,10 @@ import java.util.Set; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.UnionFind; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Line; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.UnionFind; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone; @Service public class ZoneBuilderService { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/DoubleUtils.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/DoubleUtils.java similarity index 82% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/DoubleUtils.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/DoubleUtils.java index d762cf0..6fdadc8 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/DoubleUtils.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/DoubleUtils.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.utils; public class DoubleUtils { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/FastAtan2.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/FastAtan2.java similarity index 96% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/FastAtan2.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/FastAtan2.java index 6d6cb36..4a7986a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/FastAtan2.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/docstrum/utils/FastAtan2.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils; +package com.knecon.fforesight.service.layoutparser.processor.docstrum.utils; public class FastAtan2 { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocstrumBlockificationService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocstrumBlockificationService.java index 74772ca..fc560a2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocstrumBlockificationService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocstrumBlockificationService.java @@ -12,6 +12,8 @@ import java.util.Set; import org.springframework.stereotype.Service; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.DocstrumSegmentationService; +import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone; import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; import com.knecon.fforesight.service.layoutparser.processor.model.FloatFrequencyCounter; @@ -21,8 +23,6 @@ import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePag import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.DocstrumSegmentationService; -import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone; import com.knecon.fforesight.service.layoutparser.processor.utils.QuickSort; import com.knecon.fforesight.service.layoutparser.processor.utils.RulingTextDirAdjustUtil; import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionSequenceComparator;