This commit is contained in:
Ross
2022-04-06 22:26:03 +01:00
parent 163766dff0
commit a17c249982
+25 -6
View File
@@ -199,18 +199,18 @@
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const fileReader = new FileReader(); const fileReader = new FileReader();
fileReader.onload = () => resolve(fileReader); fileReader.onload = () => resolve(fileReader);
fileReader.readAsArrayBuffer(file); fileReader.readAsDataURL(file);
}); });
} }
const readFile = (file, el) => { const readFile = (file, el) => {
reader(file).then(reader => { reader(file).then(reader => {
console.log("hello", file, el, image) console.log("hello", file, el, image)
if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") { //if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") {
var byteArray = new Uint8Array(reader.result); // var byteArray = new Uint8Array(reader.result);
console.log("etrxact", reader) // console.log("etrxact", reader)
extractDicomStudyDescription(byteArray); // extractDicomStudyDescription(byteArray);
} //}
var image = new Image(); var image = new Image();
image.height = 100; image.height = 100;
image.title = file.name; 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]"); file_set = $("#image_form_set input[type=file]");
@@ -235,6 +253,7 @@
if (el.files.length > 0) { if (el.files.length > 0) {
filename = el.files[0].name; filename = el.files[0].name;
await readFile(el.files[0], el); await readFile(el.files[0], el);
readDicomFile(el.files[0]);
} }
}) })