Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OHIF/Viewers into fix/3p8-rc6
Browse files Browse the repository at this point in the history
  • Loading branch information
sedghi committed Apr 29, 2024
2 parents 1d112ab + 4784638 commit 11a5c33
Show file tree
Hide file tree
Showing 58 changed files with 431 additions and 146 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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)


### Bug Fixes

* **bugs:** fix patient header for doc, track ball rotate resize observer and add segmentation button not being enabled on viewport data change ([#4068](https://github.com/OHIF/Viewers/issues/4068)) ([c09311d](https://github.com/OHIF/Viewers/commit/c09311d3b7df05fcd00a9f36a7233e9d7e5589d0))





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**Note:** Version bump only for package ohif-monorepo-root
Expand Down
2 changes: 1 addition & 1 deletion commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f09dfaf911193d5089c03e9872b6acf4e1d92a52
c09311d3b7df05fcd00a9f36a7233e9d7e5589d0
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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)

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





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "DICOM RT read workflow",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -33,10 +33,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/extension-cornerstone": "3.8.0-beta.91",
"@ohif/extension-default": "3.8.0-beta.91",
"@ohif/i18n": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/extension-cornerstone": "3.8.0-beta.92",
"@ohif/extension-default": "3.8.0-beta.92",
"@ohif/i18n": "3.8.0-beta.92",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
11 changes: 11 additions & 0 deletions extensions/cornerstone-dicom-seg/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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)


### Bug Fixes

* **bugs:** fix patient header for doc, track ball rotate resize observer and add segmentation button not being enabled on viewport data change ([#4068](https://github.com/OHIF/Viewers/issues/4068)) ([c09311d](https://github.com/OHIF/Viewers/commit/c09311d3b7df05fcd00a9f36a7233e9d7e5589d0))





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "DICOM SEG read workflow",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -33,10 +33,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/extension-cornerstone": "3.8.0-beta.91",
"@ohif/extension-default": "3.8.0-beta.91",
"@ohif/i18n": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/extension-cornerstone": "3.8.0-beta.92",
"@ohif/extension-default": "3.8.0-beta.92",
"@ohif/i18n": "3.8.0-beta.92",
"prop-types": "^15.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
31 changes: 24 additions & 7 deletions extensions/cornerstone-dicom-seg/src/panels/PanelSegmentation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ export default function PanelSegmentation({
extensionManager,
configuration,
}) {
const { segmentationService, viewportGridService, uiDialogService, displaySetService } =
servicesManager.services;
const {
segmentationService,
viewportGridService,
uiDialogService,
displaySetService,
cornerstoneViewportService,
} = servicesManager.services;

const { t } = useTranslation('PanelSegmentation');

Expand Down Expand Up @@ -82,21 +87,33 @@ export default function PanelSegmentation({
// Handle initial state
handleActiveViewportChange();

const changed = viewportGridService.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED;
const changedGrid = viewportGridService.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED;
const ready = viewportGridService.EVENTS.VIEWPORTS_READY;

const subs = [];
[ready, changed].forEach(evt => {
const subsGrid = [];
[ready, changedGrid].forEach(evt => {
const { unsubscribe } = viewportGridService.subscribe(evt, ({ viewportId }) => {
handleActiveViewportChange(viewportId);
});

subs.push(unsubscribe);
subsGrid.push(unsubscribe);
});

const changedData = cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED;

const subsData = [];
[changedData].forEach(evt => {
const { unsubscribe } = cornerstoneViewportService.subscribe(evt, () => {
handleActiveViewportChange();
});

subsData.push(unsubscribe);
});

// Clean up
return () => {
subs.forEach(unsub => unsub());
subsGrid.forEach(unsub => unsub());
subsData.forEach(unsub => unsub());
};
}, []);

Expand Down
11 changes: 11 additions & 0 deletions extensions/cornerstone-dicom-sr/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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)


### Bug Fixes

* **bugs:** fix patient header for doc, track ball rotate resize observer and add segmentation button not being enabled on viewport data change ([#4068](https://github.com/OHIF/Viewers/issues/4068)) ([c09311d](https://github.com/OHIF/Viewers/commit/c09311d3b7df05fcd00a9f36a7233e9d7e5589d0))





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "OHIF extension for an SR Cornerstone Viewport",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -34,10 +34,10 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/extension-cornerstone": "3.8.0-beta.91",
"@ohif/extension-measurement-tracking": "3.8.0-beta.91",
"@ohif/ui": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/extension-cornerstone": "3.8.0-beta.92",
"@ohif/extension-measurement-tracking": "3.8.0-beta.92",
"@ohif/ui": "3.8.0-beta.92",
"dcmjs": "^0.29.12",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
Expand Down
11 changes: 11 additions & 0 deletions extensions/cornerstone-dynamic-volume/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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)


### Bug Fixes

* **bugs:** fix patient header for doc, track ball rotate resize observer and add segmentation button not being enabled on viewport data change ([#4068](https://github.com/OHIF/Viewers/issues/4068)) ([c09311d](https://github.com/OHIF/Viewers/commit/c09311d3b7df05fcd00a9f36a7233e9d7e5589d0))





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
Expand Down
12 changes: 6 additions & 6 deletions extensions/cornerstone-dynamic-volume/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ohif/extension-cornerstone-dynamic-volume",
"version": "3.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "OHIF extension for 4D volumes data",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -29,11 +29,11 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/extension-cornerstone": "3.8.0-beta.91",
"@ohif/extension-default": "3.8.0-beta.91",
"@ohif/i18n": "3.8.0-beta.91",
"@ohif/ui": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/extension-cornerstone": "3.8.0-beta.92",
"@ohif/extension-default": "3.8.0-beta.92",
"@ohif/i18n": "3.8.0-beta.92",
"@ohif/ui": "3.8.0-beta.92",
"dcmjs": "^0.29.5",
"dicom-parser": "^1.8.21",
"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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)


### Bug Fixes

* **bugs:** fix patient header for doc, track ball rotate resize observer and add segmentation button not being enabled on viewport data change ([#4068](https://github.com/OHIF/Viewers/issues/4068)) ([c09311d](https://github.com/OHIF/Viewers/commit/c09311d3b7df05fcd00a9f36a7233e9d7e5589d0))





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "OHIF extension for Cornerstone",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -40,8 +40,8 @@
"@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.70.14",
"@icr/polyseg-wasm": "^0.4.0",
"@ohif/core": "3.8.0-beta.91",
"@ohif/ui": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/ui": "3.8.0-beta.92",
"dcmjs": "^0.29.12",
"dicom-parser": "^1.8.21",
"hammerjs": "^2.0.8",
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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)

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





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "Common/default features and functionality for basic image viewing",
"author": "OHIF Core Team",
"license": "MIT",
Expand Down Expand Up @@ -32,8 +32,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/i18n": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/i18n": "3.8.0-beta.92",
"dcmjs": "^0.29.12",
"dicomweb-client": "^0.10.4",
"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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)

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





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "OHIF extension for DICOM microscopy",
"author": "Bill Wallace, md-prog",
"license": "MIT",
Expand Down Expand Up @@ -30,10 +30,10 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/extension-default": "3.8.0-beta.91",
"@ohif/i18n": "3.8.0-beta.91",
"@ohif/ui": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/extension-default": "3.8.0-beta.92",
"@ohif/i18n": "3.8.0-beta.92",
"@ohif/ui": "3.8.0-beta.92",
"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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)

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





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

**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.8.0-beta.91",
"version": "3.8.0-beta.92",
"description": "OHIF extension for PDF display",
"author": "OHIF",
"license": "MIT",
Expand Down Expand Up @@ -30,8 +30,8 @@
"test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
},
"peerDependencies": {
"@ohif/core": "3.8.0-beta.91",
"@ohif/ui": "3.8.0-beta.91",
"@ohif/core": "3.8.0-beta.92",
"@ohif/ui": "3.8.0-beta.92",
"dcmjs": "^0.29.12",
"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.8.0-beta.92](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.91...v3.8.0-beta.92) (2024-04-28)

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





# [3.8.0-beta.91](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.90...v3.8.0-beta.91) (2024-04-25)

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

0 comments on commit 11a5c33

Please sign in to comment.