@radicalimaging/static-wado-creator 1.3.2 → 1.5.0

package/lib/operation/ThumbnailService.js

@@ -110,10 +110,6 @@ class ThumbnailService {
   async generateThumbnails(itemId, dataSet, metadata, callback, options) {
     const { imageFrame, id } = this.favoriteThumbnailObj;
 
-    if (!options.thumb) {
-      return null;
-    }
-
     // There are various reasons no thumbnails might be generated, so just return
     if (!id) {
       const pixelData = metadata[Tags.PixelData];
@@ -133,6 +129,11 @@ class ThumbnailService {
       }
       return null;
     }
+
+    if (!options.thumb) {
+      return null;
+    }
+
     if (options.dcm2jpg) {
       return this.dcm2jpg(id.filename, id.imageFrameRootPath.replace(/frames/, "thumbnail"), {});
     }

package/lib/operation/adapter/transcodeImage.js

@@ -286,6 +286,10 @@ async function generateLossyImage(id, decoded, options) {
   }
 }
 
+function isPalette(dataSet) {
+  return dataSet.string(Tags.RawPhotometricInterpretation) === "PALETTE COLOR";
+}
+
 /**
  * Transcode imageFrame. It uses transcodeMap to define the target encoding based on source encoding.
  *
@@ -302,7 +306,7 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
 
   const samplesPerPixel = dataSet.uint16(Tags.RawSamplesPerPixel);
   const planarConfiguration = dataSet.uint16("x00280006");
-  if (!shouldTranscodeImageFrame(id, options, samplesPerPixel) || planarConfiguration === 1) {
+  if (!shouldTranscodeImageFrame(id, options, samplesPerPixel) || planarConfiguration === 1 || isPalette(dataSet)) {
     console.verbose("Shouldn't transcode");
     return {
       id,

package/lib/operation/getValue.js

@@ -8,7 +8,9 @@ function decodeUtf8(s, options) {
 }
 
 /** Gets a value as a UTF-8 string - todo, make UTF-8 decode optional. */
-const getValueInlineString = (dataSet, attr, options) => [decodeUtf8(dataSet.string(attr.tag), options)];
+const getValueInlineString = (dataSet, attr, options) => [
+  decodeUtf8(dataSet.string(attr.tag), options),
+];
 
 const getStrings = (dataSet, attr, options) => {
   const ret = dataSet.string(attr.tag);
@@ -20,21 +22,27 @@ const getStrings = (dataSet, attr, options) => {
 
 const getValuePatientName = (dataSet, attr) => {
   const strings = getStrings(dataSet, attr);
-  return (strings && strings.map((item) => ({ Alphabetic: item }))) || undefined;
+  return (
+    (strings && strings.map((item) => ({ Alphabetic: item }))) || undefined
+  );
 };
 
 /** Gets either InlineBinary or BulkDataURI, if already defined */
 const getValueInlineBinary = (dataSet, attr) => {
   if (attr.BulkDataURI) return { BulkDataURI: attr.BulkDataURI };
-  const binaryValue = dataSet.byteArray.slice(attr.dataOffset, attr.dataOffset + attr.length);
+  const binaryValue = dataSet.byteArray.slice(
+    attr.dataOffset,
+    attr.dataOffset + attr.length
+  );
   return { InlineBinary: binaryValue.toString("base64") };
 };
 
 const getValueInlineSignedShort = (dataSet, attr) => {
-  if (attr.length > 2) {
-    return getValueInlineBinary(dataSet, attr);
+  const ret = [];
+  for (let i = 0; i < attr.length / 2; i++) {
+    ret.push(dataSet.int16(attr.tag, i));
   }
-  return [dataSet.int16(attr.tag)];
+  return ret;
 };
 
 const getValueInlineUnsignedShort = (dataSet, attr) => {
@@ -70,9 +78,11 @@ const getValueInlineFloat = (dataSet, attr) => {
   return ret;
 };
 
-const getValueInlineIntString = (dataSet, attr) => getStrings(dataSet, attr).map((val) => parseInt(val));
+const getValueInlineIntString = (dataSet, attr) =>
+  getStrings(dataSet, attr).map((val) => parseInt(val));
 
-const getValueInlineFloatString = (dataSet, attr) => getStrings(dataSet, attr).map((val) => parseFloat(val));
+const getValueInlineFloatString = (dataSet, attr) =>
+  getStrings(dataSet, attr).map((val) => parseFloat(val));
 
 const getValueInlineFloatDouble = (dataSet, attr) => {
   if (attr.length > 8) {
@@ -177,15 +187,30 @@ const isValueInline = (attr, options) => {
  * @param {*} parentAttr attr's parent. If not present means attr is at root level.
  * @returns
  */
-const getValue = async (dataSet, attr, vr, getDataSet, callback, options, parentAttr) => {
+const getValue = async (
+  dataSet,
+  attr,
+  vr,
+  getDataSet,
+  callback,
+  options,
+  parentAttr
+) => {
   // It will only process pixelData tag if on metadata root. Otherwise it will be skiped.
   if (attr.tag === "x7fe00010" && !parentAttr) {
-    const BulkDataURI = await extractImageFrames(dataSet, attr, vr, callback, options);
+    const BulkDataURI = await extractImageFrames(
+      dataSet,
+      attr,
+      vr,
+      callback,
+      options
+    );
     return { BulkDataURI };
   }
   if (attr.tag === "xfffee00d") return undefined;
   // Group length
-  if (attr.tag.length == 9 && attr.tag.substring(5, 9) === "0000") return undefined;
+  if (attr.tag.length == 9 && attr.tag.substring(5, 9) === "0000")
+    return undefined;
   if (attr.items) {
     // sequences
     const result = [];
@@ -202,7 +227,10 @@ const getValue = async (dataSet, attr, vr, getDataSet, callback, options, parent
   if (isValueInline(attr, options)) {
     return getValueInline(dataSet, attr, vr, options);
   }
-  const binaryValue = dataSet.byteArray.slice(attr.dataOffset, attr.dataOffset + attr.length);
+  const binaryValue = dataSet.byteArray.slice(
+    attr.dataOffset,
+    attr.dataOffset + attr.length
+  );
   const mimeType = attr.tag == "x00420011" && dataSet.string("x00420012");
 
   const BulkDataURI = await callback.bulkdata(binaryValue, { mimeType });

package/lib/writer/VideoWriter.js

@@ -19,16 +19,23 @@ const VIDEO_TYPES = {
   // TODO - add the new multi-segment MPEG2 and H264 variants
 };
 
-const isVideo = (value) => VIDEO_TYPES[value && value.string ? value.string(Tags.RawTransferSyntaxUID) : value];
+const isVideo = (value) =>
+  VIDEO_TYPES[
+    value && value.string ? value.string(Tags.RawTransferSyntaxUID) : value
+  ];
 
 const VideoWriter = () =>
   async function run(id, dataSet) {
     console.log(`Writing video  ${id.sopInstanceUid}`);
     const extension = VIDEO_TYPES[dataSet.string(Tags.RawTransferSyntaxUID)];
     const filename = `index.${extension}`;
-    const writeStream = WriteStream(`${id.sopInstanceRootPath}/rendered`, filename, {
-      mkdir: true,
-    });
+    const writeStream = WriteStream(
+      `${id.sopInstanceRootPath}/rendered`,
+      filename,
+      {
+        mkdir: true,
+      }
+    );
     let length = 0;
     const { fragments } = dataSet.elements.x7fe00010;
 
@@ -39,13 +46,18 @@ const VideoWriter = () =>
     // The zero position fragment isn't available, even though present in the original data
     for (let i = 0; i < fragments.length; i++) {
       const fragment = fragments[i];
-      const blob = dataSet.byteArray.slice(fragment.position, fragment.position + fragment.length);
+      const blob = dataSet.byteArray.slice(
+        fragment.position,
+        fragment.position + fragment.length
+      );
       length += blob.length;
       await writeStream.write(blob);
     }
     await writeStream.close();
-    console.log(`Done video ${id.sopInstanceRootPath}\\${filename} of length ${length}`);
-    return `series/${id.seriesInstanceUid}/instances/${id.sopInstanceUid}/pixeldata.${extension}?length=${length}&offset=0`;
+    console.log(
+      `Done video ${id.sopInstanceRootPath}\\${filename} of length ${length}`
+    );
+    return `series/${id.seriesInstanceUid}/instances/${id.sopInstanceUid}/rendered?length=${length}&offset=0&accept=video/mp4`;
   };
 
 module.exports = VideoWriter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "1.3.2",
+  "version": "1.5.0",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -56,18 +56,18 @@
   },
   "dependencies": {
     "@cornerstonejs/dicom-codec": ">=1.0.5",
-    "@radicalimaging/static-cs-lite": "^1.3.2",
-    "@radicalimaging/static-wado-util": "^1.3.2",
+    "@radicalimaging/static-cs-lite": "^1.5.0",
+    "@radicalimaging/static-wado-util": "^1.5.0",
     "canvas": "^2.11.1",
     "config-point": ">=0.5.1",
     "dcmjs": "^0.29.5",
     "dicom-parser": "^1.8.13",
     "glob": "^7.2.0",
     "node-object-hash": "^3.0.0",
+    "npmjs": "npm publish",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "must": "^0.13.4"
-  },
-  "gitHead": "202e8673a2c9618f441023c8382187ae7fdf5b1a"
+  }
 }

package/license.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Radical Imaging Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.