larvitar 0.18.2 → 1.2.0

package/imaging/{image_rendering.js → imageRendering.js}

@@ -1,4 +1,4 @@
-/** @module imaging/rendering
+/** @module imaging/imageRendering
  *  @desc  This file provides functionalities for
  *         rendering images in html canvas using cornerstone
  */
@@ -10,16 +10,16 @@ import { each, has } from "lodash";
 
 // internal libraries
 import { getFileImageId } from "./loaders/fileLoader";
-import { csToolsCreateStack } from "./tools/tools.main";
-import { toggleMouseToolsListeners } from "./tools/tools.interaction";
-import { larvitar_store } from "./image_store";
-import { applyColorMap } from "./image_colormaps";
-import { isElement } from "./image_utils";
+import { csToolsCreateStack } from "./tools/main";
+import { toggleMouseToolsListeners } from "./tools/interaction";
+import { larvitar_store } from "./imageStore";
+import { applyColorMap } from "./imageColormaps";
+import { isElement } from "./imageUtils";
 
 /*
  * This module provides the following functions to be exported:
  * clearImageCache(seriesId)
- * loadAndCacheImages(seriesData, callback)
+ * loadAndCacheImages(seriesData)
  * renderFileImage(file, elementId)
  * renderWebImage(url, elementId)
  * disableViewport(elementId)
@@ -121,9 +121,9 @@ export function loadAndCacheImages(series, callback) {
  * @function renderWebImage
  * @param {Object} file - The image File object
  * @param {String} elementId - The html div id used for rendering or its DOM HTMLElement
- * @param {Function} callback - Optional callback function with image object
+ * @returns {Promise} - Return a promise which will resolve when image is displayed
  */
-export const renderFileImage = function (file, elementId, callback) {
+export const renderFileImage = function (file, elementId) {
   let element = isElement(elementId)
     ? elementId
     : document.getElementById(elementId);
@@ -136,23 +136,23 @@ export const renderFileImage = function (file, elementId, callback) {
     cornerstone.enable(element);
   }
 
-  // check if imageId is already stored in fileManager
-  const imageId = getFileImageId(file);
-  if (imageId) {
-    cornerstone.loadImage(imageId).then(function (image) {
-      cornerstone.displayImage(element, image);
-      let viewport = cornerstone.getViewport(element);
-      viewport.displayedArea.brhc.x = image.width;
-      viewport.displayedArea.brhc.y = image.height;
-      cornerstone.setViewport(element, viewport);
-      cornerstone.fitToWindow(element);
-
-      csToolsCreateStack(element);
-      if (callback) {
-        callback(image);
-      }
-    });
-  }
+  let renderPromise = new Promise(resolve => {
+    // check if imageId is already stored in fileManager
+    const imageId = getFileImageId(file);
+    if (imageId) {
+      cornerstone.loadImage(imageId).then(function (image) {
+        cornerstone.displayImage(element, image);
+        let viewport = cornerstone.getViewport(element);
+        viewport.displayedArea.brhc.x = image.width;
+        viewport.displayedArea.brhc.y = image.height;
+        cornerstone.setViewport(element, viewport);
+        cornerstone.fitToWindow(element);
+        csToolsCreateStack(element);
+        resolve(image);
+      });
+    }
+  });
+  return renderPromise;
 };
 
 /**
@@ -161,6 +161,7 @@ export const renderFileImage = function (file, elementId, callback) {
  * @function renderWebImage
  * @param {String} url - The image data url
  * @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
  */
 export const renderWebImage = function (url, elementId) {
   let element = isElement(elementId)
@@ -170,12 +171,15 @@ export const renderWebImage = function (url, elementId) {
     console.error("invalid html element: " + elementId);
     return;
   }
-
-  cornerstone.enable(element);
-  cornerstone.loadImage(url).then(function (image) {
-    cornerstone.displayImage(element, image);
-    csToolsCreateStack(element);
+  let renderPromise = new Promise(resolve => {
+    cornerstone.enable(element);
+    cornerstone.loadImage(url).then(function (image) {
+      cornerstone.displayImage(element, image);
+      csToolsCreateStack(element);
+      resolve(image);
+    });
   });
+  return renderPromise;
 };
 
 /**
@@ -245,7 +249,7 @@ export const resizeViewport = function (elementId) {
  * @param {Object} seriesStack - The original series data object
  * @param {String} elementId - The html div id used for rendering or its DOM HTMLElement
  * @param {Object} defaultProps - Optional default props
- * @return {Promise} Return a promise when the image has been rendered succesfully
+ * @return {Promise} Return a promise which will resolve when image is displayed
  */
 export const renderImage = function (seriesStack, elementId, defaultProps) {
   let t0 = performance.now();

package/imaging/imageReslice.js

@@ -0,0 +1,78 @@
+/** @module imaging/imageReslice
+ *  @desc  This file provides functionalities for
+ *         image reslice in orthogonal directions
+ */
+
+// external libraries
+import { v4 as uuidv4 } from "uuid";
+import { each } from "lodash";
+
+// internal libraries
+import { getReslicedMetadata, getReslicedPixeldata } from "./imageUtils";
+import {
+  getLarvitarImageTracker,
+  getLarvitarManager
+} from "./loaders/commonLoader";
+import { larvitar_store } from "./imageStore";
+
+/*
+ * This module provides the following functions to be exported:
+ * resliceSeries(seriesId, seriesData, orientation)
+ */
+
+/**
+ * Reslice a serie from native orientation to coronal or sagittal orientation
+ * @instance
+ * @function resliceSeries
+ * @param {Object} seriesData the original series data
+ * @param {String} orientation the reslice orientation [coronal or sagittal]
+ * @param {String} seriesId the series id
+ * @returns {Promise} - Return a promise which will resolve when data is available
+ */
+export function resliceSeries(seriesData, orientation) {
+  let reslicePromise = new Promise(resolve => {
+    let reslicedSeries = {};
+    let reslicedSeriesId = uuidv4();
+    let reslicedMetaData = getReslicedMetadata(
+      reslicedSeriesId,
+      "axial",
+      orientation,
+      seriesData,
+      "resliceLoader"
+    );
+
+    reslicedSeries.imageIds = reslicedMetaData.imageIds;
+    reslicedSeries.instances = reslicedMetaData.instances;
+
+    reslicedSeries.currentImageIdIndex = Math.floor(
+      reslicedSeries.imageIds.length / 2
+    );
+
+    function computeReslice(seriesData, reslicedSeriesId, reslicedSeries) {
+      let t0 = performance.now();
+      let imageTracker = getLarvitarImageTracker();
+      let manager = getLarvitarManager();
+      each(reslicedSeries.imageIds, function (imageId) {
+        reslicedSeries.instances[imageId].pixelData = getReslicedPixeldata(
+          imageId,
+          seriesData,
+          reslicedSeries
+        );
+        imageTracker[imageId] = reslicedSeriesId;
+      });
+      larvitar_store.addSeriesIds(reslicedSeriesId, reslicedSeries.imageIds);
+      reslicedSeries.numberOfImages = reslicedSeries.imageIds.length;
+      reslicedSeries.seriesUID = reslicedSeriesId;
+      reslicedSeries.seriesDescription = seriesData.seriesDescription;
+      reslicedSeries.orientation = orientation;
+      manager[reslicedSeriesId] = reslicedSeries;
+      manager[seriesData.seriesUID][orientation] = reslicedSeriesId;
+      let t1 = performance.now();
+      console.log(`Call to resliceSeries took ${t1 - t0} milliseconds.`);
+      resolve(reslicedSeries);
+    }
+    // reslice the data
+    computeReslice(seriesData, reslicedSeriesId, reslicedSeries);
+  });
+  return reslicePromise;
+}

package/imaging/{image_store.js → imageStore.js}

@@ -1,4 +1,4 @@
-/** @module imaging/store
+/** @module imaging/imageStore
  *  @desc This file provides functionalities
  *        for data config store.
  */
@@ -259,15 +259,16 @@ class Larvitar_Store {
 
 /**
  * Instancing the store
- * @param {Object} vuex_store - The app vuex store [optional]
- * @param {String} vuex_module - The name of the vuex store module, can be null
+ * @param {Object} vuexStore - The app vuex store [optional]
+ * @param {String} vuexModule - The name of the vuex store module, can be null
+ * @param {Boolean} registerModule - If true, the module is registered under Vuex global store
  */
 
-export function initLarvitarStore(vuex_store, vuex_module, registerModule) {
-  if (vuex_store) {
-    larvitar_store = new Larvitar_Store(vuex_store, vuex_module);
+export function initLarvitarStore(vuexStore, vuexModule, registerModule) {
+  if (vuexStore) {
+    larvitar_store = new Larvitar_Store(vuexStore, vuexModule);
     if (registerModule) {
-      vuex_store.registerModule(vuex_module, larvitar);
+      vuexStore.registerModule(vuexModule, larvitar);
     }
   } else {
     larvitar_store = new Larvitar_Store();

package/imaging/{image_tools.js → imageTools.js}

@@ -1,4 +1,4 @@
-/** @module imaging/tools
+/** @module imaging/imageTools
  *  @desc This file provides functionalities for
  *        interacting with cornerstone tools
  */
@@ -9,20 +9,20 @@ import cornerstoneTools from "cornerstone-tools";
 import { each, extend, filter, remove, cloneDeep } from "lodash";
 
 // internal libraries
-import { DEFAULT_TOOLS } from "./tools/tools.default";
-// import { SeedsTool } from "./tools/seedTool";
-import { ContoursTool } from "./tools/contourTool";
-import { EditMaskTool } from "./tools/editMaskTool";
-import { DiameterTool } from "./tools/diameterTool";
+import { DEFAULT_TOOLS } from "./tools/default";
+// import { SeedsTool } from "./tools/custom/seedTool";
+import { ContoursTool } from "./tools/custom/contourTool";
+import { EditMaskTool } from "./tools/custom/editMaskTool";
+import { DiameterTool } from "./tools/custom/diameterTool";
 import { getImageIdFromSlice } from "./loaders/nrrdLoader";
 import { getSeriesDataFromLarvitarManager } from "./loaders/commonLoader";
-import { parseContours } from "./image_contours";
-import { isElement } from "./image_utils";
+import { parseContours } from "./imageContours";
+import { isElement } from "./imageUtils";
 
 /*
  * This module provides the following functions to be exported:
  * csToolsCreateStack(element)
- * addDefaultTools()
+ * addDefaultTools(toolToActivate)
  * clearMeasurements()
  * addContoursTool(rawContours, maskName)
  * addMaskEditingTool(seriesId,mask,setConfig,callback, targetViewport)
@@ -44,11 +44,11 @@ import { isElement } from "./image_utils";
  */
 
 /**
- * Add all default tools, as listed in tools.default.js
+ * Add all default tools, as listed in tools/default.js
  * @function addDefaultTools
  * @deprecated (OBSOLETE)
  */
-export const addDefaultTools = function (toolToActivate, cb) {
+export const addDefaultTools = function (toolToActivate) {
   // for each default tool
   each(DEFAULT_TOOLS, tool => {
     // check if already added
@@ -99,10 +99,6 @@ export const addDefaultTools = function (toolToActivate, cb) {
     allowSkipping: false, // default true
     invert: false
   });
-
-  if (cb) {
-    cb();
-  }
 };
 
 /**
@@ -146,8 +142,8 @@ export const addContoursTool = function (rawContours, maskName) {
  * Add mask editing tool
  * @function addMaskEditingTool
  * @param {Array} mask - The mask data.
- * @param {String} targetViewport - The target hmtl element id.
  * @param {Function} callback - The tool initialization callback
+ * @param {String} targetViewport - The target hmtl element id.
  */
 export const addMaskEditingTool = function (mask, callback, targetViewport) {
   let enabledElements = cornerstone.getEnabledElements();
@@ -257,10 +253,10 @@ export const addSeedsTool = function (preLoadSeeds, initViewport) {
 };
 
 /**
- * Delete all measurements from tools state, for tools that have the "cleaneable" prop set to true in tools.default.js
+ * Delete all measurements from tools state, for tools that have the "cleaneable" prop set to true in tools/default.js
  * @function clearMeasurements
  */
-export const clearMeasurements = function (cb) {
+export const clearMeasurements = function () {
   let enabledElements = cornerstone.getEnabledElements();
   let clenableTools = filter(DEFAULT_TOOLS, "cleanable");
 
@@ -272,17 +268,13 @@ export const clearMeasurements = function (cb) {
   each(enabledElements, el => {
     cornerstone.updateImage(el.element);
   });
-
-  if (cb) {
-    cb();
-  }
 };
 
 /**
  * Set Tool "active" on all elements (ie, rendered and manipulable) & refresh cornerstone elements
  * @function setToolActive
  * @param {String} toolName - The tool name.
- * @param {Object} options - The custom options. @default from tools.default.js
+ * @param {Object} options - The custom options. @default from tools/default.js
  * @param {String} activeViewport - The active viewport (if "all", viewports array will be used)
  * @param {Array} viewports - The hmtl element id to be used for tool initialization.
  */

package/imaging/{image_utils.js → imageUtils.js}

@@ -1,4 +1,4 @@
-/** @module imaging/utils
+/** @module imaging/imageUtils
  *  @desc This file provides utility functions for
  *        manipulating image pixels and image metadata
  */

package/imaging/loaders/commonLoader.js

@@ -6,7 +6,7 @@
 // external libraries
 import cornerstoneWADOImageLoader from "cornerstone-wado-image-loader";
 import { each } from "lodash";
-import { updateLoadedStack } from "../image_loading";
+import { updateLoadedStack } from "../imageLoading";
 
 // internal libraries
 import { buildMultiFrameImage, clearMultiFrameCache } from "./multiframeLoader";

package/imaging/loaders/dicomLoader.js

@@ -4,7 +4,7 @@
  */
 
 // internal libraries
-import { loadAndCacheImages } from "../image_rendering";
+import { loadAndCacheImages } from "../imageRendering";
 
 /*
  * This module provides the following functions to be exported:

package/imaging/loaders/fileLoader.js

@@ -8,8 +8,8 @@ import cornerstoneFileImageLoader from "cornerstone-file-image-loader";
 import { has } from "lodash";
 
 // internal libraries
-import { clearImageCache } from "../image_rendering";
-import { clearCornerstoneElements } from "../image_tools";
+import { clearImageCache } from "../imageRendering";
+import { clearCornerstoneElements } from "../imageTools";
 
 // global variables
 export var fileManager = {};

package/imaging/loaders/multiframeLoader.js

@@ -1,3 +1,7 @@
+/** @module loaders/multiframeLoader
+ *  @desc This file is a custom wado loader for multiframe images
+ */
+
 // external libraries
 import cornerstoneWADOImageLoader from "cornerstone-wado-image-loader";
 import { each, range } from "lodash";
@@ -8,7 +12,7 @@ import {
   getLarvitarImageTracker,
   getLarvitarManager
 } from "./commonLoader";
-import { dumpDataSet } from "../image_parsing";
+import { parseDataSet } from "../imageParsing";
 
 // global module variables
 let customImageLoaderCounter = 0;
@@ -84,7 +88,7 @@ export const buildMultiFrameImage = function (seriesId, serie) {
       // EXTRACT MULTIFRAME METADATA (x52009230) Per-frame Functional Groups Sequence
       let frameMetadata = { ...metadata };
 
-      dumpDataSet(dataSet, frameMetadata, {
+      parseDataSet(dataSet, frameMetadata, {
         tags: ["x52009230"],
         frameId: frameNumber
       });

package/imaging/loaders/nrrdLoader.js

@@ -14,7 +14,7 @@ import {
   getNormalOrientation,
   getPixelRepresentation,
   getTypedArrayFromDataType
-} from "../image_utils";
+} from "../imageUtils";
 
 import {
   getImageFrame,
@@ -243,7 +243,11 @@ export const loadNrrdImage = function (imageId) {
  * @param {String} seriesId The series id
  * @return {String} image id
  */
-export function getImageIdFromSlice(sliceNumber, orientation, seriesId) {
+export const getImageIdFromSlice = function (
+  sliceNumber,
+  orientation,
+  seriesId
+) {
   var prefix = "nrrdLoader://";
   var serieImageTracker;
   let imageTracker = getLarvitarImageTracker();
@@ -266,7 +270,7 @@ export function getImageIdFromSlice(sliceNumber, orientation, seriesId) {
   var imageId = prefix.concat(imageIndex.toString());
 
   return imageId;
-}
+};
 
 /**
  * Retrieve slice number for a the given orientation
@@ -277,7 +281,7 @@ export function getImageIdFromSlice(sliceNumber, orientation, seriesId) {
  * @param {String} seriesId The series id
  * @return {Integer} The image slice number
  */
-export function getSliceNumberFromImageId(imageId, orientation) {
+export const getSliceNumberFromImageId = function (imageId, orientation) {
   let imageTracker = getLarvitarImageTracker();
   var firstImageId = findKey(imageTracker, entry => {
     return entry[1] == orientation;
@@ -289,7 +293,7 @@ export function getSliceNumberFromImageId(imageId, orientation) {
     parseInt(imageNumber) - parseInt(firstImageId.split("//").pop());
 
   return imageIndex;
-}
+};
 
 /**
  * Get series dimension for each view
@@ -297,7 +301,7 @@ export function getSliceNumberFromImageId(imageId, orientation) {
  * @function getNrrdSerieDimensions
  * @return {Object} Series dimension for each view
  */
-export function getNrrdSerieDimensions() {
+export const getNrrdSerieDimensions = function () {
   let imageTracker = getLarvitarImageTracker();
   var dim_axial = filter(imageTracker, img => {
     return img[1] == "axial";
@@ -314,7 +318,7 @@ export function getNrrdSerieDimensions() {
     coronal: [dim_sagittal.length, dim_axial.length, dim_coronal.length],
     sagittal: [dim_coronal.length, dim_axial.length, dim_sagittal.length]
   };
-}
+};
 
 /* Internal functions */
 

package/imaging/tools/{contourTool.js → custom/contourTool.js}

@@ -1,10 +1,16 @@
+/** @module imaging/tools/custom/contourTool
+ *  @desc  This file provides functionalities for
+ *         rendering segmentation contours with a
+ *         custom cornestone tool
+ */
+
 // external libraries
 import cornerstone from "cornerstone-core";
 import csTools from "cornerstone-tools";
 import { each, map } from "lodash";
 
 // internal libraries
-import { addToolStateSingleSlice } from "../image_tools";
+import { addToolStateSingleSlice } from "../../imageTools";
 
 // cornerstone tools imports
 const external = csTools.external;
@@ -99,19 +105,16 @@ export class ContoursTool extends BaseAnnotationTool {
     this._drawingMouseMoveCallback = this._drawingMouseMoveCallback.bind(this);
     this._drawingMouseDragCallback = this._drawingMouseDragCallback.bind(this);
     this._drawingMouseUpCallback = this._drawingMouseUpCallback.bind(this);
-    this._drawingMouseDoubleClickCallback = this._drawingMouseDoubleClickCallback.bind(
-      this
-    );
+    this._drawingMouseDoubleClickCallback =
+      this._drawingMouseDoubleClickCallback.bind(this);
     this._editMouseUpCallback = this._editMouseUpCallback.bind(this);
     this._editMouseDragCallback = this._editMouseDragCallback.bind(this);
 
-    this._drawingTouchStartCallback = this._drawingTouchStartCallback.bind(
-      this
-    );
+    this._drawingTouchStartCallback =
+      this._drawingTouchStartCallback.bind(this);
     this._drawingTouchDragCallback = this._drawingTouchDragCallback.bind(this);
-    this._drawingDoubleTapClickCallback = this._drawingDoubleTapClickCallback.bind(
-      this
-    );
+    this._drawingDoubleTapClickCallback =
+      this._drawingDoubleTapClickCallback.bind(this);
     this._editTouchDragCallback = this._editTouchDragCallback.bind(this);
 
     this.throttledUpdateCachedStats = throttle(this.updateCachedStats, 110);
@@ -1340,11 +1343,12 @@ export class ContoursTool extends BaseAnnotationTool {
 
     data.canComplete = false;
 
-    const mouseAtOriginHandle = this._isDistanceSmallerThanCompleteSpacingCanvas(
-      element,
-      points[0],
-      mousePoint
-    );
+    const mouseAtOriginHandle =
+      this._isDistanceSmallerThanCompleteSpacingCanvas(
+        element,
+        points[0],
+        mousePoint
+      );
 
     if (
       mouseAtOriginHandle &&
@@ -1398,11 +1402,12 @@ export class ContoursTool extends BaseAnnotationTool {
     const mousePoint = config.mouseLocation.handles.start;
     const points = data.handles.points;
 
-    const mouseAtOriginHandle = this._isDistanceSmallerThanCompleteSpacingCanvas(
-      element,
-      points[0],
-      mousePoint
-    );
+    const mouseAtOriginHandle =
+      this._isDistanceSmallerThanCompleteSpacingCanvas(
+        element,
+        points[0],
+        mousePoint
+      );
 
     if (mouseAtOriginHandle) {
       data.canComplete = true;

package/imaging/tools/{diameterTool.js → custom/diameterTool.js}

@@ -1,10 +1,16 @@
-import csTools from "cornerstone-tools";
+/** @module imaging/tools/custom/diameterTool
+ *  @desc  This file provides functionalities for
+ *         a custom diameter cornestone tool
+ */
 
+// external libraries
+import csTools from "cornerstone-tools";
 const BidirectionalTool = csTools.BidirectionalTool;
-
-import { addToolStateSingleSlice } from "../image_tools";
 import { each } from "lodash";
 
+// internal libraries
+import { addToolStateSingleSlice } from "../../imageTools";
+
 /**
  * @public
  * @class DiameterTool

package/imaging/tools/{editMaskTool.js → custom/editMaskTool.js}

@@ -1,3 +1,9 @@
+/** @module imaging/tools/custom/editMaskTool
+ *  @desc  This file provides functionalities for
+ *         a custom mask cornestone tool
+ */
+
+// external libraries
 import csTools from "cornerstone-tools";
 const external = csTools.external;
 const BaseBrushTool = csTools.importInternal("base/BaseBrushTool");
@@ -95,7 +101,7 @@ export class EditMaskTool extends BaseBrushTool {
   }
 
   preventCtrl() {
-    this.__proto__.__proto__._isCtrlDown = function() {
+    this.__proto__.__proto__._isCtrlDown = function () {
       return false;
     };
   }

package/imaging/tools/{polylineScissorsTool.js → custom/polylineScissorsTool.js}

@@ -1,14 +1,21 @@
+/** @module imaging/tools/custom/polygonScissorsTool
+ *  @desc  This file provides functionalities for
+ *         a custom polyline scissors cornestone tool
+ */
+
+// external libraries
 import cornerstoneTools from "cornerstone-tools";
+const BaseTool = cornerstoneTools.importInternal("base/BaseTool");
+const { rectangleRoiCursor } = cornerstoneTools.importInternal("tools/cursors");
+
+// internal libraries
 import {
   fillInsideFreehand,
   fillOutsideFreehand,
   eraseOutsideFreehand,
   eraseInsideFreehand
-} from "./strategies"; // cannot import strategies in other way 🤷
-import polygonSegmentationMixin from "./polygonSegmentationMixin";
-
-const BaseTool = cornerstoneTools.importInternal("base/BaseTool");
-const { rectangleRoiCursor } = cornerstoneTools.importInternal("tools/cursors");
+} from "../strategies"; // cannot import strategies in other way 🤷
+import polygonSegmentationMixin from "../polygonSegmentationMixin";
 
 // Register custom mixin
 cornerstoneTools.register(

package/imaging/tools/{seedTool.js → custom/seedTool.js}

@@ -3,9 +3,9 @@
 // import { each, cloneDeep } from "lodash";
 
 // // internal libraries
-// import { remapVoxel } from "../image_utils";
-// import { addToolStateSingleSlice, setToolEnabled } from "../image_tools";
-// import { getSliceNumberFromImageId } from "../loaders/nrrdLoader";
+// import { remapVoxel } from "../../imageUtils";
+// import { addToolStateSingleSlice, setToolEnabled } from "../../imageTools";
+// import { getSliceNumberFromImageId } from "../../loaders/nrrdLoader";
 
 // // cornerstone tools imports
 // const BaseAnnotationTool = csTools.importInternal("base/BaseAnnotationTool");

package/imaging/tools/{thresholdsBrushTool.js → custom/thresholdsBrushTool.js}

@@ -1,5 +1,11 @@
-import cornerstoneTools from "cornerstone-tools";
+/** @module imaging/tools/custom/thresholdBrushTool
+ *  @desc  This file provides functionalities for
+ *         a brush tool with thresholds using a
+ *         custom cornestone tool
+ */
 
+// external libraries
+import cornerstoneTools from "cornerstone-tools";
 const external = cornerstoneTools.external;
 const BaseBrushTool = cornerstoneTools.importInternal("base/BaseBrushTool");
 const segmentationUtils = cornerstoneTools.importInternal(

package/imaging/tools/{tools.default.js → default.js}

@@ -1,3 +1,10 @@
+/** @module imaging/tools/default
+ *  @desc  This file provides definitions
+ *         for default tools
+ */
+
+// external libraries
+
 /** @module tools/default */
 
 /* DEFINE DEFAULT TOOLS
@@ -19,8 +26,8 @@
  */
 
 import { filter, isArray } from "lodash";
-import ThresholdsBrushTool from "./thresholdsBrushTool";
-import PolylineScissorsTool from "./polylineScissorsTool";
+import ThresholdsBrushTool from "./custom/thresholdsBrushTool";
+import PolylineScissorsTool from "./custom/polylineScissorsTool";
 
 /**
  * These tools are added with `addDefaultTools()`
@@ -416,7 +423,7 @@ const DEFAULT_STYLE = {
  */
 const DEFAULT_SETTINGS = {
   mouseEnabled: true,
-  touchEnabled: false, // TODO
+  touchEnabled: true,
   showSVGCursors: true,
   globalToolSyncEnabled: false,
   autoResizeViewports: true,