From c515998236ab8616ad1cea66d457cf26b53f7744 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 10 Mar 2021 10:10:55 +0000 Subject: [PATCH] refactor --- js/main.js | 78 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/js/main.js b/js/main.js index 7bb88bd..b7b775d 100644 --- a/js/main.js +++ b/js/main.js @@ -45,6 +45,46 @@ let use_local_question_cache = false; window.config = config; +cornerstone.imageCache.setMaximumSizeBytes(5128800); + +// Set up cornerstone (the dicom viewer) +cornerstoneBase64ImageLoader.external.cornerstone = cornerstone; +cornerstoneWebImageLoader.external.cornerstone = cornerstone; +// cornerstoneWebImageLoader.configure({ +// beforeSend: function(xhr) { +// // Add custom headers here (e.g. auth tokens) +// //xhr.setRequestHeader('x-auth-token', 'my auth token'); +// } +// }); + +cornerstoneWADOImageLoader.external.cornerstone = cornerstone; + +// cornerstoneWADOImageLoader.configure({ +// beforeSend: function(xhr) { +// // Add custom headers here (e.g. auth tokens) +// //xhr.setRequestHeader('APIKEY', 'my auth token'); +// } +// }); + +cornerstoneTools.init(); + +// Set up database +const db = new Dexie("answers_database"); +db.version(1).stores({ + answers: "[aid+cid+eid+qid+qidn], [aid+cid+eid], qid, ans", + flags: "[aid+cid+eid+qid+qidn], [aid+cid+eid], qid", + user_answers: "qid, ans", + session: + "[packet+aid], packet, aid, status, date, score, max_score, exam_time, time_left, question_order, questions_answered, total_questions", +}); + +const question_db = new Dexie("question_database"); +question_db.version(1).stores({ + question_data: "[eid+qid], eid", + saved_exams: "eid, type, exam_mode, name, order, time, generated", +}); + + retrievePacketList(); /** @@ -424,44 +464,6 @@ function setUpQuestions(load_previous) { createQuestionListPanel(); } -cornerstone.imageCache.setMaximumSizeBytes(5128800); - -// Set up cornerstone (the dicom viewer) -cornerstoneBase64ImageLoader.external.cornerstone = cornerstone; -cornerstoneWebImageLoader.external.cornerstone = cornerstone; -// cornerstoneWebImageLoader.configure({ -// beforeSend: function(xhr) { -// // Add custom headers here (e.g. auth tokens) -// //xhr.setRequestHeader('x-auth-token', 'my auth token'); -// } -// }); - -cornerstoneWADOImageLoader.external.cornerstone = cornerstone; - -// cornerstoneWADOImageLoader.configure({ -// beforeSend: function(xhr) { -// // Add custom headers here (e.g. auth tokens) -// //xhr.setRequestHeader('APIKEY', 'my auth token'); -// } -// }); - -cornerstoneTools.init(); - -// Set up database -const db = new Dexie("answers_database"); -db.version(1).stores({ - answers: "[aid+cid+eid+qid+qidn], [aid+cid+eid], qid, ans", - flags: "[aid+cid+eid+qid+qidn], [aid+cid+eid], qid", - user_answers: "qid, ans", - session: - "[packet+aid], packet, aid, status, date, score, max_score, exam_time, time_left, question_order, questions_answered, total_questions", -}); - -const question_db = new Dexie("question_database"); -question_db.version(1).stores({ - question_data: "[eid+qid], eid", - saved_exams: "eid, type, exam_mode, name, order, time, generated", -}); /**