From a17c249982dae63a9979e0eb75d56e9fd6769732 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 6 Apr 2022 22:26:03 +0100 Subject: [PATCH] . --- atlas/templates/atlas/series_form.html | 31 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/atlas/templates/atlas/series_form.html b/atlas/templates/atlas/series_form.html index 0f0f071c..690513cc 100755 --- a/atlas/templates/atlas/series_form.html +++ b/atlas/templates/atlas/series_form.html @@ -199,18 +199,18 @@ return new Promise((resolve, reject) => { const fileReader = new FileReader(); fileReader.onload = () => resolve(fileReader); - fileReader.readAsArrayBuffer(file); + fileReader.readAsDataURL(file); }); } const readFile = (file, el) => { reader(file).then(reader => { console.log("hello", file, el, image) - if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") { - var byteArray = new Uint8Array(reader.result); - console.log("etrxact", reader) - extractDicomStudyDescription(byteArray); - } + //if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") { + // var byteArray = new Uint8Array(reader.result); + // console.log("etrxact", reader) + // extractDicomStudyDescription(byteArray); + //} var image = new Image(); image.height = 100; image.title = file.name; @@ -224,6 +224,24 @@ }); } + const dicomReader = (file) => { + return new Promise((resolve, reject) => { + const fileReader = new FileReader(); + fileReader.onload = () => resolve(fileReader); + fileReader.readAsArrayBuffer(file); + }); + } + + const readDicomFile = (file, el) => { + reader(file).then(reader => { + if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") { + var byteArray = new Uint8Array(reader.result); + console.log("etrxact", reader) + extractDicomStudyDescription(byteArray); + } + }); + } + file_set = $("#image_form_set input[type=file]"); @@ -235,6 +253,7 @@ if (el.files.length > 0) { filename = el.files[0].name; await readFile(el.files[0], el); + readDicomFile(el.files[0]); } })