@cornerstonejs/core 4.0.0-beta.5 → 4.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
6
6
  private _imageIdGroups;
7
7
  private _loadedDimensionGroups;
8
8
  numDimensionGroups: number;
9
- numTimePoints: number;
10
9
  constructor(imageVolumeProperties: ImageVolumeProps & {
11
10
  splittingTag: string;
12
11
  imageIdGroups: string[][];
@@ -15,13 +14,9 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
15
14
  private _getImageIdRequests;
16
15
  getImageIdsToLoad(): string[];
17
16
  get dimensionGroupNumber(): number;
18
- set timePointIndex(index: number);
19
17
  set dimensionGroupNumber(dimensionGroupNumber: number);
20
- get timePointIndex(): number;
21
18
  scroll(delta: number): void;
22
19
  getCurrentDimensionGroupImageIds(): string[];
23
- getCurrentTimePointImageIds(): string[];
24
- flatImageIdIndexToTimePointIndex(flatImageIdIndex: number): number;
25
20
  flatImageIdIndexToDimensionGroupNumber(flatImageIdIndex: number): number;
26
21
  flatImageIdIndexToImageIdIndex(flatImageIdIndex: number): number;
27
22
  get splittingTag(): string;
@@ -56,9 +51,7 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
56
51
  volumeId: string;
57
52
  };
58
53
  }[];
59
- isTimePointLoaded(timePointIndex: number): boolean;
60
54
  isDimensionGroupLoaded(dimensionGroupNumber: number): boolean;
61
55
  private markDimensionGroupAsLoaded;
62
- protected checkTimePointCompletion(imageIdIndex: number): void;
63
56
  protected checkDimensionGroupCompletion(imageIdIndex: number): void;
64
57
  }
@@ -18,7 +18,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
18
18
  this._splittingTag = splittingTag;
19
19
  this._imageIdGroups = imageIdGroups;
20
20
  this.numDimensionGroups = this._imageIdGroups.length;
21
- this.numTimePoints = this.numDimensionGroups;
22
21
  }
23
22
  _getImageIdsToLoad() {
24
23
  const imageIdGroups = this._imageIdGroups;
@@ -42,10 +41,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
42
41
  get dimensionGroupNumber() {
43
42
  return this._dimensionGroupNumber;
44
43
  }
45
- set timePointIndex(index) {
46
- console.warn('Warning: timePointIndex is deprecated. Please use dimensionGroupNumber instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
47
- this.dimensionGroupNumber = index + 1;
48
- }
49
44
  set dimensionGroupNumber(dimensionGroupNumber) {
50
45
  if (this._dimensionGroupNumber === dimensionGroupNumber) {
51
46
  return;
@@ -61,18 +56,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
61
56
  numImageIdGroups: this.numDimensionGroups,
62
57
  splittingTag: this.splittingTag,
63
58
  });
64
- triggerEvent(eventTarget, Events.DYNAMIC_VOLUME_TIME_POINT_INDEX_CHANGED, {
65
- volumeId: this.volumeId,
66
- timePointIndex: dimensionGroupNumber - 1,
67
- numTimePoints: this.numDimensionGroups,
68
- imageIdGroupIndex: dimensionGroupNumber - 1,
69
- numImageIdGroups: this.numDimensionGroups,
70
- splittingTag: this.splittingTag,
71
- });
72
- }
73
- get timePointIndex() {
74
- console.warn('Warning: timePointIndex is deprecated. Please use dimensionGroupNumber instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
75
- return this._dimensionGroupNumber - 1;
76
59
  }
77
60
  scroll(delta) {
78
61
  const newDimensionGroupNumber = this._dimensionGroupNumber + delta;
@@ -89,14 +72,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
89
72
  getCurrentDimensionGroupImageIds() {
90
73
  return this._imageIdGroups[this._dimensionGroupNumber - 1];
91
74
  }
92
- getCurrentTimePointImageIds() {
93
- console.warn('Warning: getCurrentTimePointImageIds is deprecated. Please use getCurrentDimensionGroupImageIds instead.');
94
- return this.getCurrentDimensionGroupImageIds();
95
- }
96
- flatImageIdIndexToTimePointIndex(flatImageIdIndex) {
97
- console.warn('Warning: flatImageIdIndexToTimePointIndex is deprecated. Please use flatImageIdIndexToDimensionGroupNumber instead.');
98
- return this.flatImageIdIndexToDimensionGroupNumber(flatImageIdIndex) - 1;
99
- }
100
75
  flatImageIdIndexToDimensionGroupNumber(flatImageIdIndex) {
101
76
  return Math.floor(flatImageIdIndex / this._imageIdGroups[0].length) + 1;
102
77
  }
@@ -106,10 +81,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
106
81
  get splittingTag() {
107
82
  return this._splittingTag;
108
83
  }
109
- isTimePointLoaded(timePointIndex) {
110
- console.warn('Warning: isTimePointLoaded is deprecated. Please use isDimensionGroupLoaded instead. Note that timePointIndex is zero-based while dimensionGroupNumber starts at 1.');
111
- return this.isDimensionGroupLoaded(timePointIndex + 1);
112
- }
113
84
  isDimensionGroupLoaded(dimensionGroupNumber) {
114
85
  return this._loadedDimensionGroups.has(dimensionGroupNumber);
115
86
  }
@@ -119,14 +90,6 @@ export default class StreamingDynamicImageVolume extends BaseStreamingImageVolum
119
90
  volumeId: this.volumeId,
120
91
  dimensionGroupNumber: dimensionGroupNumber,
121
92
  });
122
- triggerEvent(eventTarget, Events.DYNAMIC_VOLUME_TIME_POINT_LOADED, {
123
- volumeId: this.volumeId,
124
- timePointIndex: dimensionGroupNumber - 1,
125
- });
126
- }
127
- checkTimePointCompletion(imageIdIndex) {
128
- console.warn('Warning: checkTimePointCompletion is deprecated. Please use checkDimensionGroupCompletion instead.');
129
- this.checkDimensionGroupCompletion(imageIdIndex);
130
93
  }
131
94
  checkDimensionGroupCompletion(imageIdIndex) {
132
95
  const dimensionGroupNumber = this.flatImageIdIndexToDimensionGroupNumber(imageIdIndex);
@@ -3,11 +3,11 @@ import { Events } from '../enums';
3
3
  import eventTarget from '../eventTarget';
4
4
  import { triggerEvent } from '../utilities';
5
5
  function fetchArrayBuffer({ url, signal, onload, loaderOptions, }) {
6
- return new Promise((resolve, reject) => {
6
+ return new Promise(async (resolve, reject) => {
7
7
  const xhr = new XMLHttpRequest();
8
8
  xhr.open('GET', url, true);
9
9
  const defaultHeaders = {};
10
- const beforeSendHeaders = loaderOptions.beforeSend(xhr, defaultHeaders);
10
+ const beforeSendHeaders = await loaderOptions.beforeSend(xhr, defaultHeaders);
11
11
  const headers = Object.assign({}, defaultHeaders, beforeSendHeaders);
12
12
  xhr.responseType = 'arraybuffer';
13
13
  Object.keys(headers).forEach(function (key) {
@@ -5,6 +5,6 @@ type GeometryLoaderFn = (geometryId: string, options?: Record<string, unknown>,
5
5
  decache?: () => void | undefined;
6
6
  };
7
7
  export interface GeometryLoaderOptions {
8
- beforeSend?: (xhr: XMLHttpRequest, defaultHeaders: Record<string, string>) => Record<string, string> | void;
8
+ beforeSend?: (xhr: XMLHttpRequest, defaultHeaders: Record<string, string>) => Promise<Record<string, string> | void> | Record<string, string> | void;
9
9
  }
10
10
  export type { GeometryLoaderFn as default };
@@ -3,9 +3,6 @@ interface IDynamicImageVolume extends IImageVolume {
3
3
  get dimensionGroupNumber(): number;
4
4
  set dimensionGroupNumber(dimensionGroupNumber: number);
5
5
  get numDimensionGroups(): number;
6
- get timePointIndex(): number;
7
- set timePointIndex(timePointIndex: number);
8
- get numTimePoints(): number;
9
6
  scroll(delta: number): void;
10
7
  }
11
8
  export type { IDynamicImageVolume as default };
@@ -1 +1 @@
1
- export declare const version = "4.0.0-beta.5";
1
+ export declare const version = "4.0.1";
@@ -1 +1 @@
1
- export const version = '4.0.0-beta.5';
1
+ export const version = '4.0.1';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cornerstonejs/core",
3
- "version": "4.0.0-beta.5",
3
+ "version": "4.0.1",
4
4
  "description": "Cornerstone3D Core",
5
5
  "module": "./dist/esm/index.js",
6
6
  "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
97
97
  "type": "individual",
98
98
  "url": "https://ohif.org/donate"
99
99
  },
100
- "gitHead": "c983ea46160362885b27f3c72cc84731cfe86b99"
100
+ "gitHead": "b1979f6092bd59358ba840a4ba4356ef915b8073"
101
101
  }