Skip to content

W
web-ui
Commit 251cc4f5 by Jorem Magcawas
Options

on progress fixing highlights on png and jpg on submit

parent 47b7fd3f
Showing with 68 additions and 37 deletions
WebGde/WebContent/src/accessFile/accessFile.js
......@@ -74,8 +74,10 @@ async function accessFile() {
//remove IMG and Tiff buttons
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlTiff || ctrlImg) {
ctrlTiff.outerHTML="";
if (ctrlTiff) {
ctrlImg.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
displayPdf(idQuery.result.path);
......@@ -91,8 +93,10 @@ async function accessFile() {
//Remove tiff and pdf
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlPdf = document.getElementById("controlsContainer");
if (ctrlTiff || ctrlPdf) {
if (ctrlTiff) {
ctrlTiff.outerHTML="";
}
if (ctrlPdf) {
ctrlPdf.outerHTML="";
}
displayImg(idQuery.result.path);
......@@ -101,8 +105,10 @@ async function accessFile() {
else {
var ctrlPdf = document.getElementById("controlsContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlPdf || ctrlImg) {
if (ctrlPdf) {
ctrlPdf.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
console.log("This is not a pdf file");
......@@ -125,8 +131,10 @@ async function accessFile() {
//remove IMG and Tiff buttons
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlTiff || ctrlImg) {
if (ctrlTiff) {
ctrlTiff.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
displayPdf(idQuery.result.path);
......@@ -142,19 +150,22 @@ async function accessFile() {
//Remove tiff and pdf
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlPdf = document.getElementById("controlsContainer");
if (ctrlTiff || ctrlPdf) {
if (ctrlTiff) {
ctrlTiff.outerHTML="";
}
if (ctrlPdf) {
ctrlPdf.outerHTML="";
}
displayImg(idQuery.result.path);
}else {
var ctrlPdf = document.getElementById("controlsContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlPdf || ctrlImg) {
if (ctrlPdf) {
ctrlPdf.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
console.log("This is not a pdf file");
window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
}
};
......@@ -259,8 +270,10 @@ async function accessFile() {
//remove IMG and Tiff buttons
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlTiff || ctrlImg) {
ctrlTiff.outerHTML="";
if (ctrlTiff) {
ctrlImg.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
displayPdf(img);
......@@ -276,19 +289,24 @@ async function accessFile() {
//Remove tiff and pdf
var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");
var ctrlPdf = document.getElementById("controlsContainer");
if (ctrlTiff || ctrlPdf) {
if (ctrlTiff ) {
ctrlTiff.outerHTML="";
}
if (ctrlPdf) {
ctrlPdf.outerHTML="";
}
displayImg(img);
}
else {
var ctrlPdf = document.getElementById("controlsContainer");
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlPdf || ctrlImg) {
var ctrlImg = document.getElementById("controlsContainerImg");
if (ctrlPdf) {
ctrlPdf.outerHTML="";
ctrlImg.outerHTML="";
}
if (ctrlImg) {
ctrlImg.outerHTML="";
}
window.addEventListener("load", loadDoc(url, TIFFViewer, filename), false);
}
......
WebGde/WebContent/src/highlight/highlight.js
......@@ -98,6 +98,7 @@ function flipYHighlightCanvas(idVal){
function initHighlight() {
//tab traversal event listener
$(document).on('keyup', '.select2.select2-container', function (e) {
if (e.which == 9) {
......@@ -190,18 +191,22 @@ function initHighlight() {
//waits until TIFF image is loaded, since its size is based on the displayed TIFF image
//waits until image is loaded, since its size is based on the displayed image
const observer = new MutationObserver(function (mutations, mutationInstance) {
var TIFFimg = document.getElementById(sessionStorage.getItem("TiffViewer_current"));
var parentDivPDF;
var canvasPDF;
if(sessionStorage.getItem("file_Name").endsWith(PDF_EXTENSION)){
var parentDiv = document.getElementById("pdf-container");
var canvas = parentDiv.querySelector("canvas");
TIFFimg = canvas;
parentDivPDF = document.getElementById("pdf-container");
canvasPDF = parentDivPDF.getElementsByTagName('canvas')[0];
TIFFimg = canvasPDF;
}
var parentDivIMG;
var canvasIMG;
if(sessionStorage.getItem("file_Name").endsWith(JPG_EXTENSION) || sessionStorage.getItem("file_Name").endsWith(PNG_EXTENSION) ){
var parentDiv = document.getElementById("img-container");
var canvas = parentDiv.querySelector("canvas");
TIFFimg = canvas;
var parentDivIMG = document.getElementById("img-container");
var canvasIMG = parentDivIMG.getElementsByTagName('canvas')[0];
TIFFimg = canvasIMG;
}
if (TIFFimg != null) {
......@@ -209,14 +214,14 @@ function initHighlight() {
var sizeObserver = new window.ResizeObserver(entries => {
if(sessionStorage.getItem("file_Name").endsWith(PDF_EXTENSION)){
if(isCanvasNotCreated){
rect = canvas.getBoundingClientRect();
rect = canvasPDF.getBoundingClientRect();
// createHighlight(entries[0].contentRect.width, entries[0].contentRect.height);
createHighlight(entries[0].contentRect.width, entries[0].contentRect.height);
isCanvasNotCreated = false;
ctx.clearRect(0, 0, highlightCanvas.width, highlightCanvas.height);
ctx.clearRect(0, 0, canvasPDF.width, canvasPDF.height);
}
else{
rect = canvas.getBoundingClientRect();
rect = canvasPDF.getBoundingClientRect();
if(isInitialPositioning){
resizeHighlightCanvas(entries[0].contentRect.width, entries[0].contentRect.height, (rect.left-263));
}
......@@ -229,14 +234,14 @@ function initHighlight() {
}
else if(sessionStorage.getItem("file_Name").endsWith(JPG_EXTENSION) || sessionStorage.getItem("file_Name").endsWith(PNG_EXTENSION)){
if(isCanvasNotCreated){
rect = canvas.getBoundingClientRect();
rect = canvasIMG.getBoundingClientRect();
// createHighlight(entries[0].contentRect.width, entries[0].contentRect.height);
createHighlight(entries[0].contentRect.width, entries[0].contentRect.height);
isCanvasNotCreated = false;
ctx.clearRect(0, 0, highlightCanvas.width, highlightCanvas.height);
ctx.clearRect(0, 0, canvasIMG.width, canvasIMG.height);
}
else{
rect = canvas.getBoundingClientRect();
rect = canvasIMG.getBoundingClientRect();
if(isInitialPositioning){
resizeHighlightCanvas(entries[0].contentRect.width, entries[0].contentRect.height, (rect.left-263));
}
......
WebGde/WebContent/src/imgviewer/imgviewer.js
let current_IMG = 0;
var displayImg = function(doc){ //test display image
//Create all Elements
const container = document.createElement('div');
......@@ -84,9 +85,15 @@ var displayImg = function(doc){ //test display image
canvas.height = img.height;
originalWidth = img.width;
originalHeight = img.height;
ctx.drawImage(img, 0, 0, img.width * zoom, img.height * zoom);
initHighlight();
};
ctx.drawImage(img, 0, 0, img.width * zoom, img.height * zoom);
let ofTotal = JSON.parse(sessionStorage.getItem("dir_files")).length;
if (localStorage.getItem("prev") == 1) {
current_IMG = current_IMG - 1;
} else {
current_IMG = current_IMG + 1;
}
document.getElementById("totalPageValue").innerHTML = current_IMG + ' of ' + ofTotal;
};
//Body
container.appendChild(canvas);
......@@ -158,7 +165,6 @@ var displayImg = function(doc){ //test display image
}
// Update zoom info display
document.getElementById('zoom-level').innerHTML = `Zoom: ${(zoom * 100).toFixed(0)}%`;
initHighlight();
}
......@@ -270,8 +276,6 @@ var displayImg = function(doc){ //test display image
initHighlight();
}
function drawScaled(zoomLvl) {
ctx.clearRect(0, 0, canvas.width, canvas.height);
ctx.save();
......@@ -281,7 +285,6 @@ var displayImg = function(doc){ //test display image
document.getElementById('zoom-level').textContent = `Zoom: ${(zoomLvl * 100).toFixed(0)}%`;
initHighlight();
}
initHighlight();
}
\ No newline at end of file
WebGde/WebContent/src/pdfviewer/pdfv.js
......@@ -138,8 +138,10 @@ var displayPdf = function(doc) {
viewport: viewport
};
page.render(renderContext);
initHighlight();
});
});
// Keep track of the current page, rotation, scale, and flip settings
......
WebGde/WebContent/src/submit/submit.js
......@@ -7,6 +7,7 @@ const submitForm = (e) => {
let error = false
let doctype;
let section;
// Validate all elements again
for(let element of elements) {
......
WebGde/WebContent/src/tiffViewer/tiffViewer.js
......@@ -842,5 +842,5 @@ let fileName = document.getElementById("TiffViewerImageName");
div.scrollTop += 20;
}
});
//initHighlight();
initHighlight();
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment