Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-9151' into 'master'

Browse Source 
RED-9151: change text ordering to rendering order of the text

Closes RED-9151

See merge request redactmanager/red-ui!418
This commit is contained in:
Valentin-Gabriel Mihai 2024-05-21 14:28:51 +02:00
commit fd4b9c2ab1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts
View File

@ -105,9 +105,9 @@ export class REDDocumentViewer {
this.#pdf.instance.UI.setAnnotationContentOverlayHandler(() => (current ? undefined : false)); this.#pdf.instance.UI.setAnnotationContentOverlayHandler(() => (current ? undefined : false));
} }
init(document: DocumentViewer) { init(document: DocumentViewer, zOrderFlag: number) {
this.#document = document; this.#document = document;
this.#listenForDocEvents(); this.#listenForDocEvents(zOrderFlag);
this.keyUp$ = this.#keyUp$; this.keyUp$ = this.#keyUp$;
} }
@ -160,7 +160,7 @@ export class REDDocumentViewer {
} }
} }
#listenForDocEvents() { #listenForDocEvents(zOrderFlag: number) {
this.#document.addEventListener('textSelected', (quads: Quad, selectedText: string, pageNumber: number) => { this.#document.addEventListener('textSelected', (quads: Quad, selectedText: string, pageNumber: number) => {
this.selectedText$.next(selectedText); this.selectedText$.next(selectedText);
this.#disableTextPopupIfCompareMode(pageNumber); this.#disableTextPopupIfCompareMode(pageNumber);
@ -180,6 +180,8 @@ export class REDDocumentViewer {
this.#document.addEventListener('documentLoaded', () => { this.#document.addEventListener('documentLoaded', () => {
this.#logger.info('[PDF] Document loaded'); this.#logger.info('[PDF] Document loaded');
this.document.setTextExtractorProcessingFlags([zOrderFlag]);
this.#pdf.runWithCleanup(() => { this.#pdf.runWithCleanup(() => {
this.#flattenAnnotations().then(); this.#flattenAnnotations().then();
this.#setCurrentPage(); this.#setCurrentPage();

2
apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts
View File

@ -35,7 +35,7 @@ export function webViewerLoadedGuard(): CanActivateFn | ResolveFn<boolean> {
} }
annotationManager.init(instance.Core.annotationManager); annotationManager.init(instance.Core.annotationManager);
documentViewer.init(instance.Core.documentViewer); documentViewer.init(instance.Core.documentViewer, instance.Core.TextExtractorProcessingFlags.EXTRACT_USING_ZORDER);
viewerHeaderService.init(); viewerHeaderService.init();
return !!pdf.instance; return !!pdf.instance;