@niivue/niivue 0.29.0 → 0.29.1

package/dist/niivue.es.js

@@ -100009,7 +100009,7 @@ function requireSeries() {
   var daikon2 = daikon2 || {};
   daikon2.CompressionUtils = daikon2.CompressionUtils || (typeof commonjsRequire !== "undefined" ? requireCompressionUtils() : null);
   daikon2.Dictionary = daikon2.Dictionary || (typeof commonjsRequire !== "undefined" ? requireDictionary() : null);
-  daikon2.Image = daikon2.Image || (typeof commonjsRequire !== "undefined" ? requireImage() : null);
+  daikon2.Image = daikon2.Image || (typeof commonjsRequire !== "undefined" ? requireImage().default : null);
   daikon2.OrderedMapIterator = daikon2.OrderedMapIterator || (typeof commonjsRequire !== "undefined" ? requireIterator() : null);
   daikon2.OrderedMap = daikon2.OrderedMap || (typeof commonjsRequire !== "undefined" ? requireOrderedmap() : null);
   daikon2.Parser = daikon2.Parser || (typeof commonjsRequire !== "undefined" ? requireParser() : null);
@@ -106869,8 +106869,18 @@ NVImage.loadFromUrl = async function({
       urlImgData = url.substring(0, url.lastIndexOf("HEAD")) + "BRIK";
     }
   }
-  let urlParts = url.split("/");
+  let urlParts;
+  try {
+    urlParts = new URL(url).pathname.split("/");
+  } catch (e) {
+    urlParts = url.split("/");
+  }
+  console.log(url, name, urlParts);
   name = urlParts.slice(-1)[0];
+  if (name.indexOf("?") > -1) {
+    name = name.slice(0, name.indexOf("?"));
+  }
+  console.log(name);
   let dataBuffer = await response.arrayBuffer();
   let pairedImgData = null;
   if (urlImgData.length > 0) {
@@ -112052,8 +112062,15 @@ const MESH_EXTENSIONS = [
   "VTK",
   "X3D"
 ];
+const dragModes = Object.freeze({
+  none: 0,
+  contrast: 1,
+  measurement: 2,
+  pan: 3
+});
 function Niivue(options = {}) {
   this.opts = {};
+  this.dragModes = dragModes;
   this.defaults = {
     textHeight: 0.06,
     colorbarHeight: 0.05,
@@ -112080,8 +112097,7 @@ function Niivue(options = {}) {
     multiplanarPadPixels: 0,
     isRadiologicalConvention: false,
     meshThicknessOn2D: Infinity,
-    isDragShowsMeasurementTool: false,
-    isDragForPanZoom: false,
+    dragMode: dragModes.contrast,
     isDepthPickMesh: false,
     isCornerOrientationText: false,
     sagittalNoseLeft: false,
@@ -112533,6 +112549,8 @@ Niivue.prototype.mouseLeftButtonHandler = function(e) {
 };
 Niivue.prototype.mouseRightButtonHandler = function(e) {
   let pos = this.getNoPaddingNoBorderCanvasRelativeMousePosition(e, this.gl.canvas);
+  if (this.opts.dragMode === dragModes.none)
+    return;
   this.setDragStart(pos.x, pos.y);
   if (!this.isDragging)
     this.scene.pan2DxyzmmAtMouseDown = this.scene.pan2Dxyzmm.slice();
@@ -112619,9 +112637,9 @@ Niivue.prototype.mouseUpListener = function() {
   this.drawPenAxCorSag = -1;
   if (this.isDragging) {
     this.isDragging = false;
-    if (this.opts.isDragForPanZoom)
-      return;
-    if (this.opts.isDragShowsMeasurementTool)
+    if (this.opts.dragMode === dragModes.contrast)
+      console.log("Poko");
+    if (this.opts.dragMode !== dragModes.contrast)
       return;
     this.calculateNewRange();
     this.refreshLayers(this.volumes[0], 0, this.volumes.length);
@@ -112675,7 +112693,7 @@ Niivue.prototype.touchEndListener = function(e) {
   }
   if (this.isDragging) {
     this.isDragging = false;
-    if (this.opts.isDragShowsMeasurementTool)
+    if (this.opts.dragMode !== dragModes.contrast)
       return;
     this.calculateNewRange();
     this.refreshLayers(this.volumes[0], 0, this.volumes.length);
@@ -113591,7 +113609,7 @@ Niivue.prototype.setSelectionBoxColor = function(color) {
   this.opts.selectionBoxColor = color;
 };
 Niivue.prototype.sliceScroll2D = function(posChange, x2, y, isDelta = true) {
-  if (posChange !== 0 && this.opts.isDragForPanZoom) {
+  if (posChange !== 0 && this.opts.dragMode === dragModes.pan) {
     let zoom = this.scene.pan2Dxyzmm[3] * (1 + 10 * posChange);
     zoom = Math.round(zoom * 10) / 10;
     this.scene.pan2Dxyzmm[3] = zoom;
@@ -117020,7 +117038,7 @@ Niivue.prototype.drawScene = function() {
   if (this.opts.isColorbar)
     this.drawColorbar();
   if (this.isDragging) {
-    if (this.opts.isDragForPanZoom) {
+    if (this.opts.dragMode === dragModes.pan) {
       this.dragForPanZoom([
         this.dragStart[0],
         this.dragStart[1],
@@ -117029,7 +117047,7 @@ Niivue.prototype.drawScene = function() {
       ]);
       return;
     }
-    if (this.opts.isDragShowsMeasurementTool) {
+    if (this.opts.dragMode === dragModes.measurement) {
       this.drawMeasurementTool([
         this.dragStart[0],
         this.dragStart[1],
@@ -117038,6 +117056,7 @@ Niivue.prototype.drawScene = function() {
       ]);
       return;
     }
+    console.log(this.opts.dragMode === dragModes.measurement, ">>", this.opts.dragMode, dragModes.measurement);
     if (this.inRenderTile(this.dragStart[0], this.dragStart[1]) >= 0)
       return;
     let width = Math.abs(this.dragStart[0] - this.dragEnd[0]);
@@ -117060,4 +117079,4 @@ Niivue.prototype.drawScene = function() {
   this.readyForSync = true;
   return posString;
 };
-export { NVImage, NVImageFromUrlOptions, NVMesh, NVMeshFromUrlOptions, Niivue, colortables };
+export { NVImage, NVImageFromUrlOptions, NVMesh, NVMeshFromUrlOptions, Niivue, colortables, dragModes };