Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OHIF/Viewers into pr/fix/stack-im…
Browse files Browse the repository at this point in the history
…age-sync-for
  • Loading branch information
sedghi committed Oct 3, 2023
2 parents 1948368 + c9c57b0 commit 46dc64c
Show file tree
Hide file tree
Showing 53 changed files with 323 additions and 121 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)


### Bug Fixes

* **no sab:** should work when shared array buffer is not required ([#3686](https://github.com/OHIF/Viewers/issues/3686)) ([a67d72d](https://github.com/OHIF/Viewers/commit/a67d72de85238b369a18c010bf6d147daefc6df5))





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)


Expand Down
2 changes: 1 addition & 1 deletion commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dc73b187484da029a2664bb1302f30137c973b8c
a67d72de85238b369a18c010bf6d147daefc6df5
8 changes: 8 additions & 0 deletions extensions/cornerstone-dicom-rt/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
Expand Down
10 changes: 5 additions & 5 deletions extensions/cornerstone-dicom-rt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone-dicom-rt",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "DICOM RT read workflow",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -31,10 +31,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/extension-cornerstone": "3.7.0-beta.86",
"@ohif/extension-default": "3.7.0-beta.86",
"@ohif/i18n": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/extension-cornerstone": "3.7.0-beta.87",
"@ohif/extension-default": "3.7.0-beta.87",
"@ohif/i18n": "3.7.0-beta.87",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
8 changes: 8 additions & 0 deletions extensions/cornerstone-dicom-seg/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
Expand Down
10 changes: 5 additions & 5 deletions extensions/cornerstone-dicom-seg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone-dicom-seg",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "DICOM SEG read workflow",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -31,10 +31,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/extension-cornerstone": "3.7.0-beta.86",
"@ohif/extension-default": "3.7.0-beta.86",
"@ohif/i18n": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/extension-cornerstone": "3.7.0-beta.87",
"@ohif/extension-default": "3.7.0-beta.87",
"@ohif/i18n": "3.7.0-beta.87",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
8 changes: 8 additions & 0 deletions extensions/cornerstone-dicom-sr/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
Expand Down
10 changes: 5 additions & 5 deletions extensions/cornerstone-dicom-sr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone-dicom-sr",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "OHIF extension for an SR Cornerstone Viewport",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -32,10 +32,10 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/extension-cornerstone": "3.7.0-beta.86",
"@ohif/extension-measurement-tracking": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/extension-cornerstone": "3.7.0-beta.87",
"@ohif/extension-measurement-tracking": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"dcmjs": "^0.29.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
Expand Down
11 changes: 11 additions & 0 deletions extensions/cornerstone/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)


### Bug Fixes

* **no sab:** should work when shared array buffer is not required ([#3686](https://github.com/OHIF/Viewers/issues/3686)) ([a67d72d](https://github.com/OHIF/Viewers/commit/a67d72de85238b369a18c010bf6d147daefc6df5))





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-cornerstone
Expand Down
6 changes: 3 additions & 3 deletions extensions/cornerstone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "OHIF extension for Cornerstone",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -37,8 +37,8 @@
"@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.19.3",
"@ohif/core": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"dcmjs": "^0.29.6",
"dicom-parser": "^1.8.21",
"hammerjs": "^2.0.8",
Expand Down
21 changes: 11 additions & 10 deletions extensions/cornerstone/src/init.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,7 @@ export default async function init({
configuration,
appConfig,
}: Types.Extensions.ExtensionParams): Promise<void> {
await cs3DInit({
rendering: {
preferSizeOverAccuracy: Boolean(appConfig.use16BitDataType),
useNorm16Texture: Boolean(appConfig.use16BitDataType),
},
});

// For debugging e2e tests that are failing on CI
cornerstone.setUseCPURendering(Boolean(appConfig.useCPURendering));

// Note: this should run first before initializing the cornerstone
switch (appConfig.useSharedArrayBuffer) {
case 'AUTO':
cornerstone.setUseSharedArrayBuffer(csEnums.SharedArrayBufferModes.AUTO);
Expand All @@ -63,6 +54,16 @@ export default async function init({
cornerstone.setUseSharedArrayBuffer(csEnums.SharedArrayBufferModes.TRUE);
}

await cs3DInit({
rendering: {
preferSizeOverAccuracy: Boolean(appConfig.use16BitDataType),
useNorm16Texture: Boolean(appConfig.use16BitDataType),
},
});

// For debugging e2e tests that are failing on CI
cornerstone.setUseCPURendering(Boolean(appConfig.useCPURendering));

cornerstone.setConfiguration({
...cornerstone.getConfiguration(),
rendering: {
Expand Down
8 changes: 8 additions & 0 deletions extensions/default/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-default





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-default
Expand Down
6 changes: 3 additions & 3 deletions extensions/default/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-default",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "Common/default features and functionality for basic image viewing",
"author": "OHIF Core Team",
"license": "MIT",
Expand Down Expand Up @@ -30,8 +30,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/i18n": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/i18n": "3.7.0-beta.87",
"dcmjs": "^0.29.5",
"dicomweb-client": "^0.10.2",
"prop-types": "^15.6.2",
Expand Down
8 changes: 8 additions & 0 deletions extensions/dicom-microscopy/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-microscopy





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-microscopy
Expand Down
10 changes: 5 additions & 5 deletions extensions/dicom-microscopy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-microscopy",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "OHIF extension for DICOM microscopy",
"author": "Bill Wallace, md-prog",
"license": "MIT",
Expand Down Expand Up @@ -28,10 +28,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/extension-default": "3.7.0-beta.86",
"@ohif/i18n": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/extension-default": "3.7.0-beta.87",
"@ohif/i18n": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
8 changes: 8 additions & 0 deletions extensions/dicom-pdf/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-pdf





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-pdf
Expand Down
6 changes: 3 additions & 3 deletions extensions/dicom-pdf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-pdf",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "OHIF extension for PDF display",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -28,8 +28,8 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"dcmjs": "^0.29.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
Expand Down
8 changes: 8 additions & 0 deletions extensions/dicom-video/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-video





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-dicom-video
Expand Down
6 changes: 3 additions & 3 deletions extensions/dicom-video/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-dicom-video",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "OHIF extension for video display",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -28,8 +28,8 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"dcmjs": "^0.29.5",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
Expand Down
8 changes: 8 additions & 0 deletions extensions/measurement-tracking/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [3.7.0-beta.87](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.86...v3.7.0-beta.87) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-measurement-tracking





# [3.7.0-beta.86](https://github.com/OHIF/Viewers/compare/v3.7.0-beta.85...v3.7.0-beta.86) (2023-09-29)

**Note:** Version bump only for package @ohif/extension-measurement-tracking
Expand Down
10 changes: 5 additions & 5 deletions extensions/measurement-tracking/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-measurement-tracking",
"version": "3.7.0-beta.86",
"version": "3.7.0-beta.87",
"description": "Tracking features and functionality for basic image viewing",
"author": "OHIF Core Team",
"license": "MIT",
Expand Down Expand Up @@ -32,9 +32,9 @@
"peerDependencies": {
"@cornerstonejs/core": "^1.19.3",
"@cornerstonejs/tools": "^1.19.3",
"@ohif/core": "3.7.0-beta.86",
"@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/core": "3.7.0-beta.87",
"@ohif/extension-cornerstone-dicom-sr": "3.7.0-beta.87",
"@ohif/ui": "3.7.0-beta.87",
"classnames": "^2.3.2",
"dcmjs": "^0.29.5",
"lodash.debounce": "^4.17.21",
Expand All @@ -46,7 +46,7 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@ohif/ui": "3.7.0-beta.86",
"@ohif/ui": "3.7.0-beta.87",
"@xstate/react": "^3.2.2",
"xstate": "^4.10.0"
}
Expand Down
Loading

0 comments on commit 46dc64c

Please sign in to comment.