Skip to content

Commit bf0a3f8

Browse files
committed
Merge branch 'master' into beta
2 parents acd36fb + eeffdf4 commit bf0a3f8

File tree

90 files changed

+1251
-517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1251
-517
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dist/
99
coverage/
1010
.env
1111
Utilities/TestResults
12+
.idea

Sources/Common/Core/Base64/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ interface Base64 {
2121
fromArrayBuffer: typeof fromArrayBuffer;
2222
}
2323

24+
declare const Base64: Base64;
2425
export default Base64;

Sources/Common/Core/ScalarsToColors/Constants.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ export const ScalarMappingTarget = {
1111
RGBA: 4,
1212
};
1313

14+
export const Scale = {
15+
LINEAR: 0,
16+
LOG10: 1,
17+
};
18+
1419
export default {
1520
VectorMode,
1621
ScalarMappingTarget,
22+
Scale,
1723
};

Sources/Common/Core/ScalarsToColors/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import vtkDataArray from 'vtk.js/Sources/Common/Core/DataArray';
33
import Constants from 'vtk.js/Sources/Common/Core/ScalarsToColors/Constants';
44
import vtkMapper from 'vtk.js/Sources/Rendering/Core/Mapper/Constants'; // Need to go inside Constants otherwise dependency loop
55

6-
const { ScalarMappingTarget, VectorMode } = Constants;
6+
const { ScalarMappingTarget, Scale, VectorMode } = Constants;
77
const { VtkDataTypes } = vtkDataArray;
88
const { ColorMode } = vtkMapper;
99
const { vtkErrorMacro } = macro;
@@ -553,6 +553,7 @@ const DEFAULT_VALUES = {
553553
annotationArray: null,
554554
annotatedValueMap: null,
555555
indexedLookup: false,
556+
scale: Scale.LINEAR,
556557
};
557558

558559
// ----------------------------------------------------------------------------

Sources/Common/Core/URLExtract/index.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@ export function extractURLParameters(
1313
* @param {String} str The type value as string.
1414
*/
1515
export function toNativeType(str: string): void;
16+
17+
declare const _default: {
18+
toNativeType: typeof toNativeType;
19+
extractURLParameters: typeof extractURLParameters;
20+
};
21+
export default _default;

Sources/IO/Core/DataAccessHelper/HtmlDataAccessHelper.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ export interface HtmlDataAccessHelper {
1919
): Promise<HTMLImageElement>;
2020
}
2121

22+
declare const HtmlDataAccessHelper: HtmlDataAccessHelper;
2223
export default HtmlDataAccessHelper;

Sources/IO/Core/DataAccessHelper/HttpDataAccessHelper.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ export interface HttpDataAccessHelper {
1919
): Promise<HTMLImageElement>;
2020
}
2121

22+
declare const HttpDataAccessHelper: HttpDataAccessHelper;
2223
export default HttpDataAccessHelper;

Sources/IO/Core/DataAccessHelper/JSZipDataAccessHelper.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ export interface JSZipDataAccessHelper {
2323
create(createOptions: object): IJSZipDataAccessHelper;
2424
}
2525

26+
declare const JSZipDataAccessHelper: JSZipDataAccessHelper;
2627
export default JSZipDataAccessHelper;

Sources/IO/Core/DataAccessHelper/LiteHttpDataAccessHelper.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ export interface LiteHttpDataAccessHelper {
1919
): Promise<HTMLImageElement>;
2020
}
2121

22+
declare const LiteHttpDataAccessHelper: LiteHttpDataAccessHelper;
2223
export default LiteHttpDataAccessHelper;

Sources/IO/Core/DataAccessHelper/index.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import HtmlDataAccessHelper from './HtmlDataAccessHelper';
2-
import HttpDataAccessHelper from './HttpDataAccessHelper';
3-
import JSZipDataAccessHelper from './JSZipDataAccessHelper';
4-
import LiteHttpDataAccessHelper from './LiteHttpDataAccessHelper';
1+
import { HtmlDataAccessHelper } from './HtmlDataAccessHelper';
2+
import { HttpDataAccessHelper } from './HttpDataAccessHelper';
3+
import { JSZipDataAccessHelper } from './JSZipDataAccessHelper';
4+
import { LiteHttpDataAccessHelper } from './LiteHttpDataAccessHelper';
55

66
export function has(type: string): boolean;
77
export function get(

0 commit comments

Comments
 (0)