@niivue/niivue 0.43.7 → 0.44.0

package/build/index.d.ts

@@ -211,6 +211,7 @@ type ImageFromUrlOptions = {
     useQFormNotSForm?: boolean;
     alphaThreshold?: boolean;
     colormapNegative?: string;
+    colorMapNegative?: string;
     cal_minNeg?: number;
     cal_maxNeg?: number;
     colorbarVisible?: boolean;
@@ -558,6 +559,11 @@ declare enum SLICE_TYPE {
     MULTIPLANAR = 3,
     RENDER = 4
 }
+declare enum SHOW_RENDER {
+    NEVER = 0,
+    ALWAYS = 1,
+    AUTO = 2
+}
 /**
  * Multi-planar layout
  * @ignore
@@ -613,6 +619,7 @@ type NVConfigOptions = {
     isOrientCube: boolean;
     multiplanarPadPixels: number;
     multiplanarForceRender: boolean;
+    multiplanarShowRender: SHOW_RENDER;
     isRadiologicalConvention: boolean;
     meshThicknessOn2D: number | string;
     dragMode: DRAG_MODE;
@@ -2059,6 +2066,7 @@ declare class Niivue {
      * @see {@link https://niivue.github.io/niivue/features/document.3d.html | live demo usage}
      */
     addVolumeFromUrl(imageOptions: ImageFromUrlOptions): Promise<NVImage>;
+    addVolumesFromUrl(imageOptionsArray: ImageFromUrlOptions[]): Promise<NVImage[]>;
     /**
      * Find media by url
      */
@@ -2572,6 +2580,11 @@ declare class Niivue {
      * @see {@link https://niivue.github.io/niivue/features/multiuser.meshes.html | live demo usage}
      */
     addMeshFromUrl(meshOptions: LoadFromUrlParams): Promise<NVMesh>;
+    /**
+     * Add mesh and notify subscribers
+     * @see {@link https://niivue.github.io/niivue/features/multiuser.meshes.html | live demo usage}
+     */
+    addMeshesFromUrl(meshOptions: LoadFromUrlParams[]): Promise<NVMesh[]>;
     /**
      * load an array of meshes
      * @param meshList - the array of objects to load. each object must have a resolvable "url" property at a minimum
@@ -2996,4 +3009,4 @@ declare class Niivue {
     set gl(gl: WebGL2RenderingContext | null);
 }
 
-export { type Connectome, type ConnectomeOptions, DEFAULT_OPTIONS, DRAG_MODE, type DocumentData, type DragReleaseParams, type ExportDocumentData, INITIAL_SCENE_DATA, LabelLineTerminator, LabelTextAlignment, type LegacyConnectome, type LegacyNodes, MULTIPLANAR_TYPE, type NVConfigOptions, type NVConnectomeEdge, type NVConnectomeNode, NVController, NVDocument, NVImage, NVImageFromUrlOptions, NVLabel3D, NVLabel3DStyle, NVMesh, NVMeshFromUrlOptions, NVMeshLayerDefaults, NVMeshLoaders, NVUtilities, type NiftiHeader, type NiiVueLocation, type NiiVueLocationValue, Niivue, type Point, SLICE_TYPE, type Scene, type Volume, cmapper, ColorTables as colortables };
+export { type Connectome, type ConnectomeOptions, DEFAULT_OPTIONS, DRAG_MODE, type DocumentData, type DragReleaseParams, type ExportDocumentData, INITIAL_SCENE_DATA, LabelLineTerminator, LabelTextAlignment, type LegacyConnectome, type LegacyNodes, MULTIPLANAR_TYPE, type NVConfigOptions, type NVConnectomeEdge, type NVConnectomeNode, NVController, NVDocument, NVImage, NVImageFromUrlOptions, NVLabel3D, NVLabel3DStyle, NVMesh, NVMeshFromUrlOptions, NVMeshLayerDefaults, NVMeshLoaders, NVUtilities, type NiftiHeader, type NiiVueLocation, type NiiVueLocationValue, Niivue, type Point, SHOW_RENDER, SLICE_TYPE, type Scene, type Volume, cmapper, ColorTables as colortables };

package/build/index.js

@@ -13,7 +13,7 @@ var __publicField = (obj, key, value) => {
 import { mat4 as mat46, vec2, vec3 as vec311, vec4 as vec48 } from "gl-matrix";
 
 // package.json
-var version = "0.43.7";
+var version = "0.44.0";
 
 // src/logger.ts
 var _Log = class _Log {
@@ -21929,6 +21929,12 @@ var SLICE_TYPE = /* @__PURE__ */ ((SLICE_TYPE2) => {
   SLICE_TYPE2[SLICE_TYPE2["RENDER"] = 4] = "RENDER";
   return SLICE_TYPE2;
 })(SLICE_TYPE || {});
+var SHOW_RENDER = /* @__PURE__ */ ((SHOW_RENDER2) => {
+  SHOW_RENDER2[SHOW_RENDER2["NEVER"] = 0] = "NEVER";
+  SHOW_RENDER2[SHOW_RENDER2["ALWAYS"] = 1] = "ALWAYS";
+  SHOW_RENDER2[SHOW_RENDER2["AUTO"] = 2] = "AUTO";
+  return SHOW_RENDER2;
+})(SHOW_RENDER || {});
 var MULTIPLANAR_TYPE = /* @__PURE__ */ ((MULTIPLANAR_TYPE2) => {
   MULTIPLANAR_TYPE2[MULTIPLANAR_TYPE2["AUTO"] = 0] = "AUTO";
   MULTIPLANAR_TYPE2[MULTIPLANAR_TYPE2["COLUMN"] = 1] = "COLUMN";
@@ -21975,7 +21981,10 @@ var DEFAULT_OPTIONS = {
   isColorbar: false,
   isOrientCube: false,
   multiplanarPadPixels: 0,
+  // @deprecated
   multiplanarForceRender: false,
+  multiplanarShowRender: 2 /* AUTO */,
+  // auto is the same behaviour as multiplanarForceRender: false
   isRadiologicalConvention: false,
   meshThicknessOn2D: Infinity,
   dragMode: 1 /* contrast */,
@@ -24997,6 +25006,39 @@ var Niivue = class _Niivue {
     this.addVolume(volume);
     return volume;
   }
+  async addVolumesFromUrl(imageOptionsArray) {
+    const promises = imageOptionsArray.map(async (imageItem) => {
+      const imageOptions = {
+        url: imageItem.url,
+        headers: imageItem.headers,
+        name: imageItem.name,
+        colormap: imageItem.colormap ? imageItem.colormap : imageItem.colorMap,
+        colormapNegative: imageItem.colormapNegative ? imageItem.colormapNegative : imageItem.colorMapNegative,
+        opacity: imageItem.opacity,
+        urlImgData: imageItem.urlImgData,
+        cal_min: imageItem.cal_min,
+        cal_max: imageItem.cal_max,
+        trustCalMinMax: this.opts.trustCalMinMax,
+        isManifest: imageItem.isManifest,
+        frame4D: imageItem.frame4D,
+        limitFrames4D: imageItem.limitFrames4D || this.opts.limitFrames4D,
+        colorbarVisible: imageItem.colorbarVisible
+      };
+      const volume = await NVImage.loadFromUrl(imageOptions);
+      this.document.addImageOptions(volume, imageOptions);
+      volume.onColormapChange = this.onColormapChange;
+      this.mediaUrlMap.set(volume, imageOptions.url);
+      if (this.onVolumeAddedFromUrl) {
+        this.onVolumeAddedFromUrl(imageOptions, volume);
+      }
+      return volume;
+    });
+    const volumes = await Promise.all(promises);
+    for (let i = 0; i < volumes.length; i++) {
+      this.addVolume(volumes[i]);
+    }
+    return volumes;
+  }
   /**
    * Find media by url
    */
@@ -26775,28 +26817,27 @@ var Niivue = class _Niivue {
     this.volumes = [];
     this.gl.clearColor(0, 0, 0, 1);
     this.gl.clear(this.gl.COLOR_BUFFER_BIT);
-    for (let i = 0; i < volumeList.length; i++) {
-      if (volumeList[i].colorMap !== void 0) {
-        volumeList[i].colormap = volumeList[i].colorMap;
-      }
-      const imageOptions = {
-        url: volumeList[i].url,
-        headers: volumeList[i].headers,
-        name: volumeList[i].name,
-        colormap: volumeList[i].colormap,
-        colormapNegative: volumeList[i].colormapNegative,
-        opacity: volumeList[i].opacity,
-        urlImgData: volumeList[i].urlImgData,
-        cal_min: volumeList[i].cal_min,
-        cal_max: volumeList[i].cal_max,
-        trustCalMinMax: this.opts.trustCalMinMax,
-        isManifest: volumeList[i].isManifest,
-        frame4D: volumeList[i].frame4D,
-        limitFrames4D: volumeList[i].limitFrames4D || this.opts.limitFrames4D,
-        colorbarVisible: volumeList[i].colorbarVisible
-      };
-      await this.addVolumeFromUrl(imageOptions);
+    if (volumeList.length > 1) {
+      await this.addVolumesFromUrl(volumeList);
+      return this;
     }
+    const imageOptions = {
+      url: volumeList[0].url,
+      headers: volumeList[0].headers,
+      name: volumeList[0].name,
+      colormap: volumeList[0].colormap ? volumeList[0].colormap : volumeList[0].colorMap,
+      colormapNegative: volumeList[0].colormapNegative ? volumeList[0].colormapNegative : volumeList[0].colorMapNegative,
+      opacity: volumeList[0].opacity,
+      urlImgData: volumeList[0].urlImgData,
+      cal_min: volumeList[0].cal_min,
+      cal_max: volumeList[0].cal_max,
+      trustCalMinMax: this.opts.trustCalMinMax,
+      isManifest: volumeList[0].isManifest,
+      frame4D: volumeList[0].frame4D,
+      limitFrames4D: volumeList[0].limitFrames4D || this.opts.limitFrames4D,
+      colorbarVisible: volumeList[0].colorbarVisible
+    };
+    await this.addVolumeFromUrl(imageOptions);
     return this;
   }
   /**
@@ -26820,6 +26861,32 @@ var Niivue = class _Niivue {
     this.addMesh(mesh);
     return mesh;
   }
+  /**
+   * Add mesh and notify subscribers
+   * @see {@link https://niivue.github.io/niivue/features/multiuser.meshes.html | live demo usage}
+   */
+  async addMeshesFromUrl(meshOptions) {
+    const promises = meshOptions.map(async (meshItem) => {
+      const ext = this.getFileExt(meshItem.url);
+      if (ext === "JCON" || ext === "JSON") {
+        const response = await fetch(meshItem.url, {});
+        const json = await response.json();
+        const mesh2 = this.loadConnectomeAsMesh(json);
+        this.mediaUrlMap.set(mesh2, meshItem.url);
+        this.onMeshAddedFromUrl(meshItem, mesh2);
+        return mesh2;
+      }
+      const mesh = await NVMesh2.loadFromUrl({ ...meshItem, gl: this.gl });
+      this.mediaUrlMap.set(mesh, meshItem.url);
+      this.onMeshAddedFromUrl(meshItem, mesh);
+      return mesh;
+    });
+    const meshes = await Promise.all(promises);
+    for (let i = 0; i < meshes.length; i++) {
+      this.addMesh(meshes[i]);
+    }
+    return meshes;
+  }
   /**
    * load an array of meshes
    * @param meshList - the array of objects to load. each object must have a resolvable "url" property at a minimum
@@ -26841,9 +26908,13 @@ var Niivue = class _Niivue {
     this.meshes = [];
     this.gl.clearColor(0, 0, 0, 1);
     this.gl.clear(this.gl.COLOR_BUFFER_BIT);
-    for (let i = 0; i < meshList.length; i++) {
-      await this.addMeshFromUrl(meshList[i]);
+    if (meshList.length > 1) {
+      await this.addMeshesFromUrl(meshList);
+      this.updateGLVolume();
+      this.drawScene();
+      return this;
     }
+    await this.addMeshFromUrl(meshList[0]);
     this.updateGLVolume();
     this.drawScene();
     return this;
@@ -30104,6 +30175,9 @@ var Niivue = class _Niivue {
       width = bulletMargin + longestTextLength;
       width += horizontalMargin * 2;
     }
+    if (width >= this.gl.canvas.width) {
+      return 0;
+    }
     return width;
   }
   getLegendPanelHeight() {
@@ -32390,6 +32464,20 @@ var Niivue = class _Niivue {
       } else if (this.opts.sliceType === 2 /* SAGITTAL */) {
         this.draw2D([0, 0, 0, 0], 2);
       } else {
+        let isShowRender = false;
+        if (this.opts.multiplanarForceRender) {
+          isShowRender = true;
+          if (this.opts.multiplanarForceRender) {
+            this.opts.multiplanarShowRender = 1 /* ALWAYS */;
+          } else {
+            this.opts.multiplanarShowRender = 2 /* AUTO */;
+          }
+          delete this.opts.multiplanarForceRender;
+        } else {
+          if (this.opts.multiplanarShowRender === 1 /* ALWAYS */) {
+            isShowRender = true;
+          }
+        }
         const isDrawPenDown = isFinite(this.drawPenLocation[0]) && this.opts.drawingEnabled;
         const { volScale } = this.sliceScale();
         if (typeof this.opts.multiplanarPadPixels !== "number") {
@@ -32431,7 +32519,7 @@ var Niivue = class _Niivue {
         }
         if (isDrawColumn) {
           let ltwh = ltwh1x3;
-          if (this.opts.multiplanarForceRender || ltwh1x4[4] >= ltwh1x3[4]) {
+          if (isShowRender || this.opts.multiplanarShowRender === 2 /* AUTO */ && ltwh1x4[4] >= ltwh1x3[4]) {
             ltwh = ltwh1x4;
           } else {
             isDraw3D = false;
@@ -32448,7 +32536,7 @@ var Niivue = class _Niivue {
           }
         } else if (isDrawRow) {
           let ltwh = ltwh3x1;
-          if (this.opts.multiplanarForceRender || ltwh4x1[4] >= ltwh3x1[4]) {
+          if (isShowRender || this.opts.multiplanarShowRender === 2 /* AUTO */ && ltwh4x1[4] >= ltwh3x1[4]) {
             ltwh = ltwh4x1;
           } else {
             isDraw3D = false;
@@ -32463,6 +32551,12 @@ var Niivue = class _Niivue {
             this.draw3D([ltwh[0] + sX + sX + sY + pad * 3, ltwh[1], ltwh[3], ltwh[3]]);
           }
         } else if (isDrawGrid) {
+          if (!isShowRender) {
+            isDraw3D = false;
+          }
+          if (this.opts.multiplanarShowRender === 2 /* AUTO */) {
+            isDraw3D = true;
+          }
           const ltwh = ltwh2x2;
           const sX = volScale[0] * ltwh[4];
           const sY = volScale[1] * ltwh[4];
@@ -32587,6 +32681,7 @@ export {
   NVMeshLoaders,
   NVUtilities,
   Niivue,
+  SHOW_RENDER,
   SLICE_TYPE,
   cmapper,
   ColorTables as colortables