diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParserSettings.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParserSettings.java index f287a3f..f9ff6e4 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParserSettings.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParserSettings.java @@ -17,6 +17,4 @@ public class LayoutParserSettings { boolean debug; LayoutParsingType layoutParsingTypeOverride; - String pdftronLicense; - String layoutParserVersion; } 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 230d8a4..8d4f05d 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 @@ -20,6 +20,7 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.iqser.red.service.redaction.v1.server.mapper.DocumentDataMapper; @@ -87,29 +88,32 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service @RequiredArgsConstructor -@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) +@FieldDefaults(level = AccessLevel.PRIVATE) public class LayoutParsingPipeline { - ImageServiceResponseAdapter imageServiceResponseAdapter; - CvTableParsingAdapter cvTableParsingAdapter; - LayoutParsingStorageService layoutParsingStorageService; - SectionsBuilderService sectionsBuilderService; - SimplifiedSectionTextService simplifiedSectionTextService; - RulingCleaningService rulingCleaningService; - TableExtractionService tableExtractionService; - DocuMineBlockificationService docuMineBlockificationService; - RedactManagerBlockificationService redactManagerBlockificationService; - BlockificationPostprocessingService blockificationPostprocessingService; - DocstrumBlockificationService docstrumBlockificationService; - LayoutGridService layoutGridService; - ObservationRegistry observationRegistry; - VisualLayoutParsingAdapter visualLayoutParsingAdapter; - GraphicExtractorService graphicExtractorService; - OutlineExtractorService outlineExtractorService; - SectionTreeBuilderService sectionTreeBuilderService; - SectionTreeEnhancementService sectionTreeEnhancementService; - LayoutParserSettings settings; - ClassificationService classificationService; + final ImageServiceResponseAdapter imageServiceResponseAdapter; + final CvTableParsingAdapter cvTableParsingAdapter; + final LayoutParsingStorageService layoutParsingStorageService; + final SectionsBuilderService sectionsBuilderService; + final SimplifiedSectionTextService simplifiedSectionTextService; + final RulingCleaningService rulingCleaningService; + final TableExtractionService tableExtractionService; + final DocuMineBlockificationService docuMineBlockificationService; + final RedactManagerBlockificationService redactManagerBlockificationService; + final BlockificationPostprocessingService blockificationPostprocessingService; + final DocstrumBlockificationService docstrumBlockificationService; + final LayoutGridService layoutGridService; + final ObservationRegistry observationRegistry; + final VisualLayoutParsingAdapter visualLayoutParsingAdapter; + final GraphicExtractorService graphicExtractorService; + final OutlineExtractorService outlineExtractorService; + final SectionTreeBuilderService sectionTreeBuilderService; + final SectionTreeEnhancementService sectionTreeEnhancementService; + final LayoutParserSettings settings; + final ClassificationService classificationService; + + @Value("${LAYOUT_PARSER_VERSION:}") + private String layoutParserVersion; public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException { @@ -133,7 +137,6 @@ public class LayoutParsingPipeline { LayoutParsingType layoutParsingType = settings.getLayoutParsingTypeOverride() == null // ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(); - String layoutParserVersion = settings.getLayoutParserVersion(); ClassificationDocument classificationDocument = parseLayout(layoutParsingType, originFile, diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutGrid.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutGrid.java index 01dc66b..fa6ea96 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutGrid.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutGrid.java @@ -417,14 +417,15 @@ public class LayoutGrid extends LayoutGridLayerConfig { public void addVersionAndLayoutParsingType(String version, String layoutParsingType, Page page) { PageInformation pageInformation = PageInformation.fromPage(page); - Point2D point1 = new Point2D.Double(0, pageInformation.height() - 5); - Point2D point2 = new Point2D.Double(0, pageInformation.height() - 5 - FONT_SIZE * 1.5); + double startHeight = pageInformation.heightRot() - 5; + Point2D point1 = new Point2D.Double(0, startHeight); + Point2D point2 = new Point2D.Double(0, startHeight - FONT_SIZE * 1.5); AffineTransform affineTransform = CoordinateTransforms.calculatePageCoordsToInitialUserSpaceCoords(pageInformation); - Point2D transformed1 = affineTransform.transform(point1, point1); - Point2D transformed2 = affineTransform.transform(point2, point2); + affineTransform.transform(point1, point1); + affineTransform.transform(point2, point2); getOrCreateVisualizationsOnPage(page.getNumber(), this.versionAndType).getPlacedTexts() - .addAll(List.of(PlacedText.textFacingUp(version, transformed1, FONT_SIZE, Color.BLACK, FONT), - PlacedText.textFacingUp(layoutParsingType, transformed2, FONT_SIZE, Color.BLACK, FONT))); + .addAll(List.of(PlacedText.textFacingUp(String.valueOf(version), point1, FONT_SIZE, Color.BLACK, FONT), + PlacedText.textFacingUp(String.valueOf(layoutParsingType), point2, FONT_SIZE, Color.BLACK, FONT))); } diff --git a/layoutparser-service/viewer-doc-processor/src/test/java/com/knecon/fforesight/service/viewerdoc/service/ViewerDocVersioningUtilityTest.java b/layoutparser-service/viewer-doc-processor/src/test/java/com/knecon/fforesight/service/viewerdoc/service/ViewerDocVersioningUtilityTest.java index 37e078d..8d60e8a 100644 --- a/layoutparser-service/viewer-doc-processor/src/test/java/com/knecon/fforesight/service/viewerdoc/service/ViewerDocVersioningUtilityTest.java +++ b/layoutparser-service/viewer-doc-processor/src/test/java/com/knecon/fforesight/service/viewerdoc/service/ViewerDocVersioningUtilityTest.java @@ -44,7 +44,7 @@ class ViewerDocVersioningUtilityTest { doc.save(out, SDFDoc.SaveMode.LINEARIZED, null); } assert ViewerDocVersioningUtility.isCurrentVersion(tmpFile.toFile()); - //assert tmpFile.toFile().delete(); + assert tmpFile.toFile().delete(); } } \ No newline at end of file