diff --git a/src/main/webapp/app/scanexam/chargerscan/chargerscan.component.ts b/src/main/webapp/app/scanexam/chargerscan/chargerscan.component.ts
index 0c777bc7..30309c78 100644
--- a/src/main/webapp/app/scanexam/chargerscan/chargerscan.component.ts
+++ b/src/main/webapp/app/scanexam/chargerscan/chargerscan.component.ts
@@ -16,7 +16,7 @@ import { ExamService } from 'app/entities/exam/service/exam.service';
import { IScan, Scan } from 'app/entities/scan/scan.model';
// import { AlertError } from 'app/shared/alert/alert-error.model';
import { MessageService, ConfirmationService } from 'primeng/api';
-import { finalize, firstValueFrom, Observable, scan, Subscriber } from 'rxjs';
+import { finalize, firstValueFrom, Observable, scan } from 'rxjs';
import { ScanService } from '../../entities/scan/service/scan.service';
import { IExam } from '../../entities/exam/exam.model';
import { CacheServiceImpl } from '../db/CacheServiceImpl';
@@ -27,6 +27,7 @@ import { QuestionService } from 'app/entities/question/service/question.service'
import { ZoneService } from 'app/entities/zone/service/zone.service';
import { PreferenceService } from '../preference-page/preference.service';
import { ViewandreorderpagesComponent } from '../viewandreorderpages/viewandreorderpages.component';
+import { PromisePool } from '@supercharge/promise-pool';
interface Upload {
progress: number;
@@ -75,13 +76,14 @@ export class ChargerscanComponent implements OnInit {
editForm: UntypedFormGroup;
progress = 0;
pageInTemplate = 0;
- pageInScan = 0;
+ pageAlreadyScan = 0;
message = '';
reloadScan = false;
merge = true;
saveTemplate = true;
- observablePage: Observable
| undefined;
- observerPage: Subscriber | undefined;
+ loaded = false;
+ // observablePage: Observable | undefined;
+ // observerPage: Subscriber | undefined;
@ViewChild('viewpage')
viewcomponent!: ViewandreorderpagesComponent;
@@ -110,7 +112,6 @@ export class ChargerscanComponent implements OnInit {
// private editedImage: HTMLCanvasElement | undefined;
templatePages: Map = new Map();
phase1 = false;
- loaded = false;
alignement = 'marker';
alignementOptions = [
{ label: 'Off', value: 'off' },
@@ -187,7 +188,7 @@ export class ChargerscanComponent implements OnInit {
}
async init(): Promise {
const p = await this.db.countNonAlignImage(+this.examid!);
- this.pageInScan = p;
+ this.pageAlreadyScan = p;
const templatePage = await this.db.countPageTemplate(+this.examid!);
this.pageInTemplate = templatePage;
}
@@ -288,7 +289,11 @@ export class ChargerscanComponent implements OnInit {
}
protected onSaveSuccess(): void {
- this.initCacheProcessing(false);
+ if (this.merge) {
+ this.initCacheProcessing(false);
+ } else {
+ this.initCacheProcessing(true);
+ }
this.reloadScan = false;
// this.gotoUE();
}
@@ -369,22 +374,25 @@ export class ChargerscanComponent implements OnInit {
}
const e1 = await firstValueFrom(this.templateService.getPdf(this.exam.templateId));
this.blob1 = e1;
+ this.loaded = true;
}
}
-
+ i = 1;
public async pdfloaded(): Promise {
- if (!this.phase1) {
- this.nbreFeuilleParCopie = this.pdfService.numberOfPages();
- }
- this.loaded = true;
- if (this.phase1) {
- if (this.pdfService.numberOfPages() !== 0) {
- // Change if partial update
- this.numberPagesInScan = this.pdfService.numberOfPages();
- this.avancementunit = ' / ' + this.numberPagesInScan;
+ if (this.loaded && this.pdfService.numberOfPages() !== 0) {
+ if (!this.phase1) {
+ this.nbreFeuilleParCopie = this.pdfService.numberOfPages();
+ await this.process();
+ } else {
+ if (this.pdfService.numberOfPages() !== 0 && this.i < 20) {
+ // Change if partial update
+ this.numberPagesInScan = this.pdfService.numberOfPages();
+ this.avancementunit = ' / ' + this.numberPagesInScan;
+ await this.process();
+ this.i = this.i + 1;
+ }
}
}
- await this.process();
}
blob: any;
@@ -405,59 +413,68 @@ export class ChargerscanComponent implements OnInit {
if (this.blob !== undefined) {
this.blob1 = this.blob;
} else {
- const e1 = await firstValueFrom(this.scanService.getPdf(this.exam.scanfileId));
- this.blob1 = e1;
+ this.blob1 = await firstValueFrom(this.scanService.getPdf(this.exam.scanfileId));
}
}
}
}
} else {
- this.observablePage = new Observable(observer => {
- this.observerPage = observer;
- });
-
- this.observablePage.subscribe(
- e => {
- this.processPage(e, false);
- // this.alignPage(e);
- },
- err => console.log(err),
- () => {
- this.phase1 = false;
- this.blob = undefined;
- this.blob1 = undefined;
- this.blocked = false;
- this.firstPageToLoad = 0;
- if (this.viewcomponent !== undefined) {
- this.viewcomponent.update();
- } else {
- this.db.countNonAlignImage(+this.examid!).then(p => {
- this.db.countPageTemplate(+this.examid!).then(p1 => {
- this.pageInScan = p;
- this.pageInTemplate = p1;
- this.showVignette = true;
- });
- });
- }
-
- this.progress = 0;
- this.submessage = '';
- this.message = '';
- // this.saveData();
- },
- );
-
this.startPage = 1;
this.currentPageAlign = 1;
- while (
- this.currentPageAlign < this.startPage + ((navigator.hardwareConcurrency - 1) * 3) / 2 &&
- this.currentPageAlign < this.numberPagesInScan + 1
- ) {
- this.observerPage!.next(this.currentPageAlign);
- this.currentPageAlign = this.currentPageAlign + 1;
+ const pagesnumber: number[] = [];
+ for (let i = 1; i <= this.numberPagesInScan; i++) {
+ pagesnumber.push(i);
}
+ await PromisePool.for(pagesnumber)
+ .withConcurrency(30)
+ /* .onTaskStarted((page, pool) => {
+ console.log(`Progress: ${pool.processedPercentage()}%`);
+ console.log(`Active tasks: ${pool.processedItems().length}`);
+ console.log(`Active tasks: ${pool.activeTasksCount()}`);
+ console.log(`Finished tasks: ${pool.processedItems().length}`);
+ console.log(`Finished tasks: ${pool.processedCount()}`);
+ })*/
+ .onTaskFinished((page, pool) => {
+ this.progress = pool.processedPercentage();
+ this.avancement = this.currentPageAlignOver;
+ this.currentPageAlignOver = this.currentPageAlignOver + 1;
+ this.submessage = '' + this.avancement + this.avancementunit;
+ })
+ .process(async page => {
+ console.error('send process', page);
+ await this.processPage(page, false);
+ });
+ // await Promise.all(this.imagesP);
+ console.error('end of processing');
+ /* if (this.images1.length>20){
+ await this.db.addNonAligneImages(this.images1);
+ this.images1 = [];
+ }*/
+
+ this.loaded = false;
+ // this.blob = undefined;
+ // this.blob1 = undefined;
+ // this.phase1 = false;
+ this.blocked = false;
+ this.firstPageToLoad = 0;
+ if (this.viewcomponent !== undefined) {
+ this.viewcomponent.update();
+ } else {
+ this.db.countNonAlignImage(+this.examid!).then(p => {
+ this.db.countPageTemplate(+this.examid!).then(p1 => {
+ this.pageAlreadyScan = p;
+ this.pageInTemplate = p1;
+ this.showVignette = true;
+ });
+ });
+ }
+
+ this.progress = 0;
+ this.submessage = '';
+ this.message = '';
}
+ this.blocked = false;
}
async saveTemplateImage(pageN: number, imageD: any): Promise {
@@ -475,8 +492,10 @@ export class ChargerscanComponent implements OnInit {
}
}
+ images1: any[] = [];
+
async saveNonAligneImage(pageN: number, imageD: any): Promise {
- await this.db.addNonAligneImage({
+ const im1 = {
examId: +this.examid!,
pageNumber: pageN + this.firstPageToLoad,
value: JSON.stringify(
@@ -485,51 +504,45 @@ export class ChargerscanComponent implements OnInit {
},
this.replacer,
),
- });
- if (this.currentPageAlign < this.numberPagesInScan + 1) {
- this.observerPage?.next(this.currentPageAlign);
- this.currentPageAlign = this.currentPageAlign + 1;
- }
- if (this.currentPageAlignOver < this.numberPagesInScan) {
- this.avancement = this.currentPageAlignOver;
- this.currentPageAlignOver = this.currentPageAlignOver + 1;
- this.progress = Math.floor((this.avancement * 100) / this.numberPagesInScan);
- this.submessage = '' + this.avancement + this.avancementunit;
- } else {
- this.avancement = this.currentPageAlignOver;
- this.currentPageAlignOver = this.currentPageAlignOver + 1;
- this.observerPage?.complete();
- console.timeEnd('processPage');
- }
+ };
+ await this.db.addNonAligneImage(im1);
+ /* this.images1.push(im1)
+ if (this.images1.length>20){
+ await this.db.addNonAligneImages(this.images1);
+ this.images1 = [];
+ }*/
}
gotoUE(): any {
this.router.navigateByUrl('/exam/' + this.examid!);
}
- public async processPage(page: number, template: boolean): Promise {
+ // imagesP: Promise[] = [];
+ public async processPage(page: number, template: boolean): Promise {
+ console.error('process page');
const scale = { scale: this.scale };
- if (page === 1 && !template) console.time('processPage');
- if (page === 1 && !template) console.timeLog('processPage', 'before getDataURL ', page);
+ if (page < 10 && !template) console.time('processPage' + page);
+ if (page < 10 && !template) console.timeLog('processPage' + page, 'before getDataURL ', page);
const dataURL = await this.pdfService.getPageAsImage(page, scale);
- if (page === 1 && !template) console.timeLog('processPage', 'getDataURL ', page);
- const p = await this.saveImageScan(dataURL, page, template);
- if (page === 1 && !template) console.timeLog('processPage', 'saveImageScan ', page);
-
- return p + 1;
+ // this.pdfService.getP
+ if (page < 10 && !template) console.timeLog('processPage' + page, 'getDataURL ', page);
+ await this.saveImageScan(dataURL, page, template);
+ if (page < 10 && !template) console.timeLog('processPage' + page, 'saveImageScan ', page);
}
- async saveImageScan(file: any, pagen: number, template: boolean): Promise {
- // await this.saveNonAligneImage(pagen, file);
+ saveImageScan(file: any, pagen: number, template: boolean): Promise {
return new Promise(resolve => {
if (pagen === 1 && !template) console.timeLog('processPage', 'start', pagen);
const i = new Image();
i.onload = async () => {
if (pagen === 1 && !template) console.timeLog('processPage', 'image Loaded ', pagen);
- const editedImage = document.createElement('canvas');
- editedImage.width = i.width;
- editedImage.height = i.height;
+ const editedImage = new OffscreenCanvas(i.width, i.height);
+
+ // document.createElement('canvas');
+ // document.createOff
+ // editedImage.width = i.width;
+ // editedImage.height = i.height;
const ctx = editedImage.getContext('2d');
ctx!.drawImage(i, 0, 0);
if (pagen === 1 && !template) console.timeLog('processPage', 'draw first canvas ', pagen);
@@ -560,15 +573,22 @@ export class ChargerscanComponent implements OnInit {
exportImageType = this.preferenceService.getPreference().imageTypeExport;
}
- const webPImageURL = editedImage.toDataURL(exportImageType, compression);
+ const webPImageBlob = await editedImage.convertToBlob({
+ type: exportImageType,
+ quality: compression,
+ });
+ const webPImageURL = await blobToDataURL(webPImageBlob);
if (template) {
await this.saveTemplateImage(pagen, webPImageURL);
+ console.error('save template ' + pagen);
+ resolve();
} else {
if (pagen === 1 && !template) console.timeLog('processPage', 'before save ', pagen);
await this.saveNonAligneImage(pagen, webPImageURL);
+ resolve();
+
if (pagen === 1 && !template) console.timeLog('processPage', 'after save ', pagen);
}
- resolve(pagen);
};
i.src = file;
});
@@ -585,3 +605,17 @@ export class ChargerscanComponent implements OnInit {
}
}
}
+
+function blobToDataURL(blob: Blob): Promise {
+ return new Promise((resolve, reject) => {
+ const a = new FileReader();
+ a.onload = e => {
+ if (e.target !== null) {
+ resolve(e.target.result);
+ } else {
+ reject();
+ }
+ };
+ a.readAsDataURL(blob);
+ });
+}
diff --git a/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.ts b/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.ts
index 6917fc88..6231149b 100644
--- a/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.ts
+++ b/src/main/webapp/app/scanexam/corrigequestion/corrigequestion.component.ts
@@ -269,7 +269,7 @@ export class CorrigequestionComponent implements OnInit, AfterViewInit {
// await this.refreshStudentList(forceRefreshStudent);
}
if (this.studentid !== studentid_prev) {
- this.getSelectedStudent(this.currentStudent);
+ await this.getSelectedStudent(this.currentStudent);
}
// must be done here as the change of the nbreQuestions triggers the event of change question with page = 0
@@ -397,7 +397,7 @@ export class CorrigequestionComponent implements OnInit, AfterViewInit {
this.questions = undefined;
setTimeout(() => {
this.questions = questions;
- }, 0);
+ }, 20);
}, 1);
}
diff --git a/src/main/webapp/app/scanexam/db/CacheServiceImpl.ts b/src/main/webapp/app/scanexam/db/CacheServiceImpl.ts
index 16908d93..be8c830a 100644
--- a/src/main/webapp/app/scanexam/db/CacheServiceImpl.ts
+++ b/src/main/webapp/app/scanexam/db/CacheServiceImpl.ts
@@ -63,6 +63,9 @@ export class CacheServiceImpl implements CacheService {
addNonAligneImage(elt: AlignImage): Promise {
return this.service.addNonAligneImage(elt);
}
+ addNonAligneImages(elts: AlignImage[]): Promise {
+ return this.service.addNonAligneImages(elts);
+ }
export(examId: number, options?: ExportOptions | undefined): Promise {
return this.service.export(examId, options);
}
diff --git a/src/main/webapp/app/scanexam/db/db.ts b/src/main/webapp/app/scanexam/db/db.ts
index 2d81142b..4a5a8791 100644
--- a/src/main/webapp/app/scanexam/db/db.ts
+++ b/src/main/webapp/app/scanexam/db/db.ts
@@ -199,6 +199,9 @@ export class ExamIndexDB extends Dexie {
async addNonAligneImage(elt: AlignImage) {
await this.nonAlignImages.put(elt);
}
+ async addNonAligneImages(elts: AlignImage[]) {
+ await this.nonAlignImages.bulkAdd(elts);
+ }
export(options?: ExportOptions): Promise {
return super.export(options);
@@ -464,6 +467,19 @@ export class AppDB implements CacheService {
return db1.addNonAligneImage(elt);
}
+ async addNonAligneImages(elts: AlignImage[]): Promise {
+ if (elts.length > 0) {
+ let db1 = this.dbs.get(elts[0].examId);
+ if (db1 === undefined) {
+ db1 = new ExamIndexDB(elts[0].examId);
+ this.dbs.set(elts[0].examId, db1);
+ }
+ return db1.addNonAligneImages(elts);
+ } else {
+ return;
+ }
+ }
+
export(examId: number, options?: ExportOptions): Promise {
let db1 = this.dbs.get(examId);
if (db1 === undefined) {
@@ -652,6 +668,7 @@ export interface CacheService {
removePageNonAlignForExamForPages(examId: number, pageStart: number, pageEnd: number): Promise;
addAligneImage(elt: AlignImage): Promise;
addNonAligneImage(elt: AlignImage): Promise;
+ addNonAligneImages(elts: AlignImage[]): Promise;
export(examId: number, options?: ExportOptions): Promise;
import(examId: number, blob: Blob, options?: ImportOptions): Promise;
countPageTemplate(examId: number): Promise;
diff --git a/src/main/webapp/app/scanexam/db/dbsqlite.ts b/src/main/webapp/app/scanexam/db/dbsqlite.ts
index de9bbffe..3f0345d1 100644
--- a/src/main/webapp/app/scanexam/db/dbsqlite.ts
+++ b/src/main/webapp/app/scanexam/db/dbsqlite.ts
@@ -209,6 +209,26 @@ export class SqliteCacheService implements CacheService {
return this._dispatch('addNonAligneImage', el1, [el1.value]).toPromise();
}
+ async addNonAligneImages(elts: ImageDB[]) {
+ const enc = new TextEncoder(); // always utf-8
+ if (elts.length > 0) {
+ const els: any[] = [];
+ const els1: ArrayBufferLike[] = [];
+ elts.forEach(elt => {
+ const el1 = {
+ examId: elt.examId,
+ pageNumber: elt.pageNumber,
+ value: enc.encode(elt.value).buffer,
+ };
+ els.push(el1);
+ els1.push(el1.value);
+ });
+
+ return this._dispatch('addNonAligneImages', els, els1).toPromise();
+ }
+ return;
+ }
+
export(examId: number, options?: ExportOptions | undefined): Promise {
return this._dispatch('export', {
examId: examId,
diff --git a/src/main/webapp/i18n/en/scanexammodule.json b/src/main/webapp/i18n/en/scanexammodule.json
index fbf7bcca..13ebd972 100644
--- a/src/main/webapp/i18n/en/scanexammodule.json
+++ b/src/main/webapp/i18n/en/scanexammodule.json
@@ -443,6 +443,8 @@
"hybridcommentStep": "Number of slice(s)",
"hybridcommentStepTooltip": "Used to indicate whether the marker can divide the value of this comment into a number of slices. For example, if the mark for this comment is 80% of the overall mark and the number of brackets is 2, the marker may not apply this comment, apply this comment with one slice (40% of the overall mark) or apply this comment with two slices (80% of the overall mark).",
"hybridcommentGrade": "Grade",
- "downloadpdf": "Download pdfs"
+ "downloadpdf": "Download pdfs",
+ "stepPage": "Number of images processed in batch",
+ "stepPageTooltip": "Used to configure the number of images processed in batch before memory is released"
}
}
diff --git a/src/main/webapp/i18n/fr/scanexammodule.json b/src/main/webapp/i18n/fr/scanexammodule.json
index 6765266a..8f5df6ee 100644
--- a/src/main/webapp/i18n/fr/scanexammodule.json
+++ b/src/main/webapp/i18n/fr/scanexammodule.json
@@ -447,6 +447,8 @@
"hybridcommentStep": "Nombre de tranche(s)",
"hybridcommentStepTooltip": "Permet d'exprimer si le correcteur pourra diviser la valeur de ce commentaire en un nombre de tranche(s). Ainsi, si la note de ce commentaire vaut 80% de la note globale et que le nombre de tranche est 2, le correcteur pourra ne pas appliquer ce commentaire, appliquer ce commentaire avec une tranche (40% de la note globale), appliquer ce commentaire avec deux tranches 80% de la note globale",
"hybridcommentGrade": "Note",
- "downloadpdf": "Téléchargement pdfs"
+ "downloadpdf": "Téléchargement pdfs",
+ "stepPage": "Nombre d'images traitées en batch",
+ "stepPageTooltip": "Permet de configurer le nombre d'images traitées en batch avant libération de la mémoire"
}
}