larvitar 1.5.0 → 1.5.2

package/README.md

@@ -6,9 +6,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 1.5.0
+### Current version: 1.5.2
 
-### Latest Published Release: 1.5.0
+### Latest Published Release: 1.5.2
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
 Orthogonal multiplanar reformat is included as well as custom loader/exporter for nrrd files and [Vuex](https://vuex.vuejs.org/) custom integration.

package/imaging/imageLoading.js

@@ -148,6 +148,8 @@ export const updateLoadedStack = function (
   let numberOfTemporalPositions = seriesData.metadata["x00200105"];
   let acquisitionNumberAttribute = seriesData.metadata["x00200012"];
   let is4D = seriesData.metadata.is4D;
+  let SOPUID = seriesData.metadata["x00080016"];
+  let isPDF = SOPUID == "1.2.840.10008.5.1.4.1.1.104.1" ? true : false;
 
   let color = cornerstoneWADOImageLoader.isColorImage(
     seriesData.metadata["x00280004"]
@@ -170,6 +172,7 @@ export const updateLoadedStack = function (
       numberOfTemporalPositions: numberOfTemporalPositions,
       isMultiframe: isMultiframe,
       is4D: is4D,
+      isPDF: isPDF,
       modality: modality,
       color: color,
       bytes: 0

package/imaging/imageRendering.js

@@ -119,11 +119,12 @@ export function loadAndCacheImages(series, callback) {
  * Render a PDF from a DICOM Encapsulated PDF
  * @instance
  * @function renderDICOMPDF
- * @param {Object} image - The image PDF object
+ * @param {Object} seriesStack - The original series data object
  * @param {String} elementId - The html div id used for rendering or its DOM HTMLElement
- * @returns {Promise} - Return a promise which will resolve when image is displayed
+ * @returns {Promise} - Return a promise which will resolve when pdf is displayed
  */
-export const renderDICOMPDF = function (image, elementId) {
+export const renderDICOMPDF = function (seriesStack, elementId) {
+  let t0 = performance.now();
   let element = isElement(elementId)
     ? elementId
     : document.getElementById(elementId);
@@ -131,26 +132,35 @@ export const renderDICOMPDF = function (image, elementId) {
     console.error("invalid html element: " + elementId);
     return;
   }
-  const SOPUID = image.dataSet.string("x00080016");
-  if (SOPUID === "1.2.840.10008.5.1.4.1.1.104.1") {
-    let fileTag = image.dataSet.elements.x00420011;
-    let pdfByteArray = image.dataSet.byteArray.slice(
-      fileTag.dataOffset,
-      fileTag.dataOffset + fileTag.length
-    );
-    let PDF = new Blob([pdfByteArray], { type: "application/pdf" });
-    let fileURL = URL.createObjectURL(PDF);
-    element.innerHTML =
-      '<object data="' +
-      fileURL +
-      '" type="application/pdf" width="100%" height="100%"></object>';
-    fileTag = null;
-    pdfByteArray = null;
-    PDF = null;
-    fileURL = null;
-  } else {
-    throw new Error("This is not a DICOM with a PDF");
-  }
+  let renderPromise = new Promise((resolve, reject) => {
+    let image = seriesStack.instances[seriesStack.imageIds[0]];
+    const SOPUID = image.dataSet.string("x00080016");
+    if (SOPUID === "1.2.840.10008.5.1.4.1.1.104.1") {
+      let fileTag = image.dataSet.elements.x00420011;
+      let pdfByteArray = image.dataSet.byteArray.slice(
+        fileTag.dataOffset,
+        fileTag.dataOffset + fileTag.length
+      );
+      let PDF = new Blob([pdfByteArray], { type: "application/pdf" });
+      let fileURL = URL.createObjectURL(PDF);
+      element.innerHTML =
+        '<object data="' +
+        fileURL +
+        '" type="application/pdf" width="100%" height="100%"></object>';
+      larvitar_store.set("isPDF", [elementId, true]);
+      let t1 = performance.now();
+      console.log(`Call to renderDICOMPDF took ${t1 - t0} milliseconds.`);
+      image = null;
+      fileTag = null;
+      pdfByteArray = null;
+      PDF = null;
+      fileURL = null;
+      resolve();
+    } else {
+      reject("This is not a DICOM with a PDF");
+    }
+  });
+  return renderPromise;
 };
 
 /**
@@ -647,6 +657,7 @@ export const storeViewportData = function (image, elementId, viewport, data) {
   larvitar_store.set("isColor", [elementId, data.isColor]);
   larvitar_store.set("isMultiframe", [elementId, data.isMultiframe]);
   larvitar_store.set("isTimeserie", [elementId, data.isTimeserie]);
+  larvitar_store.set("isPDF", [elementId, false]);
 };
 
 /**
@@ -797,6 +808,7 @@ let getSeriesData = function (series, defaultProps) {
     data.imageId = series.imageIds[data.imageIndex];
   }
   data.isColor = series.color;
+  data.isPDF = series.isPDF;
 
   // rows, cols and x y z spacing
   data.rows = series.instances[series.imageIds[0]].metadata["x00280010"];

package/imaging/imageStore.js

@@ -31,6 +31,7 @@ const DEFAULT_VIEWPORT = {
   isColor: false,
   isMultiframe: false,
   isTimeserie: false,
+  isPDF: false,
   viewport: {
     scale: 0.0,
     rotation: 0.0,
@@ -254,6 +255,8 @@ class Larvitar_Store {
         this.state["viewports"][data[0]]["isColor"] = data[1];
       } else if (field == "isMultiframe") {
         this.state["viewports"][data[0]]["isMultiframe"] = data[1];
+      } else if (field == "isPDF") {
+        this.state["viewports"][data[0]]["isPDF"] = data[1];
       } else if (field == "isTimeserie") {
         this.state["viewports"][data[0]]["isTimeserie"] = data[1];
       } else if (field == "defaultViewport") {

package/modules/vuex/larvitar.js

@@ -23,6 +23,7 @@ const DEFAULT_VIEWPORT = {
   maxPixelValue: 0,
   isColor: false,
   isMultiframe: false,
+  isPDF: false,
   isTimeserie: false,
   viewport: {
     scale: 0.0,
@@ -150,6 +151,8 @@ export default {
       commit("viewport", { id, d: { isColor } }),
     setIsMultiframe: ({ commit }, [id, isMultiframe]) =>
       commit("viewport", { id, d: { isMultiframe } }),
+    setIsPDF: ({ commit }, [id, isPDF]) =>
+      commit("viewport", { id, d: { isPDF } }),
     setIsTimeserie: ({ commit }, [id, isTimeserie]) =>
       commit("viewport", { id, d: { isTimeserie } }),
     setDefaultViewport: (

package/package.json

@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",