Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30515b8ab5 | ||
|
|
24bbf2b190 | ||
|
|
cb9aa6a765 | ||
|
|
5d9e4c9b02 | ||
|
|
dab095b6b5 | ||
|
|
cfa697aabc | ||
|
|
3350b1faa6 | ||
|
|
4ffb50c7e9 | ||
|
|
1d29554a91 | ||
|
|
b9d484fb2e | ||
|
|
597ac11c4d | ||
|
|
6007f340bf | ||
|
|
44738078db | ||
|
|
686fe7d931 | ||
|
|
0b8facbea6 | ||
|
|
0f89aa32f9 | ||
|
|
545161d5e8 | ||
|
|
eaa423c64e | ||
|
|
f7db74a843 | ||
|
|
7aba01f534 | ||
|
|
c5ebeaa127 | ||
|
|
d7e1d2c975 | ||
|
|
eb7eb56d7e | ||
|
|
c5ee092bf2 | ||
|
|
e2f4f95222 | ||
|
|
4546ede9bb | ||
|
|
e0fb439e98 | ||
|
|
ebbc9e0d6d | ||
|
|
47a6130fd5 | ||
|
|
80dfdcc37c | ||
|
|
d74ad370e0 | ||
|
|
ddfde9279e | ||
|
|
aaab6d2622 | ||
|
|
d2921083e7 | ||
|
|
a6338ea266 | ||
|
|
fe9551b9b1 | ||
|
|
ef60156a47 | ||
|
|
850de2903a | ||
|
|
f26ed5539b | ||
|
|
21aeaa63c7 | ||
|
|
2ac0d3f017 | ||
|
|
efdbe8e7b4 | ||
|
|
67b70eaa98 |
No files matched your search
@@ -2,23 +2,21 @@
|
|||||||
name: "\U0001F41B Bug report"
|
name: "\U0001F41B Bug report"
|
||||||
about: Create a report to help us improve
|
about: Create a report to help us improve
|
||||||
title: ''
|
title: ''
|
||||||
labels: 'Community: Report :bug:, Awaiting Reproduction, Triage :white_flag:'
|
labels: 'Community: Report :bug:, Awaiting Reproduction'
|
||||||
assignees: ''
|
assignees: ''
|
||||||
---
|
---
|
||||||
|
|
||||||
> **Before Creating an issue**
|
<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
|
||||||
>
|
<!-- Please read our Rules of Conduct: https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md -->
|
||||||
> - Are you running the latest version?
|
<!-- 🕮 Read our guide about our process: https://v3-docs.ohif.org/development/our-process -->
|
||||||
> - Are you reporting to the correct repository?
|
<!-- 🔎 Search existing issues to avoid creating duplicates. -->
|
||||||
> - Did you search existing issues?
|
<!-- 🧪 Test using the latest version -->
|
||||||
|
|
||||||
## Bug Report
|
|
||||||
|
|
||||||
### Describe the Bug
|
### Describe the Bug
|
||||||
|
|
||||||
_A clear and concise description of what the bug is._
|
_A clear and concise description of what the bug is._
|
||||||
|
|
||||||
### What steps can we follow to reproduce the bug?
|
### Steps to Reproduce:
|
||||||
|
|
||||||
1. First step
|
1. First step
|
||||||
2. Second step
|
2. Second step
|
||||||
@@ -28,6 +26,15 @@ _A clear and concise description of what the bug is._
|
|||||||
Please use code blocks to show formatted errors or code snippets
|
Please use code blocks to show formatted errors or code snippets
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### The current behavior
|
||||||
|
|
||||||
|
_A clear and concise description of what happens instead of the expected
|
||||||
|
behavior._
|
||||||
|
|
||||||
|
### The expected behavior
|
||||||
|
|
||||||
|
_A clear and concise description of what you expected to happen._
|
||||||
|
|
||||||
> :warning: Reports we cannot reproduce are at risk of being marked stale and
|
> :warning: Reports we cannot reproduce are at risk of being marked stale and
|
||||||
> closed. The more information you can provide, the more likely we are to look
|
> closed. The more information you can provide, the more likely we are to look
|
||||||
> into and address your issue.
|
> into and address your issue.
|
||||||
@@ -2,19 +2,28 @@
|
|||||||
name: "\U0001F680 Feature request"
|
name: "\U0001F680 Feature request"
|
||||||
about: Suggest an idea for this project
|
about: Suggest an idea for this project
|
||||||
title: ''
|
title: ''
|
||||||
labels: 'Community: Request :hand:, Triage :white_flag:'
|
labels: 'Community: Request :hand:'
|
||||||
assignees: ''
|
assignees: ''
|
||||||
---
|
---
|
||||||
|
|
||||||
> :hand: Many people requests features. Tell us why yours is important to the
|
<!-- ⚠️⚠️ Do Not Delete This! feature_request_template ⚠️⚠️ -->
|
||||||
|
<!-- Please read our Rules of Conduct: https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md -->
|
||||||
|
|
||||||
|
<!-- :hand: Many people requests features. Tell us why yours is important to the
|
||||||
> community. How does it add value? Why _this feature_?
|
> community. How does it add value? Why _this feature_?
|
||||||
>
|
>
|
||||||
> Is your request very specific to your needs? Consider
|
> Is your request very specific to your needs? Consider
|
||||||
> [contributing it](https://docs.ohif.org/contributing.html) yourself! Or reach
|
> [contributing it](https://v3-docs.ohif.org/development/contributing) yourself!
|
||||||
> out to a community member that offers
|
> Or reach out to a community member that offers
|
||||||
> [consulting services](https://docs.ohif.org/help.html#paid--commercial).
|
> [consulting services](https://docs.ohif.org/help.html#paid--commercial).
|
||||||
|
-->
|
||||||
|
|
||||||
## Request
|
### Request
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Please include as much detail as possible including possibly mock up screen shots, workflow or logic flow diagrams etc.
|
||||||
|
Discuss if and how the requested feature interacts with existing features
|
||||||
|
-->
|
||||||
|
|
||||||
**What feature or change would you like to see made?**
|
**What feature or change would you like to see made?**
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,91 @@
|
|||||||
### PR Checklist
|
<!-- Do Not Delete This! pr_template -->
|
||||||
|
<!-- Please read our Rules of Conduct: https://github.com/OHIF/Viewers/blob/master/CODE_OF_CONDUCT.md -->
|
||||||
- [ ] Brief description of changes
|
<!-- 🕮 Read our guide about our Contributing Guide here https://v3-docs.ohif.org/development/contributing -->
|
||||||
- [ ] Links to any relevant issues
|
<!-- :hand: Thank you for starting this amazing contribution! -->
|
||||||
- [ ] Required status checks are passing
|
|
||||||
- [ ] User cases if changes impact the user's experience
|
|
||||||
- [ ] `@mention` a maintainer to request a review
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Links
|
⚠️⚠️ Please make sure the checklist section below is complete before submitting your PR.
|
||||||
-->
|
To complete the checklist, add an 'x' to each item: [] -> [x]
|
||||||
|
(PRs that do not have all the checkboxes marked will not be approved)
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Context
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Provide a clear explanation of the reasoning behind this change, such as:
|
||||||
|
- A link to the issue being addressed, using the format "Fixes #ISSUE_NUMBER"
|
||||||
|
- An image showing the issue or problem being addressed (if not already in the issue)
|
||||||
|
- Error logs or callStacks to help with the understanding of the problem (if not already in the issue)
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Changes & Results
|
||||||
|
|
||||||
|
<!--
|
||||||
|
List all the changes that have been done, such as:
|
||||||
|
- Add new components
|
||||||
|
- Remove old components
|
||||||
|
- Update dependencies
|
||||||
|
|
||||||
|
What are the effects of this change?
|
||||||
|
- Before vs After
|
||||||
|
- Screenshots / GIFs / Videos
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Describe how we can test your changes.
|
||||||
|
- open a URL
|
||||||
|
- visit a page
|
||||||
|
- click on a button
|
||||||
|
- etc.
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Checklist
|
||||||
|
|
||||||
|
#### PR
|
||||||
|
|
||||||
|
<!--
|
||||||
|
https://semantic-release.gitbook.io/semantic-release/#how-does-it-work
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
Please note the letter casing in the provided examples (upper or lower).
|
||||||
|
|
||||||
|
- feat(MeasurementService): add ...
|
||||||
|
- fix(Toolbar): fix ...
|
||||||
|
- docs(Readme): update ...
|
||||||
|
- style(Whitespace): fix ...
|
||||||
|
- refactor(ExtensionManager): ...
|
||||||
|
- test(HangingProtocol): Add test ...
|
||||||
|
- chore(git): update ...
|
||||||
|
- perf(VolumeLoader): ...
|
||||||
|
|
||||||
|
You don't need to have each commit within the Pull Request follow the rule,
|
||||||
|
but the PR title must comply with it, as it will be used as the commit message
|
||||||
|
after the commits are squashed.
|
||||||
|
-->
|
||||||
|
|
||||||
|
- [] My Pull Request title is descriptive, accurate and follows the
|
||||||
|
semantic-release format and guidelines.
|
||||||
|
|
||||||
|
#### Code
|
||||||
|
|
||||||
|
- [] My code has been well-documented (function documentation, inline comments,
|
||||||
|
etc.)
|
||||||
|
|
||||||
|
#### Public Documentation Updates
|
||||||
|
|
||||||
|
<!-- https://v3-docs.ohif.org/ -->
|
||||||
|
|
||||||
|
- [] The documentation page has been updated as necessary for any public API
|
||||||
|
additions or removals.
|
||||||
|
|
||||||
|
#### Tested Environment
|
||||||
|
|
||||||
|
- [] "OS: <!--[e.g. Windows 10, macOS 10.15.4]"-->
|
||||||
|
- [] "Node version: <!--[e.g. 16.14.0]"-->
|
||||||
|
- [] "Browser:
|
||||||
|
<!--[e.g. Chrome 83.0.4103.116, Firefox 77.0.1, Safari 13.1.1]"-->
|
||||||
|
|
||||||
<!-- prettier-ignore-start -->
|
<!-- prettier-ignore-start -->
|
||||||
[blog]: https://circleci.com/blog/triggering-trusted-ci-jobs-on-untrusted-forks/
|
[blog]: https://circleci.com/blog/triggering-trusted-ci-jobs-on-untrusted-forks/
|
||||||
|
|||||||
+3
-9
@@ -4,23 +4,17 @@
|
|||||||
# Number of days of inactivity before an issue becomes stale
|
# Number of days of inactivity before an issue becomes stale
|
||||||
daysUntilStale: 180
|
daysUntilStale: 180
|
||||||
# Number of days of inactivity before a stale issue is closed
|
# Number of days of inactivity before a stale issue is closed
|
||||||
daysUntilClose: 9000
|
daysUntilClose: 60
|
||||||
# Issues with these labels will never be considered stale
|
# Issues with these labels will never be considered stale
|
||||||
exemptLabels:
|
exemptLabels:
|
||||||
- 'Story :raised_hands:'
|
|
||||||
- 'Bug: Verified :bug:'
|
- 'Bug: Verified :bug:'
|
||||||
- 'Task: CI/Tooling :robot:'
|
|
||||||
- 'Task: Docs 📖'
|
|
||||||
- 'Task: Docs :book:'
|
|
||||||
- 'Task: Refactor :hammer_and_wrench:'
|
|
||||||
- 'Task: Tests :microscope:'
|
|
||||||
- 'PR: Awaiting Review 👀'
|
- 'PR: Awaiting Review 👀'
|
||||||
- 'Triage :white_flag:'
|
|
||||||
- 'Extension: Discussion'
|
|
||||||
- 'Announcement 🎉'
|
- 'Announcement 🎉'
|
||||||
- 'IDC:priority'
|
- 'IDC:priority'
|
||||||
- 'IDC:candidate'
|
- 'IDC:candidate'
|
||||||
- 'IDC:collaboration'
|
- 'IDC:collaboration'
|
||||||
|
- 'Community: Request :hand:'
|
||||||
|
- 'Community: Report :bug:'
|
||||||
# Label to use when marking an issue as stale
|
# Label to use when marking an issue as stale
|
||||||
staleLabel: 'Stale :baguette_bread:'
|
staleLabel: 'Stale :baguette_bread:'
|
||||||
# Comment to post when marking an issue as stale. Set to `false` to disable
|
# Comment to post when marking an issue as stale. Set to `false` to disable
|
||||||
|
|||||||
@@ -3,6 +3,38 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [2.12.16](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.15...@ohif/extension-cornerstone@2.12.16) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-cornerstone
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.12.15](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.14...@ohif/extension-cornerstone@2.12.15) (2022-09-20)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-cornerstone
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.12.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.13...@ohif/extension-cornerstone@2.12.14) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-cornerstone
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.12.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.12...@ohif/extension-cornerstone@2.12.13) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-cornerstone
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2.12.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.11...@ohif/extension-cornerstone@2.12.12) (2022-06-29)
|
## [2.12.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.11...@ohif/extension-cornerstone@2.12.12) (2022-06-29)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-cornerstone
|
**Note:** Version bump only for package @ohif/extension-cornerstone
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-cornerstone",
|
"name": "@ohif/extension-cornerstone",
|
||||||
"version": "2.12.12",
|
"version": "2.12.16",
|
||||||
"description": "OHIF extension for Cornerstone",
|
"description": "OHIF extension for Cornerstone",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -35,8 +35,8 @@
|
|||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-math": "^0.1.9",
|
"cornerstone-math": "^0.1.9",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"cornerstone-wado-image-loader": "^4.1.0",
|
"cornerstone-wado-image-loader": "^4.2.1",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"dicom-parser": "^1.8.11",
|
"dicom-parser": "^1.8.11",
|
||||||
"hammerjs": "^2.0.8",
|
"hammerjs": "^2.0.8",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class OHIFCornerstoneViewportOverlay extends PureComponent {
|
|||||||
imageId: PropTypes.string.isRequired,
|
imageId: PropTypes.string.isRequired,
|
||||||
imageIndex: PropTypes.number.isRequired,
|
imageIndex: PropTypes.number.isRequired,
|
||||||
stackSize: PropTypes.number.isRequired,
|
stackSize: PropTypes.number.isRequired,
|
||||||
inconsistencyWarnings: PropTypes.array.isRequired,
|
inconsistencyWarnings: PropTypes.array,
|
||||||
SRLabels: PropTypes.array,
|
SRLabels: PropTypes.array,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [0.3.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.3.2...@ohif/extension-debugging@0.3.3) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-debugging
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.3.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.3.1...@ohif/extension-debugging@0.3.2) (2022-03-10)
|
## [0.3.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.3.1...@ohif/extension-debugging@0.3.2) (2022-03-10)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-debugging
|
**Note:** Version bump only for package @ohif/extension-debugging
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-debugging",
|
"name": "@ohif/extension-debugging",
|
||||||
"version": "0.3.2",
|
"version": "0.3.3",
|
||||||
"description": "OHIF extension for debugging.",
|
"description": "OHIF extension for debugging.",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
@@ -89,10 +89,10 @@ const DubugReportModal = ({
|
|||||||
|
|
||||||
Object.keys(viewportSpecificData).forEach(viewportIndex => {
|
Object.keys(viewportSpecificData).forEach(viewportIndex => {
|
||||||
const displaySet = viewportSpecificData[viewportIndex];
|
const displaySet = viewportSpecificData[viewportIndex];
|
||||||
const [
|
const [referencedDisplaySetsRef] = _getReferencedSeriesInstanceUIDsString(
|
||||||
referencedDisplaySetsRef,
|
displaySet,
|
||||||
referencedDisplaySetsCount,
|
'SEG'
|
||||||
] = _getReferencedSeriesInstanceUIDsString(displaySet, 'SEG');
|
);
|
||||||
|
|
||||||
const [row, column] = _viewportIndexToViewportPosition(
|
const [row, column] = _viewportIndexToViewportPosition(
|
||||||
viewportIndex,
|
viewportIndex,
|
||||||
@@ -106,10 +106,27 @@ const DubugReportModal = ({
|
|||||||
|
|
||||||
Object.keys(viewportSpecificData).forEach(viewportIndex => {
|
Object.keys(viewportSpecificData).forEach(viewportIndex => {
|
||||||
const displaySet = viewportSpecificData[viewportIndex];
|
const displaySet = viewportSpecificData[viewportIndex];
|
||||||
const [
|
const [referencedDisplaySetsRef] = _getReferencedSeriesInstanceUIDsString(
|
||||||
referencedDisplaySetsRef,
|
displaySet,
|
||||||
referencedDisplaySetsCount,
|
'RTSTRUCT'
|
||||||
] = _getReferencedSeriesInstanceUIDsString(displaySet, 'RTSTRUCT');
|
);
|
||||||
|
|
||||||
|
const [row, column] = _viewportIndexToViewportPosition(
|
||||||
|
viewportIndex,
|
||||||
|
numColumns
|
||||||
|
);
|
||||||
|
|
||||||
|
body += `[${row},${column}]\t${referencedDisplaySetsRef}\n`;
|
||||||
|
});
|
||||||
|
|
||||||
|
body += '== ReferencedSRSeriesInstanceUIDs ==\n';
|
||||||
|
|
||||||
|
Object.keys(viewportSpecificData).forEach(viewportIndex => {
|
||||||
|
const displaySet = viewportSpecificData[viewportIndex];
|
||||||
|
const [referencedDisplaySetsRef] = _getReferencedSeriesInstanceUIDsString(
|
||||||
|
displaySet,
|
||||||
|
'SR'
|
||||||
|
);
|
||||||
|
|
||||||
const [row, column] = _viewportIndexToViewportPosition(
|
const [row, column] = _viewportIndexToViewportPosition(
|
||||||
viewportIndex,
|
viewportIndex,
|
||||||
@@ -261,11 +278,15 @@ const getLayout = viewports => {
|
|||||||
<tr>
|
<tr>
|
||||||
<th>ReferencedSEGSeriesInstanceUIDs</th>
|
<th>ReferencedSEGSeriesInstanceUIDs</th>
|
||||||
</tr>
|
</tr>
|
||||||
{getReferencedSEGSeriesInstanceUIDsPerRow(viewports)}
|
{getReferencedSeriesInstanceUIDsPerRow(viewports, 'SEG')}
|
||||||
<tr>
|
<tr>
|
||||||
<th>ReferencedRTSTRUCTSeriesInstanceUIDs</th>
|
<th>ReferencedRTSTRUCTSeriesInstanceUIDs</th>
|
||||||
</tr>
|
</tr>
|
||||||
{getReferencedRTSTRUCTSeriesInstanceUIDsPerRow(viewports)}
|
{getReferencedSeriesInstanceUIDsPerRow(viewports, 'RTSTRUCT')}
|
||||||
|
<tr>
|
||||||
|
<th>ReferencedSRSeriesInstanceUIDs</th>
|
||||||
|
</tr>
|
||||||
|
{getReferencedSeriesInstanceUIDsPerRow(viewports, 'SR')}
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -351,7 +372,7 @@ const _getReferencedSeriesInstanceUIDsString = (displaySet, Modality) => {
|
|||||||
return [referencedDisplaySetsRef, referencedDisplaySetsCount];
|
return [referencedDisplaySetsRef, referencedDisplaySetsCount];
|
||||||
};
|
};
|
||||||
|
|
||||||
const getReferencedSEGSeriesInstanceUIDsPerRow = viewports => {
|
const getReferencedSeriesInstanceUIDsPerRow = (viewports, Modality) => {
|
||||||
const { viewportSpecificData, numColumns } = viewports;
|
const { viewportSpecificData, numColumns } = viewports;
|
||||||
|
|
||||||
// NOTE viewportSpecificData is actually an object with numerical keys.
|
// NOTE viewportSpecificData is actually an object with numerical keys.
|
||||||
@@ -360,43 +381,7 @@ const getReferencedSEGSeriesInstanceUIDsPerRow = viewports => {
|
|||||||
const [
|
const [
|
||||||
referencedDisplaySetsRef,
|
referencedDisplaySetsRef,
|
||||||
referencedDisplaySetsCount,
|
referencedDisplaySetsCount,
|
||||||
] = _getReferencedSeriesInstanceUIDsString(displaySet, 'SEG');
|
] = _getReferencedSeriesInstanceUIDsString(displaySet, Modality);
|
||||||
|
|
||||||
const [row, column] = _viewportIndexToViewportPosition(
|
|
||||||
viewportIndex,
|
|
||||||
numColumns
|
|
||||||
);
|
|
||||||
|
|
||||||
if (referencedDisplaySetsCount > 1) {
|
|
||||||
return (
|
|
||||||
<tr>
|
|
||||||
<td>{`[${row},${column}]`}</td>
|
|
||||||
<td className="debug-overflowText-border">
|
|
||||||
{referencedDisplaySetsRef}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return (
|
|
||||||
<tr>
|
|
||||||
<td>{`[${row},${column}]`}</td>
|
|
||||||
<td className="debug-overflowText">{referencedDisplaySetsRef}</td>
|
|
||||||
</tr>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const getReferencedRTSTRUCTSeriesInstanceUIDsPerRow = viewports => {
|
|
||||||
const { viewportSpecificData, numColumns } = viewports;
|
|
||||||
|
|
||||||
// NOTE viewportSpecificData is actually an object with numerical keys.
|
|
||||||
return Object.keys(viewportSpecificData).map(viewportIndex => {
|
|
||||||
const displaySet = viewportSpecificData[viewportIndex];
|
|
||||||
const [
|
|
||||||
referencedDisplaySetsRef,
|
|
||||||
referencedDisplaySetsCount,
|
|
||||||
] = _getReferencedSeriesInstanceUIDsString(displaySet, 'RTSTRUCT');
|
|
||||||
|
|
||||||
const [row, column] = _viewportIndexToViewportPosition(
|
const [row, column] = _viewportIndexToViewportPosition(
|
||||||
viewportIndex,
|
viewportIndex,
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.3.24](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.23...@ohif/extension-dicom-html@1.3.24) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-html
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.23](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.22...@ohif/extension-dicom-html@1.3.23) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-html
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.22](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.21...@ohif/extension-dicom-html@1.3.22) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-html
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [1.3.21](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.20...@ohif/extension-dicom-html@1.3.21) (2022-04-05)
|
## [1.3.21](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.20...@ohif/extension-dicom-html@1.3.21) (2022-04-05)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-dicom-html
|
**Note:** Version bump only for package @ohif/extension-dicom-html
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-dicom-html",
|
"name": "@ohif/extension-dicom-html",
|
||||||
"version": "1.3.21",
|
"version": "1.3.24",
|
||||||
"description": "OHIF extension for rendering structured reports to HTML",
|
"description": "OHIF extension for rendering structured reports to HTML",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@ohif/core": "^0.50.0",
|
"@ohif/core": "^0.50.0",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"react": "^16.8.6",
|
"react": "^16.8.6",
|
||||||
"react-dom": "^16.8.6"
|
"react-dom": "^16.8.6"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { MODULE_TYPES, utils } from '@ohif/core';
|
import { MODULE_TYPES, utils, metadata } from '@ohif/core';
|
||||||
|
|
||||||
// TODO: Should probably use dcmjs for this
|
// TODO: Should probably use dcmjs for this
|
||||||
const SOP_CLASS_UIDS = {
|
const SOP_CLASS_UIDS = {
|
||||||
@@ -10,7 +10,7 @@ const SOP_CLASS_UIDS = {
|
|||||||
MAMMOGRAPHY_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.50',
|
MAMMOGRAPHY_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.50',
|
||||||
CHEST_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.65',
|
CHEST_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.65',
|
||||||
X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67',
|
X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67',
|
||||||
ACQUISITION_CONTEXT_SR_STORAGE: '1.2.840.10008.5.1.4.1.1.88.71'
|
ACQUISITION_CONTEXT_SR_STORAGE: '1.2.840.10008.5.1.4.1.1.88.71',
|
||||||
};
|
};
|
||||||
|
|
||||||
const sopClassUIDs = Object.values(SOP_CLASS_UIDS);
|
const sopClassUIDs = Object.values(SOP_CLASS_UIDS);
|
||||||
@@ -32,7 +32,7 @@ const OHIFDicomHtmlSopClassHandler = {
|
|||||||
SeriesTime,
|
SeriesTime,
|
||||||
} = metadata;
|
} = metadata;
|
||||||
|
|
||||||
return {
|
const srDisplaySet = {
|
||||||
plugin: 'html',
|
plugin: 'html',
|
||||||
Modality: 'SR',
|
Modality: 'SR',
|
||||||
displaySetInstanceUID: utils.guid(),
|
displaySetInstanceUID: utils.guid(),
|
||||||
@@ -49,7 +49,15 @@ const OHIFDicomHtmlSopClassHandler = {
|
|||||||
authorizationHeaders,
|
authorizationHeaders,
|
||||||
sopClassUids: sopClassUIDs,
|
sopClassUids: sopClassUIDs,
|
||||||
images: series._instances,
|
images: series._instances,
|
||||||
|
isDerived: true,
|
||||||
|
referencedDisplaySets: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
srDisplaySet.getSourceDisplaySet = function() {
|
||||||
|
return srDisplaySet.referencedDisplaySets;
|
||||||
|
};
|
||||||
|
|
||||||
|
return srDisplaySet;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,30 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [0.7.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.13...@ohif/extension-dicom-rt@0.7.14) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-rt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.12...@ohif/extension-dicom-rt@0.7.13) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-rt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.11...@ohif/extension-dicom-rt@0.7.12) (2022-08-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-rt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.7.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.10...@ohif/extension-dicom-rt@0.7.11) (2022-04-05)
|
## [0.7.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.10...@ohif/extension-dicom-rt@0.7.11) (2022-04-05)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-dicom-rt
|
**Note:** Version bump only for package @ohif/extension-dicom-rt
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-dicom-rt",
|
"name": "@ohif/extension-dicom-rt",
|
||||||
"version": "0.7.11",
|
"version": "0.7.14",
|
||||||
"description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
|
"description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
"@ohif/core": "^0.50.0",
|
"@ohif/core": "^0.50.0",
|
||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"gl-matrix": "^3.3.0",
|
"gl-matrix": "^3.3.0",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"react": "^16.8.6",
|
"react": "^16.8.6",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState, useEffect, useCallback } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import cornerstoneTools from 'cornerstone-tools';
|
import cornerstoneTools from 'cornerstone-tools';
|
||||||
import cornerstone from 'cornerstone-core';
|
import cornerstone from 'cornerstone-core';
|
||||||
|
|||||||
@@ -3,6 +3,92 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [0.7.21](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.20...@ohif/extension-dicom-segmentation@0.7.21) (2023-01-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.20](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.19...@ohif/extension-dicom-segmentation@0.7.20) (2023-01-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.19](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.18...@ohif/extension-dicom-segmentation@0.7.19) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.18](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.17...@ohif/extension-dicom-segmentation@0.7.18) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.17](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.16...@ohif/extension-dicom-segmentation@0.7.17) (2022-12-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Reword message for segmentation error loading due to orientation tolerance ([#3017](https://github.com/OHIF/Viewers/issues/3017)) ([597ac11](https://github.com/OHIF/Viewers/commit/597ac11c4daee1b1e14148804551e20611cfef08))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.16](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.15...@ohif/extension-dicom-segmentation@0.7.16) (2022-10-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Update message for segmentation error loading due to orientation tolerance ([#2982](https://github.com/OHIF/Viewers/issues/2982)) ([545161d](https://github.com/OHIF/Viewers/commit/545161d5e8d92bb6652f17dc24a36dac8aa7b3a4))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.15](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.14...@ohif/extension-dicom-segmentation@0.7.15) (2022-09-19)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.13...@ohif/extension-dicom-segmentation@0.7.14) (2022-09-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.12...@ohif/extension-dicom-segmentation@0.7.13) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.11...@ohif/extension-dicom-segmentation@0.7.12) (2022-08-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.7.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.10...@ohif/extension-dicom-segmentation@0.7.11) (2022-04-05)
|
## [0.7.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.10...@ohif/extension-dicom-segmentation@0.7.11) (2022-04-05)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
**Note:** Version bump only for package @ohif/extension-dicom-segmentation
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-dicom-segmentation",
|
"name": "@ohif/extension-dicom-segmentation",
|
||||||
"version": "0.7.11",
|
"version": "0.7.21",
|
||||||
"description": "OHIF extension for viewing segmentations in the 2D MPR view",
|
"description": "OHIF extension for viewing segmentations in the 2D MPR view",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
"@ohif/core": "^0.50.0",
|
"@ohif/core": "^0.50.0",
|
||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"react": "^16.8.6",
|
"react": "^16.8.6",
|
||||||
"react-dom": "^16.8.6"
|
"react-dom": "^16.8.6"
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
import csTools from 'cornerstone-tools';
|
||||||
|
import cs from 'cornerstone-core';
|
||||||
|
import OHIF from '@ohif/core';
|
||||||
|
|
||||||
|
import DICOMSegTempCrosshairsTool from './tools/DICOMSegTempCrosshairsTool';
|
||||||
|
import refreshViewports from './utils/refreshViewports';
|
||||||
|
|
||||||
|
const { studyMetadataManager } = OHIF.utils;
|
||||||
|
|
||||||
|
const commandsModule = ({ commandsManager }) => {
|
||||||
|
const actions = {
|
||||||
|
jumpToFirstSegment: ({ viewports }) => {
|
||||||
|
try {
|
||||||
|
const { activeViewportIndex, viewportSpecificData } = viewports;
|
||||||
|
const viewport = viewportSpecificData[activeViewportIndex];
|
||||||
|
const { StudyInstanceUID, displaySetInstanceUID } = viewport;
|
||||||
|
const studyMetadata = studyMetadataManager.get(StudyInstanceUID);
|
||||||
|
const firstImageId = studyMetadata.getFirstImageId(
|
||||||
|
displaySetInstanceUID
|
||||||
|
);
|
||||||
|
|
||||||
|
const module = csTools.getModule('segmentation');
|
||||||
|
const brushStackState = module.state.series[firstImageId];
|
||||||
|
const { labelmaps3D, activeLabelmapIndex } = brushStackState;
|
||||||
|
const { labelmaps2D } = labelmaps3D[activeLabelmapIndex];
|
||||||
|
|
||||||
|
const firstLabelMap2D = labelmaps2D.find(value => !!value);
|
||||||
|
const firstSegment = firstLabelMap2D.segmentsOnLabelmap[0];
|
||||||
|
const segmentNumber = firstSegment;
|
||||||
|
|
||||||
|
const validIndexList = [];
|
||||||
|
labelmaps2D.forEach((labelMap2D, index) => {
|
||||||
|
if (labelMap2D.segmentsOnLabelmap.includes(segmentNumber)) {
|
||||||
|
validIndexList.push(index);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const avg = array => array.reduce((a, b) => a + b) / array.length;
|
||||||
|
const average = avg(validIndexList);
|
||||||
|
const closest = validIndexList.reduce((prev, curr) => {
|
||||||
|
return Math.abs(curr - average) < Math.abs(prev - average)
|
||||||
|
? curr
|
||||||
|
: prev;
|
||||||
|
});
|
||||||
|
|
||||||
|
const enabledElements = cs.getEnabledElements();
|
||||||
|
const element = enabledElements[activeViewportIndex].element;
|
||||||
|
|
||||||
|
const toolState = csTools.getToolState(element, 'stack');
|
||||||
|
if (!toolState) return;
|
||||||
|
|
||||||
|
const imageIds = toolState.data[0].imageIds;
|
||||||
|
const imageId = imageIds[closest];
|
||||||
|
const frameIndex = imageIds.indexOf(imageId);
|
||||||
|
const SOPInstanceUID = cs.metaData.get('SOPInstanceUID', imageId);
|
||||||
|
|
||||||
|
cs.getEnabledElements().forEach(enabledElement => {
|
||||||
|
cs.updateImage(enabledElement.element);
|
||||||
|
});
|
||||||
|
|
||||||
|
DICOMSegTempCrosshairsTool.addCrosshair(
|
||||||
|
element,
|
||||||
|
imageId,
|
||||||
|
segmentNumber
|
||||||
|
);
|
||||||
|
|
||||||
|
cs.getEnabledElements().forEach(enabledElement => {
|
||||||
|
cs.updateImage(enabledElement.element);
|
||||||
|
});
|
||||||
|
|
||||||
|
const refreshViewports = false;
|
||||||
|
|
||||||
|
commandsManager.runCommand('jumpToImage', {
|
||||||
|
StudyInstanceUID,
|
||||||
|
SOPInstanceUID,
|
||||||
|
frameIndex,
|
||||||
|
activeViewportIndex,
|
||||||
|
refreshViewports,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.log('Error in moving to the first segment slice');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const definitions = {
|
||||||
|
jumpToFirstSegment: {
|
||||||
|
commandFn: actions.jumpToFirstSegment,
|
||||||
|
storeContexts: ['viewports'],
|
||||||
|
options: {},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
definitions,
|
||||||
|
defaultContext: 'VIEWER',
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default commandsModule;
|
||||||
@@ -62,8 +62,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.dcmseg-segment-item .segment-label span {
|
.dcmseg-segment-item .segment-label span {
|
||||||
overflow-wrap: normal;
|
overflow-wrap: break-word;
|
||||||
white-space: nowrap;
|
white-space: normal;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
max-width: calc(100% - 40px); /* calc(100% - 50px); 20px = eye icon */
|
max-width: calc(100% - 40px); /* calc(100% - 50px); 20px = eye icon */
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
@@ -71,6 +71,7 @@
|
|||||||
|
|
||||||
.dcmseg-segment-item .segment-label .eye-icon {
|
.dcmseg-segment-item .segment-label .eye-icon {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
min-width: 20px;
|
||||||
color: var(--active-color);
|
color: var(--active-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+31
-15
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect, useCallback } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import cornerstoneTools from 'cornerstone-tools';
|
import cornerstoneTools from 'cornerstone-tools';
|
||||||
import cornerstone from 'cornerstone-core';
|
import cornerstone from 'cornerstone-core';
|
||||||
@@ -36,6 +36,7 @@ const { studyMetadataManager } = utils;
|
|||||||
* @param {Function} props.onConfigurationChange - Configuration change handler
|
* @param {Function} props.onConfigurationChange - Configuration change handler
|
||||||
* @param {Function} props.activeContexts - List of active application contexts
|
* @param {Function} props.activeContexts - List of active application contexts
|
||||||
* @param {Function} props.contexts - List of available application contexts
|
* @param {Function} props.contexts - List of available application contexts
|
||||||
|
* @param {Function} props.servicesManager - Services manager
|
||||||
* @returns component
|
* @returns component
|
||||||
*/
|
*/
|
||||||
const SegmentationPanel = ({
|
const SegmentationPanel = ({
|
||||||
@@ -50,6 +51,7 @@ const SegmentationPanel = ({
|
|||||||
onSelectedSegmentationChange,
|
onSelectedSegmentationChange,
|
||||||
activeContexts = [],
|
activeContexts = [],
|
||||||
contexts = {},
|
contexts = {},
|
||||||
|
servicesManager,
|
||||||
}) => {
|
}) => {
|
||||||
const isVTK = () => activeContexts.includes(contexts.VTK);
|
const isVTK = () => activeContexts.includes(contexts.VTK);
|
||||||
const isCornerstone = () => activeContexts.includes(contexts.CORNERSTONE);
|
const isCornerstone = () => activeContexts.includes(contexts.CORNERSTONE);
|
||||||
@@ -59,6 +61,9 @@ const SegmentationPanel = ({
|
|||||||
* store with context to make these kind of things less blurry.
|
* store with context to make these kind of things less blurry.
|
||||||
*/
|
*/
|
||||||
const { configuration } = cornerstoneTools.getModule('segmentation');
|
const { configuration } = cornerstoneTools.getModule('segmentation');
|
||||||
|
if (configuration.segsTolerance === undefined) {
|
||||||
|
configuration.segsTolerance = 1e-2;
|
||||||
|
}
|
||||||
const DEFAULT_BRUSH_RADIUS = configuration.radius || 10;
|
const DEFAULT_BRUSH_RADIUS = configuration.radius || 10;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -87,6 +92,25 @@ const SegmentationPanel = ({
|
|||||||
return studyMetadata.getFirstImageId(displaySetInstanceUID);
|
return studyMetadata.getFirstImageId(displaySetInstanceUID);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getAllSegDisplaySets = () => {
|
||||||
|
const { StudyInstanceUID } = getActiveViewport();
|
||||||
|
const studyMetadata = studyMetadataManager.get(StudyInstanceUID);
|
||||||
|
return studyMetadata.getDerivedDatasets({
|
||||||
|
Modality: 'SEG',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateSegDisplaySetsTolerance = tolerance => {
|
||||||
|
const segDisplaySets = getAllSegDisplaySets();
|
||||||
|
segDisplaySets.forEach(segDisplaySet => {
|
||||||
|
// update tol value
|
||||||
|
segDisplaySet.tolerance = tolerance;
|
||||||
|
// reset load flags for allowing retry for seg parsing.
|
||||||
|
segDisplaySet.isLoaded = false;
|
||||||
|
segDisplaySet.loadError = false;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const getActiveLabelMaps3D = () => {
|
const getActiveLabelMaps3D = () => {
|
||||||
const { labelmaps3D, activeLabelmapIndex } = getBrushStackState();
|
const { labelmaps3D, activeLabelmapIndex } = getBrushStackState();
|
||||||
return labelmaps3D[activeLabelmapIndex];
|
return labelmaps3D[activeLabelmapIndex];
|
||||||
@@ -224,10 +248,7 @@ const SegmentationPanel = ({
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}, [
|
}, [activeIndex, viewports]);
|
||||||
activeIndex,
|
|
||||||
viewports,
|
|
||||||
]);
|
|
||||||
|
|
||||||
const updateSegmentationComboBox = e => {
|
const updateSegmentationComboBox = e => {
|
||||||
const index = e.detail.activatedLabelmapIndex;
|
const index = e.detail.activatedLabelmapIndex;
|
||||||
@@ -601,32 +622,26 @@ const SegmentationPanel = ({
|
|||||||
configuration.outlineWidth = newConfiguration.outlineWidth;
|
configuration.outlineWidth = newConfiguration.outlineWidth;
|
||||||
configuration.fillAlphaInactive = newConfiguration.fillAlphaInactive;
|
configuration.fillAlphaInactive = newConfiguration.fillAlphaInactive;
|
||||||
configuration.outlineAlphaInactive = newConfiguration.outlineAlphaInactive;
|
configuration.outlineAlphaInactive = newConfiguration.outlineAlphaInactive;
|
||||||
|
configuration.segsTolerance = newConfiguration.segsTolerance;
|
||||||
onConfigurationChange(newConfiguration);
|
onConfigurationChange(newConfiguration);
|
||||||
|
updateSegDisplaySetsTolerance(configuration.segsTolerance);
|
||||||
refreshViewports();
|
refreshViewports();
|
||||||
};
|
};
|
||||||
|
|
||||||
const onVisibilityChangeHandler = isVisible => {
|
const onVisibilityChangeHandler = isVisible => {
|
||||||
let segmentsHidden = [];
|
let segmentsHidden = [];
|
||||||
|
const labelmap3D = getActiveLabelMaps3D();
|
||||||
|
|
||||||
state.segmentNumbers.forEach(segmentNumber => {
|
state.segmentNumbers.forEach(segmentNumber => {
|
||||||
if (isVTK()) {
|
if (isVTK()) {
|
||||||
onSegmentVisibilityChange(segmentNumber, isVisible);
|
onSegmentVisibilityChange(segmentNumber, isVisible);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get all labelmaps with this segmentNumber (overlapping segments) */
|
|
||||||
const { labelmaps3D } = getBrushStackState();
|
|
||||||
const possibleLabelMaps3D = labelmaps3D.filter(({ labelmaps2D }) => {
|
|
||||||
return labelmaps2D.some(({ segmentsOnLabelmap }) =>
|
|
||||||
segmentsOnLabelmap.includes(segmentNumber)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
possibleLabelMaps3D.forEach(labelmap3D => {
|
|
||||||
labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
|
labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
|
||||||
segmentsHidden = [
|
segmentsHidden = [
|
||||||
...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
|
...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
setState(state => ({ ...state, segmentsHidden }));
|
setState(state => ({ ...state, segmentsHidden }));
|
||||||
|
|
||||||
@@ -650,6 +665,7 @@ const SegmentationPanel = ({
|
|||||||
configuration={configuration}
|
configuration={configuration}
|
||||||
onBack={() => setState(state => ({ ...state, showSettings: false }))}
|
onBack={() => setState(state => ({ ...state, showSettings: false }))}
|
||||||
onChange={updateConfiguration}
|
onChange={updateConfiguration}
|
||||||
|
servicesManager={servicesManager}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+59
-6
@@ -4,7 +4,7 @@ import { Range } from '@ohif/ui';
|
|||||||
|
|
||||||
import './SegmentationSettings.css';
|
import './SegmentationSettings.css';
|
||||||
|
|
||||||
const SegmentationSettings = ({ configuration, onBack, onChange, disabledFields = [] }) => {
|
const SegmentationSettings = ({ configuration, onBack, onChange, servicesManager, disabledFields = [] }) => {
|
||||||
const [state, setState] = useState({
|
const [state, setState] = useState({
|
||||||
renderFill: configuration.renderFill,
|
renderFill: configuration.renderFill,
|
||||||
renderOutline: configuration.renderOutline,
|
renderOutline: configuration.renderOutline,
|
||||||
@@ -13,7 +13,8 @@ const SegmentationSettings = ({ configuration, onBack, onChange, disabledFields
|
|||||||
outlineAlpha: configuration.outlineAlpha,
|
outlineAlpha: configuration.outlineAlpha,
|
||||||
outlineWidth: configuration.outlineWidth,
|
outlineWidth: configuration.outlineWidth,
|
||||||
fillAlphaInactive: configuration.fillAlphaInactive,
|
fillAlphaInactive: configuration.fillAlphaInactive,
|
||||||
outlineAlphaInactive: configuration.outlineAlphaInactive
|
outlineAlphaInactive: configuration.outlineAlphaInactive,
|
||||||
|
segsTolerance: configuration.segsTolerance,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -28,6 +29,32 @@ const SegmentationSettings = ({ configuration, onBack, onChange, disabledFields
|
|||||||
setState(state => ({ ...state, [field]: value }));
|
setState(state => ({ ...state, [field]: value }));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const once = fn => (...args) => {
|
||||||
|
if (!fn) return;
|
||||||
|
fn(...args);
|
||||||
|
fn = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const segTolValue = document.getElementById('segToleranceValue');
|
||||||
|
if (segTolValue) {
|
||||||
|
segTolValue.onchange = once(function() {
|
||||||
|
const { UINotificationService, LoggerService } = servicesManager.services;
|
||||||
|
|
||||||
|
const error = new Error(
|
||||||
|
'Segmentation loader tolerance changed.\
|
||||||
|
This operation can potentially generate errors in the Segmentation parsing.'
|
||||||
|
);
|
||||||
|
|
||||||
|
LoggerService.error({ error, message: error.message });
|
||||||
|
UINotificationService.show({
|
||||||
|
title: 'Segmentation panel',
|
||||||
|
message: error.message,
|
||||||
|
type: 'warning',
|
||||||
|
autoClose: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const toFloat = value => parseFloat(value / 100).toFixed(2);
|
const toFloat = value => parseFloat(value / 100).toFixed(2);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -133,6 +160,31 @@ const SegmentationSettings = ({ configuration, onBack, onChange, disabledFields
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
<div className="settings-group" style={{ marginBottom: 15 }}>
|
||||||
|
<label style={{ margin: '0 15px' }}>
|
||||||
|
Tolerance:
|
||||||
|
<input
|
||||||
|
id="segToleranceValue"
|
||||||
|
style={{ margin: '0 15px' }}
|
||||||
|
label="Tolerance"
|
||||||
|
onKeyPress={event => {
|
||||||
|
const validate = string => {
|
||||||
|
let rgx = /[^-.e0-9]+/g;
|
||||||
|
return string.match(rgx);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (validate(event.key)) {
|
||||||
|
event.preventDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
onChange={event => {
|
||||||
|
save('segsTolerance', event.target.value);
|
||||||
|
}}
|
||||||
|
value={state.segsTolerance}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -169,11 +221,12 @@ SegmentationSettings.propTypes = {
|
|||||||
renderFill: PropTypes.bool.isRequired,
|
renderFill: PropTypes.bool.isRequired,
|
||||||
renderOutline: PropTypes.bool.isRequired,
|
renderOutline: PropTypes.bool.isRequired,
|
||||||
shouldRenderInactiveLabelmaps: PropTypes.bool.isRequired,
|
shouldRenderInactiveLabelmaps: PropTypes.bool.isRequired,
|
||||||
fillAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired, /* TODO: why fillAlpha is string? */
|
fillAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
outlineAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired, /* TODO: why fillAlpha is string? */
|
outlineAlpha: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
outlineWidth: PropTypes.number.isRequired,
|
outlineWidth: PropTypes.number.isRequired,
|
||||||
fillAlphaInactive: PropTypes.number.isRequired,
|
fillAlphaInactive: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
outlineAlphaInactive: PropTypes.number.isRequired,
|
outlineAlphaInactive: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
|
segsTolerance: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
}).isRequired,
|
}).isRequired,
|
||||||
onBack: PropTypes.func.isRequired,
|
onBack: PropTypes.func.isRequired,
|
||||||
onChange: PropTypes.func.isRequired,
|
onChange: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
|||||||
SeriesNumber,
|
SeriesNumber,
|
||||||
SeriesDescription,
|
SeriesDescription,
|
||||||
metadata,
|
metadata,
|
||||||
|
tolerance: 1e-2,
|
||||||
};
|
};
|
||||||
|
|
||||||
segDisplaySet.getSourceDisplaySet = function(
|
segDisplaySet.getSourceDisplaySet = function(
|
||||||
@@ -93,7 +94,7 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
|||||||
referencedDisplaySet.SeriesInstanceUID
|
referencedDisplaySet.SeriesInstanceUID
|
||||||
);
|
);
|
||||||
|
|
||||||
const results = await _parseSeg(segArrayBuffer, imageIds);
|
const results = await _parseSeg(segArrayBuffer, imageIds, segDisplaySet.tolerance);
|
||||||
if (results === undefined) {
|
if (results === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -149,10 +150,13 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function _parseSeg(arrayBuffer, imageIds) {
|
function _parseSeg(
|
||||||
const skipOverlapping = false;
|
arrayBuffer,
|
||||||
const tolerance = 1e-2;
|
imageIds,
|
||||||
const cornerstoneToolsVersion = 4;
|
tolerance = 1e-2,
|
||||||
|
skipOverlapping = false,
|
||||||
|
cornerstoneToolsVersion = 4
|
||||||
|
) {
|
||||||
return dcmjs.adapters.Cornerstone.Segmentation.generateToolState(
|
return dcmjs.adapters.Cornerstone.Segmentation.generateToolState(
|
||||||
imageIds,
|
imageIds,
|
||||||
arrayBuffer,
|
arrayBuffer,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import toolbarModule from './toolbarModule.js';
|
|||||||
import getSopClassHandlerModule from './getOHIFDicomSegSopClassHandler.js';
|
import getSopClassHandlerModule from './getOHIFDicomSegSopClassHandler.js';
|
||||||
import SegmentationPanel from './components/SegmentationPanel/SegmentationPanel.js';
|
import SegmentationPanel from './components/SegmentationPanel/SegmentationPanel.js';
|
||||||
import { version } from '../package.json';
|
import { version } from '../package.json';
|
||||||
|
import commandsModule from './commandsModule.js';
|
||||||
const { studyMetadataManager } = OHIF.utils;
|
const { studyMetadataManager } = OHIF.utils;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -32,12 +33,18 @@ export default {
|
|||||||
|
|
||||||
const ExtendedSegmentationPanel = props => {
|
const ExtendedSegmentationPanel = props => {
|
||||||
const { activeContexts } = api.hooks.useAppContext();
|
const { activeContexts } = api.hooks.useAppContext();
|
||||||
|
|
||||||
const onDisplaySetLoadFailureHandler = error => {
|
const onDisplaySetLoadFailureHandler = error => {
|
||||||
LoggerService.error({ error, message: error.message });
|
const message =
|
||||||
|
error.message.includes('orthogonal') ||
|
||||||
|
error.message.includes('oblique')
|
||||||
|
? 'The segmentation has been detected as non coplanar,\
|
||||||
|
If you really think it is coplanar,\
|
||||||
|
please adjust the tolerance in the segmentation panel settings (at your own peril!)'
|
||||||
|
: error.message;
|
||||||
|
LoggerService.error({ error, message });
|
||||||
UINotificationService.show({
|
UINotificationService.show({
|
||||||
title: 'DICOM Segmentation Loader',
|
title: 'DICOM Segmentation Loader',
|
||||||
message: error.message,
|
message,
|
||||||
type: 'error',
|
type: 'error',
|
||||||
autoClose: false,
|
autoClose: false,
|
||||||
});
|
});
|
||||||
@@ -78,6 +85,7 @@ export default {
|
|||||||
onConfigurationChange={onConfigurationChangeHandler}
|
onConfigurationChange={onConfigurationChangeHandler}
|
||||||
onSelectedSegmentationChange={onSelectedSegmentationChangeHandler}
|
onSelectedSegmentationChange={onSelectedSegmentationChangeHandler}
|
||||||
onDisplaySetLoadFailure={onDisplaySetLoadFailureHandler}
|
onDisplaySetLoadFailure={onDisplaySetLoadFailureHandler}
|
||||||
|
servicesManager={servicesManager}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -114,6 +122,15 @@ export default {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onSegmentationsCompletelyLoaded = () => {
|
||||||
|
commandsManager.runCommand('jumpToFirstSegment');
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener(
|
||||||
|
'segseriesselected',
|
||||||
|
onSegmentationsCompletelyLoaded
|
||||||
|
);
|
||||||
|
|
||||||
document.addEventListener(
|
document.addEventListener(
|
||||||
'extensiondicomsegmentationsegloaded',
|
'extensiondicomsegmentationsegloaded',
|
||||||
onSegmentationsLoaded
|
onSegmentationsLoaded
|
||||||
@@ -175,5 +192,8 @@ export default {
|
|||||||
defaultContext: ['VIEWER'],
|
defaultContext: ['VIEWER'],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
getCommandsModule({ commandsManager, servicesManager }) {
|
||||||
|
return commandsModule({ commandsManager, servicesManager });
|
||||||
|
},
|
||||||
getSopClassHandlerModule,
|
getSopClassHandlerModule,
|
||||||
};
|
};
|
||||||
@@ -3,6 +3,22 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [0.2.25](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.24...@ohif/extension-dicom-tag-browser@0.2.25) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.2.24](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.23...@ohif/extension-dicom-tag-browser@0.2.24) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.2.23](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.22...@ohif/extension-dicom-tag-browser@0.2.23) (2022-04-06)
|
## [0.2.23](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.22...@ohif/extension-dicom-tag-browser@0.2.23) (2022-04-06)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
|
**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-dicom-tag-browser",
|
"name": "@ohif/extension-dicom-tag-browser",
|
||||||
"version": "0.2.23",
|
"version": "0.2.25",
|
||||||
"description": "OHIF extension for checking DICOM headers.",
|
"description": "OHIF extension for checking DICOM headers.",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@ohif/core": "^2.6.0",
|
"@ohif/core": "^2.6.0",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"react": "^16.8.6"
|
"react": "^16.8.6"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -3,6 +3,126 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.12.41](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.40...@ohif/extension-vtk@1.12.41) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.40](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.39...@ohif/extension-vtk@1.12.40) (2022-12-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.39](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.38...@ohif/extension-vtk@1.12.39) (2022-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.38](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.37...@ohif/extension-vtk@1.12.38) (2022-11-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.37](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.36...@ohif/extension-vtk@1.12.37) (2022-10-28)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.36](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.35...@ohif/extension-vtk@1.12.36) (2022-10-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.35](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.34...@ohif/extension-vtk@1.12.35) (2022-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.34](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.33...@ohif/extension-vtk@1.12.34) (2022-09-20)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.33](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.32...@ohif/extension-vtk@1.12.33) (2022-09-19)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.32](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.31...@ohif/extension-vtk@1.12.32) (2022-09-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.31](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.30...@ohif/extension-vtk@1.12.31) (2022-09-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.30](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.29...@ohif/extension-vtk@1.12.30) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.29](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.28...@ohif/extension-vtk@1.12.29) (2022-08-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.28](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.27...@ohif/extension-vtk@1.12.28) (2022-08-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.12.27](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.26...@ohif/extension-vtk@1.12.27) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [1.12.26](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.25...@ohif/extension-vtk@1.12.26) (2022-06-29)
|
## [1.12.26](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.25...@ohif/extension-vtk@1.12.26) (2022-06-29)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/extension-vtk
|
**Note:** Version bump only for package @ohif/extension-vtk
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/extension-vtk",
|
"name": "@ohif/extension-vtk",
|
||||||
"version": "1.12.26",
|
"version": "1.12.41",
|
||||||
"description": "OHIF extension for VTK.js",
|
"description": "OHIF extension for VTK.js",
|
||||||
"author": "OHIF",
|
"author": "OHIF",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -34,8 +34,8 @@
|
|||||||
"@ohif/ui": "^0.50.0",
|
"@ohif/ui": "^0.50.0",
|
||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"cornerstone-wado-image-loader": "^4.1.0",
|
"cornerstone-wado-image-loader": "^4.2.1",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"dicom-parser": "^1.8.11",
|
"dicom-parser": "^1.8.11",
|
||||||
"i18next": "^17.0.3",
|
"i18next": "^17.0.3",
|
||||||
"i18next-browser-languagedetector": "^3.0.1",
|
"i18next-browser-languagedetector": "^3.0.1",
|
||||||
@@ -50,13 +50,13 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.5.5",
|
"@babel/runtime": "^7.5.5",
|
||||||
"lodash.throttle": "^4.1.1",
|
"lodash.throttle": "^4.1.1",
|
||||||
"react-vtkjs-viewport": "^0.14.4"
|
"react-vtkjs-viewport": "^0.14.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ohif/core": "^2.16.21",
|
"@ohif/core": "^2.16.35",
|
||||||
"@ohif/ui": "^1.10.9",
|
"@ohif/ui": "^1.10.10",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"cornerstone-wado-image-loader": "^4.1.0",
|
"cornerstone-wado-image-loader": "^4.2.1",
|
||||||
"dicom-parser": "^1.8.11",
|
"dicom-parser": "^1.8.11",
|
||||||
"gh-pages": "^2.0.1",
|
"gh-pages": "^2.0.1",
|
||||||
"i18next": "^17.0.3",
|
"i18next": "^17.0.3",
|
||||||
|
|||||||
@@ -3,6 +3,130 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [2.16.35](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.34...@ohif/core@2.16.35) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.34](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.33...@ohif/core@2.16.34) (2022-12-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Reword message for segmentation error loading due to orientation tolerance ([#3017](https://github.com/OHIF/Viewers/issues/3017)) ([597ac11](https://github.com/OHIF/Viewers/commit/597ac11c4daee1b1e14148804551e20611cfef08))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.33](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.32...@ohif/core@2.16.33) (2022-11-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* handle missing ReferencedInstanceSequence attribute ([#2786](https://github.com/OHIF/Viewers/issues/2786)) ([4473807](https://github.com/OHIF/Viewers/commit/44738078dbd8dc6b27d2d669e25417e37371f48d))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.32](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.31...@ohif/core@2.16.32) (2022-11-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.31](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.30...@ohif/core@2.16.31) (2022-10-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Update message for segmentation error loading due to orientation tolerance ([#2982](https://github.com/OHIF/Viewers/issues/2982)) ([545161d](https://github.com/OHIF/Viewers/commit/545161d5e8d92bb6652f17dc24a36dac8aa7b3a4))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.30](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.29...@ohif/core@2.16.30) (2022-10-25)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 2965 Correct Parsing Logic for Qualitative Instance Level SR ([#2972](https://github.com/OHIF/Viewers/issues/2972)) ([f7db74a](https://github.com/OHIF/Viewers/commit/f7db74a84376598065b6fa2c00cd5735415ff651))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.29](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.28...@ohif/core@2.16.29) (2022-09-20)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.28](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.27...@ohif/core@2.16.28) (2022-09-19)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.27](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.26...@ohif/core@2.16.27) (2022-09-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.26](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.25...@ohif/core@2.16.26) (2022-09-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.25](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.24...@ohif/core@2.16.25) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.24](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.23...@ohif/core@2.16.24) (2022-08-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.23](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.22...@ohif/core@2.16.23) (2022-08-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [2.16.22](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.21...@ohif/core@2.16.22) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [2.16.21](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.20...@ohif/core@2.16.21) (2022-06-29)
|
## [2.16.21](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.20...@ohif/core@2.16.21) (2022-06-29)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/core
|
**Note:** Version bump only for package @ohif/core
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/core",
|
"name": "@ohif/core",
|
||||||
"version": "2.16.21",
|
"version": "2.16.35",
|
||||||
"description": "Generic business logic for web-based medical imaging applications",
|
"description": "Generic business logic for web-based medical imaging applications",
|
||||||
"author": "OHIF Core Team",
|
"author": "OHIF Core Team",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -33,13 +33,13 @@
|
|||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"cornerstone-wado-image-loader": "^4.1.0",
|
"cornerstone-wado-image-loader": "^4.2.1",
|
||||||
"dicom-parser": "^1.8.11"
|
"dicom-parser": "^1.8.11"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.5.5",
|
"@babel/runtime": "^7.5.5",
|
||||||
"ajv": "^6.10.0",
|
"ajv": "^6.10.0",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"dicomweb-client": "^0.8.3",
|
"dicomweb-client": "^0.8.3",
|
||||||
"immer": "9.0.12",
|
"immer": "9.0.12",
|
||||||
"isomorphic-base64": "^1.0.2",
|
"isomorphic-base64": "^1.0.2",
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { ImageSet } from '../../classes';
|
import { ImageSet } from '../../classes';
|
||||||
import getMeasurements from './utils/getMeasurements';
|
import getMeasurements from './utils/getMeasurements';
|
||||||
import getReferencedImagesList from './utils/getReferencedImagesList';
|
|
||||||
import isRehydratable from './utils/isRehydratable';
|
import isRehydratable from './utils/isRehydratable';
|
||||||
import addMeasurement from './utils/addMeasurement';
|
import addMeasurement from './utils/addMeasurement';
|
||||||
|
|
||||||
@@ -8,6 +7,16 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
|
|||||||
const { MeasurementService } = servicesManager.services;
|
const { MeasurementService } = servicesManager.services;
|
||||||
|
|
||||||
const srDisplaySets = displaySets.filter(ds => ds.Modality === 'SR');
|
const srDisplaySets = displaySets.filter(ds => ds.Modality === 'SR');
|
||||||
|
const imageDisplaySets = displaySets.filter(
|
||||||
|
ds =>
|
||||||
|
ds.Modality !== 'SR' &&
|
||||||
|
ds.Modality !== 'SEG' &&
|
||||||
|
ds.Modality !== 'RTSTRUCT'
|
||||||
|
);
|
||||||
|
|
||||||
|
imageDisplaySets.forEach(imageDisplaySet => {
|
||||||
|
imageDisplaySet.SRLabels = [];
|
||||||
|
});
|
||||||
|
|
||||||
srDisplaySets.forEach(srDisplaySet => {
|
srDisplaySets.forEach(srDisplaySet => {
|
||||||
const firstInstance = srDisplaySet.metadata;
|
const firstInstance = srDisplaySet.metadata;
|
||||||
@@ -17,7 +26,6 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
|
|||||||
|
|
||||||
const { ContentSequence } = firstInstance;
|
const { ContentSequence } = firstInstance;
|
||||||
|
|
||||||
srDisplaySet.referencedImages = getReferencedImagesList(ContentSequence);
|
|
||||||
srDisplaySet.measurements = getMeasurements(ContentSequence);
|
srDisplaySet.measurements = getMeasurements(ContentSequence);
|
||||||
const mappings = MeasurementService.getSourceMappings(
|
const mappings = MeasurementService.getSourceMappings(
|
||||||
'CornerstoneTools',
|
'CornerstoneTools',
|
||||||
@@ -28,13 +36,6 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
|
|||||||
srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
|
srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
|
||||||
srDisplaySet.isLoaded = true;
|
srDisplaySet.isLoaded = true;
|
||||||
|
|
||||||
const imageDisplaySets = displaySets.filter(
|
|
||||||
ds =>
|
|
||||||
ds.Modality !== 'SR' &&
|
|
||||||
ds.Modality !== 'SEG' &&
|
|
||||||
ds.Modality !== 'RTSTRUCT' &&
|
|
||||||
ds.Modality !== 'RTDOSE'
|
|
||||||
);
|
|
||||||
imageDisplaySets.forEach(imageDisplaySet => {
|
imageDisplaySets.forEach(imageDisplaySet => {
|
||||||
// Check currently added displaySets and add measurements if the sources exist.
|
// Check currently added displaySets and add measurements if the sources exist.
|
||||||
checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, imageDisplaySet);
|
checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, imageDisplaySet);
|
||||||
@@ -127,7 +128,6 @@ const checkIfCanAddMeasurementsToDisplaySet = (
|
|||||||
|
|
||||||
const imageIds = images.map(i => i.getImageId());
|
const imageIds = images.map(i => i.getImageId());
|
||||||
const SOPInstanceUIDs = images.map(i => i.SOPInstanceUID);
|
const SOPInstanceUIDs = images.map(i => i.SOPInstanceUID);
|
||||||
imageDisplaySet.SRLabels = [];
|
|
||||||
const colors = new Map();
|
const colors = new Map();
|
||||||
measurements.forEach(measurement => {
|
measurements.forEach(measurement => {
|
||||||
const { coords } = measurement;
|
const { coords } = measurement;
|
||||||
@@ -139,6 +139,10 @@ const checkIfCanAddMeasurementsToDisplaySet = (
|
|||||||
coord.ReferencedSOPSequence.ReferencedSOPInstanceUID
|
coord.ReferencedSOPSequence.ReferencedSOPInstanceUID
|
||||||
);
|
);
|
||||||
if (imageIndex > -1) {
|
if (imageIndex > -1) {
|
||||||
|
if (!srDisplaySet.referencedDisplaySets.includes(imageDisplaySet)) {
|
||||||
|
srDisplaySet.referencedDisplaySets.push(imageDisplaySet);
|
||||||
|
}
|
||||||
|
|
||||||
const imageId = imageIds[imageIndex];
|
const imageId = imageIds[imageIndex];
|
||||||
const imageMetadata = images[imageIndex].getData().metadata;
|
const imageMetadata = images[imageIndex].getData().metadata;
|
||||||
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
import getSequenceAsArray from './getSequenceAsArray';
|
|
||||||
import { CodeNameCodeSequenceValues } from '../enums';
|
|
||||||
|
|
||||||
const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
|
|
||||||
const referencedImages = [];
|
|
||||||
|
|
||||||
const ImageLibrary = ImagingMeasurementReportContentSequence.find(
|
|
||||||
item =>
|
|
||||||
item.ConceptNameCodeSequence.CodeValue ===
|
|
||||||
CodeNameCodeSequenceValues.ImageLibrary
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!ImageLibrary.ContentSequence) {
|
|
||||||
return referencedImages;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ImageLibraryGroup = getSequenceAsArray(
|
|
||||||
ImageLibrary.ContentSequence
|
|
||||||
).find(
|
|
||||||
item =>
|
|
||||||
item.ConceptNameCodeSequence.CodeValue ===
|
|
||||||
CodeNameCodeSequenceValues.ImageLibraryGroup
|
|
||||||
);
|
|
||||||
|
|
||||||
getSequenceAsArray(ImageLibraryGroup.ContentSequence).forEach(item => {
|
|
||||||
const { ReferencedSOPSequence } = item;
|
|
||||||
if (ReferencedSOPSequence) {
|
|
||||||
const {
|
|
||||||
ReferencedSOPClassUID,
|
|
||||||
ReferencedSOPInstanceUID,
|
|
||||||
} = ReferencedSOPSequence;
|
|
||||||
|
|
||||||
referencedImages.push({
|
|
||||||
ReferencedSOPClassUID,
|
|
||||||
ReferencedSOPInstanceUID,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return referencedImages;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getReferencedImagesList;
|
|
||||||
@@ -21,16 +21,32 @@ const parseDicomStructuredReport = (
|
|||||||
displaySets,
|
displaySets,
|
||||||
external
|
external
|
||||||
) => {
|
) => {
|
||||||
if (external && external.servicesManager) {
|
|
||||||
parseSCOORD3D({ servicesManager: external.servicesManager, displaySets });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the dicom data as an Object
|
// Get the dicom data as an Object
|
||||||
const dicomData = dcmjs.data.DicomMessage.readFile(part10SRArrayBuffer);
|
const dicomData = dcmjs.data.DicomMessage.readFile(part10SRArrayBuffer);
|
||||||
const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(
|
const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(
|
||||||
dicomData.dict
|
dicomData.dict
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const {
|
||||||
|
LoggerService,
|
||||||
|
UINotificationService,
|
||||||
|
} = external.servicesManager.services;
|
||||||
|
if (external && external.servicesManager) {
|
||||||
|
try {
|
||||||
|
parseSCOORD3D({ servicesManager: external.servicesManager, displaySets });
|
||||||
|
} catch (error) {
|
||||||
|
const seriesDescription = dataset.SeriesDescription || '';
|
||||||
|
LoggerService.error({ error, message: error.message });
|
||||||
|
UINotificationService.show({
|
||||||
|
title: `Failed to parse ${seriesDescription} SR display set`,
|
||||||
|
message: error.message,
|
||||||
|
type: 'error',
|
||||||
|
autoClose: false,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const { MeasurementReport } = dcmjs.adapters.Cornerstone;
|
const { MeasurementReport } = dcmjs.adapters.Cornerstone;
|
||||||
|
|
||||||
let storedMeasurementByToolType;
|
let storedMeasurementByToolType;
|
||||||
@@ -38,11 +54,12 @@ const parseDicomStructuredReport = (
|
|||||||
storedMeasurementByToolType = MeasurementReport.generateToolState(dataset);
|
storedMeasurementByToolType = MeasurementReport.generateToolState(dataset);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const seriesDescription = dataset.SeriesDescription || '';
|
const seriesDescription = dataset.SeriesDescription || '';
|
||||||
LogManager.publish(LogManager.EVENTS.OnLog, {
|
LoggerService.error({ error, message: error.message });
|
||||||
|
UINotificationService.show({
|
||||||
title: `Failed to parse ${seriesDescription} measurement report`,
|
title: `Failed to parse ${seriesDescription} measurement report`,
|
||||||
type: 'warning',
|
message: error.message,
|
||||||
message: error.message || '',
|
type: 'error',
|
||||||
notify: true,
|
autoClose: false,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,12 +67,13 @@ export class HotkeysManager {
|
|||||||
UINotificationService,
|
UINotificationService,
|
||||||
LoggerService,
|
LoggerService,
|
||||||
} = this._servicesManager.services;
|
} = this._servicesManager.services;
|
||||||
const message = 'Erro while setting hotkeys';
|
const message = 'Error while setting hotkeys';
|
||||||
LoggerService.error({ error, message });
|
LoggerService.error({ error, message });
|
||||||
UINotificationService.show({
|
UINotificationService.show({
|
||||||
title: 'Hotkeys Manager',
|
title: 'Hotkeys Manager',
|
||||||
message,
|
message,
|
||||||
type: 'error',
|
type: 'error',
|
||||||
|
autoClose: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -469,8 +469,8 @@ class StudyLoadingListener {
|
|||||||
|
|
||||||
// TODO: Make this work for plugins
|
// TODO: Make this work for plugins
|
||||||
if (!stack) {
|
if (!stack) {
|
||||||
console.warn('Skipping adding displaySet to StudyLoadingListener');
|
//console.warn('Skipping adding displaySet to StudyLoadingListener');
|
||||||
console.warn(displaySet);
|
//console.warn(displaySet);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -275,6 +275,8 @@ class StudyMetadata extends Metadata {
|
|||||||
|
|
||||||
const otherDisplaySets = allDisplaySets.filter(
|
const otherDisplaySets = allDisplaySets.filter(
|
||||||
ds =>
|
ds =>
|
||||||
|
ds &&
|
||||||
|
derivatedDisplaySet &&
|
||||||
ds.displaySetInstanceUID !== derivatedDisplaySet.displaySetInstanceUID
|
ds.displaySetInstanceUID !== derivatedDisplaySet.displaySetInstanceUID
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -350,6 +352,26 @@ class StudyMetadata extends Metadata {
|
|||||||
referencedSeriesInstanceUID
|
referencedSeriesInstanceUID
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
if (
|
||||||
|
!displaySet.referencedDisplaySets ||
|
||||||
|
displaySet.referencedDisplaySets.length === 0
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const filteredReferencedDisplaySets = displaySet.referencedDisplaySets.filter(
|
||||||
|
referencedDisplaySet =>
|
||||||
|
referencedDisplaySet.SeriesInstanceUID ===
|
||||||
|
referencedSeriesInstanceUID
|
||||||
|
);
|
||||||
|
|
||||||
|
if (
|
||||||
|
filteredReferencedDisplaySets &&
|
||||||
|
filteredReferencedDisplaySets.length !== 0
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -420,6 +420,10 @@ class MeasurementService {
|
|||||||
throw new Error('No source definition provided.');
|
throw new Error('No source definition provided.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (definition == 'stack' || definition == 'stackPrefetch') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const sourceInfo = this._getSourceInfo(source);
|
const sourceInfo = this._getSourceInfo(source);
|
||||||
|
|
||||||
if (!this._sourceHasMappings(source)) {
|
if (!this._sourceHasMappings(source)) {
|
||||||
|
|||||||
@@ -19,17 +19,4 @@ describe('retrieveStudyMetadata.js', () => {
|
|||||||
|
|
||||||
expect(callWithNoStudyInstanceUID).toThrow(Error);
|
expect(callWithNoStudyInstanceUID).toThrow(Error);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('caches and returns the same promise for identical studyInstanceUIDs', () => {
|
|
||||||
const firstPromise = retrieveStudyMetadata(
|
|
||||||
fakeDicomWebServer,
|
|
||||||
'fake-study-instance-uid'
|
|
||||||
);
|
|
||||||
const secondPromise = retrieveStudyMetadata(
|
|
||||||
fakeDicomWebServer,
|
|
||||||
'fake-study-instance-uid'
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(firstPromise).toBe(secondPromise);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
@@ -21,6 +21,7 @@ const getReferencedSeriesSequence = instance => {
|
|||||||
const referencedInstanceSequenceRaw = referencedSeries['0008114A'];
|
const referencedInstanceSequenceRaw = referencedSeries['0008114A'];
|
||||||
const referencedInstanceSequence = [];
|
const referencedInstanceSequence = [];
|
||||||
|
|
||||||
|
if (referencedInstanceSequenceRaw) {
|
||||||
referencedInstanceSequenceRaw.Value.forEach(referencedInstance => {
|
referencedInstanceSequenceRaw.Value.forEach(referencedInstance => {
|
||||||
referencedInstanceSequence.push({
|
referencedInstanceSequence.push({
|
||||||
referencedSOPClassUID: DICOMWeb.getString(
|
referencedSOPClassUID: DICOMWeb.getString(
|
||||||
@@ -31,6 +32,7 @@ const getReferencedSeriesSequence = instance => {
|
|||||||
),
|
),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
referencedSeriesSequence.push({
|
referencedSeriesSequence.push({
|
||||||
referencedSeriesInstanceUID,
|
referencedSeriesInstanceUID,
|
||||||
|
|||||||
@@ -102,6 +102,35 @@ async function makeSOPInstance(server, study, instance) {
|
|||||||
SOPInstanceUID,
|
SOPInstanceUID,
|
||||||
} = naturalizedInstance;
|
} = naturalizedInstance;
|
||||||
|
|
||||||
|
const validate = string => {
|
||||||
|
let rgx = /[^.0-9]+/g;
|
||||||
|
return string.match(rgx);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (StudyInstanceUID === undefined || validate(StudyInstanceUID)) {
|
||||||
|
const error =
|
||||||
|
'makeSOPInstance: StudyInstanceUID is not conforming with the UID (DICOM UI VR) character repertoire, skipping SOPInstance.';
|
||||||
|
console.error(error);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SeriesInstanceUID === undefined || validate(SeriesInstanceUID)) {
|
||||||
|
const error =
|
||||||
|
'makeSOPInstance: SeriesInstanceUID is not conforming with the UID (DICOM UI VR) character repertoire, skipping SOPInstance.';
|
||||||
|
console.error(error);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SOPInstanceUID === undefined || validate(SOPInstanceUID)) {
|
||||||
|
const error =
|
||||||
|
'makeSOPInstance: SOPInstanceUID is not conforming with the UID (DICOM UI VR) character repertoire, skipping SOPInstance.';
|
||||||
|
console.error(error);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
let series = study.seriesMap[SeriesInstanceUID];
|
let series = study.seriesMap[SeriesInstanceUID];
|
||||||
|
|
||||||
if (!series) {
|
if (!series) {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ function createAndAddStack(stackMap, study, displaySet, stackUpdatedCallbacks) {
|
|||||||
const imageIds = [];
|
const imageIds = [];
|
||||||
let imageId;
|
let imageId;
|
||||||
|
|
||||||
displaySet.images.forEach((instance, imageIndex) => {
|
images.forEach((instance, imageIndex) => {
|
||||||
const image = instance.getData();
|
const image = instance.getData();
|
||||||
const metaData = {
|
const metaData = {
|
||||||
instance: image, // in this context, instance will be the data of the InstanceMetadata object...
|
instance: image, // in this context, instance will be the data of the InstanceMetadata object...
|
||||||
@@ -35,7 +35,7 @@ function createAndAddStack(stackMap, study, displaySet, stackUpdatedCallbacks) {
|
|||||||
imageIndex: imageIndex + 1,
|
imageIndex: imageIndex + 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
const naturalizedInstance = instance.getData().metadata;
|
const naturalizedInstance = image.metadata;
|
||||||
const NumberOfFrames = naturalizedInstance.NumberOfFrames;
|
const NumberOfFrames = naturalizedInstance.NumberOfFrames;
|
||||||
|
|
||||||
if (NumberOfFrames > 1) {
|
if (NumberOfFrames > 1) {
|
||||||
|
|||||||
@@ -119,12 +119,20 @@ async function loadAndCacheDerivedDisplaySets(
|
|||||||
) {
|
) {
|
||||||
if (recentDisplaySet.Modality === 'SEG' && logger) {
|
if (recentDisplaySet.Modality === 'SEG' && logger) {
|
||||||
const onDisplaySetLoadFailureHandler = error => {
|
const onDisplaySetLoadFailureHandler = error => {
|
||||||
logger.error({ error, message: error.message });
|
const message =
|
||||||
|
error.message.includes('orthogonal') ||
|
||||||
|
error.message.includes('oblique')
|
||||||
|
? 'The segmentation has been detected as non coplanar,\
|
||||||
|
If you really think it is coplanar,\
|
||||||
|
please adjust the tolerance in the segmentation panel settings (at your own peril!)'
|
||||||
|
: error.message;
|
||||||
|
|
||||||
|
logger.error({ error, message });
|
||||||
snackbar.show({
|
snackbar.show({
|
||||||
title: 'DICOM Segmentation Loader',
|
title: 'DICOM Segmentation Loader',
|
||||||
message: error.message,
|
message,
|
||||||
type: 'error',
|
type: 'error',
|
||||||
autoClose: true,
|
autoClose: false,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.10.10](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.9...@ohif/ui@1.10.10) (2022-08-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/ui
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [1.10.9](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.8...@ohif/ui@1.10.9) (2022-06-29)
|
## [1.10.9](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.8...@ohif/ui@1.10.9) (2022-06-29)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/ui
|
**Note:** Version bump only for package @ohif/ui
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/ui",
|
"name": "@ohif/ui",
|
||||||
"version": "1.10.9",
|
"version": "1.10.10",
|
||||||
"description": "A set of React components for Medical Imaging Viewers",
|
"description": "A set of React components for Medical Imaging Viewers",
|
||||||
"author": "OHIF Contributors",
|
"author": "OHIF Contributors",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|||||||
@@ -175,7 +175,9 @@ class MeasurementTableItem extends Component {
|
|||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
<div className="icons">
|
<div className="icons">
|
||||||
<span>{SRLabel.label + ' : ' + SRLabel.value}</span>
|
<span style={{ width: '90px' }}>
|
||||||
|
{SRLabel.label + ' : ' + SRLabel.value}
|
||||||
|
</span>
|
||||||
<Icon
|
<Icon
|
||||||
className={`eye-icon`}
|
className={`eye-icon`}
|
||||||
name={SRLabel.visible ? 'eye' : 'eye-closed'}
|
name={SRLabel.visible ? 'eye' : 'eye-closed'}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ $headerRowHeight = 63px
|
|||||||
|
|
||||||
.tableListHeaderTitle
|
.tableListHeaderTitle
|
||||||
color: var(--text-secondary-color)
|
color: var(--text-secondary-color)
|
||||||
|
max-width: 230px
|
||||||
font-size: 22px
|
font-size: 22px
|
||||||
font-weight: 300
|
font-weight: 300
|
||||||
line-height: $headerRowHeight
|
line-height: $headerRowHeight
|
||||||
|
|||||||
@@ -3,6 +3,183 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [4.12.50](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.49...@ohif/viewer@4.12.50) (2023-01-17)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.49](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.48...@ohif/viewer@4.12.49) (2023-01-10)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.48](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.47...@ohif/viewer@4.12.48) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.47](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.46...@ohif/viewer@4.12.47) (2022-12-21)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.46](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.45...@ohif/viewer@4.12.46) (2022-12-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Reword message for segmentation error loading due to orientation tolerance ([#3017](https://github.com/OHIF/Viewers/issues/3017)) ([597ac11](https://github.com/OHIF/Viewers/commit/597ac11c4daee1b1e14148804551e20611cfef08))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.45](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.44...@ohif/viewer@4.12.45) (2022-11-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.44](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.43...@ohif/viewer@4.12.44) (2022-11-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.43](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.42...@ohif/viewer@4.12.43) (2022-10-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* [#2964](https://github.com/OHIF/Viewers/issues/2964) Update message for segmentation error loading due to orientation tolerance ([#2982](https://github.com/OHIF/Viewers/issues/2982)) ([545161d](https://github.com/OHIF/Viewers/commit/545161d5e8d92bb6652f17dc24a36dac8aa7b3a4))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.42](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.41...@ohif/viewer@4.12.42) (2022-10-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.41](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.40...@ohif/viewer@4.12.41) (2022-09-26)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.40](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.39...@ohif/viewer@4.12.40) (2022-09-20)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.39](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.38...@ohif/viewer@4.12.39) (2022-09-19)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.38](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.37...@ohif/viewer@4.12.38) (2022-09-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.37](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.36...@ohif/viewer@4.12.37) (2022-09-12)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.36](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.35...@ohif/viewer@4.12.36) (2022-09-08)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* hotkey page up/down did not work ([#2910](https://github.com/OHIF/Viewers/issues/2910)) ([d74ad37](https://github.com/OHIF/Viewers/commit/d74ad370e091c8af2d93ec35f688c4ef902bab2b))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.35](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.34...@ohif/viewer@4.12.35) (2022-09-02)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.34](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.33...@ohif/viewer@4.12.34) (2022-09-01)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.33](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.32...@ohif/viewer@4.12.33) (2022-08-31)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.32](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.31...@ohif/viewer@4.12.32) (2022-08-25)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.31](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.30...@ohif/viewer@4.12.31) (2022-08-24)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [4.12.30](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.29...@ohif/viewer@4.12.30) (2022-06-30)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [4.12.29](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.28...@ohif/viewer@4.12.29) (2022-06-29)
|
## [4.12.29](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.28...@ohif/viewer@4.12.29) (2022-06-29)
|
||||||
|
|
||||||
**Note:** Version bump only for package @ohif/viewer
|
**Note:** Version bump only for package @ohif/viewer
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ohif/viewer",
|
"name": "@ohif/viewer",
|
||||||
"version": "4.12.29",
|
"version": "4.12.50",
|
||||||
"description": "OHIF Viewer",
|
"description": "OHIF Viewer",
|
||||||
"author": "OHIF Contributors",
|
"author": "OHIF Contributors",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -47,26 +47,26 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.5.5",
|
"@babel/runtime": "^7.5.5",
|
||||||
"@ohif/core": "^2.16.21",
|
"@ohif/core": "^2.16.35",
|
||||||
"@ohif/extension-cornerstone": "^2.12.12",
|
"@ohif/extension-cornerstone": "^2.12.16",
|
||||||
"@ohif/extension-debugging": "^0.3.2",
|
"@ohif/extension-debugging": "^0.3.3",
|
||||||
"@ohif/extension-dicom-html": "^1.3.21",
|
"@ohif/extension-dicom-html": "^1.3.24",
|
||||||
"@ohif/extension-dicom-microscopy": "^0.52.0",
|
"@ohif/extension-dicom-microscopy": "^0.52.0",
|
||||||
"@ohif/extension-dicom-pdf": "^1.1.2",
|
"@ohif/extension-dicom-pdf": "^1.1.2",
|
||||||
"@ohif/extension-dicom-rt": "^0.7.11",
|
"@ohif/extension-dicom-rt": "^0.7.14",
|
||||||
"@ohif/extension-dicom-segmentation": "^0.7.11",
|
"@ohif/extension-dicom-segmentation": "^0.7.21",
|
||||||
"@ohif/extension-lesion-tracker": "^0.2.2",
|
"@ohif/extension-lesion-tracker": "^0.2.2",
|
||||||
"@ohif/extension-vtk": "^1.12.26",
|
"@ohif/extension-vtk": "^1.12.41",
|
||||||
"@ohif/i18n": "^0.53.0",
|
"@ohif/i18n": "^0.53.0",
|
||||||
"@ohif/ui": "^1.10.9",
|
"@ohif/ui": "^1.10.10",
|
||||||
"@tanem/react-nprogress": "^1.1.25",
|
"@tanem/react-nprogress": "^1.1.25",
|
||||||
"classnames": "^2.2.6",
|
"classnames": "^2.2.6",
|
||||||
"core-js": "^3.2.1",
|
"core-js": "^3.2.1",
|
||||||
"cornerstone-core": "^2.6.1",
|
"cornerstone-core": "^2.6.1",
|
||||||
"cornerstone-math": "^0.1.9",
|
"cornerstone-math": "^0.1.9",
|
||||||
"cornerstone-tools": "^6.0.6",
|
"cornerstone-tools": "^6.0.6",
|
||||||
"cornerstone-wado-image-loader": "^4.1.0",
|
"cornerstone-wado-image-loader": "^4.2.1",
|
||||||
"dcmjs": "0.19.9",
|
"dcmjs": "0.29.3",
|
||||||
"dicom-parser": "^1.8.11",
|
"dicom-parser": "^1.8.11",
|
||||||
"dicomweb-client": "^0.8.3",
|
"dicomweb-client": "^0.8.3",
|
||||||
"hammerjs": "^2.0.8",
|
"hammerjs": "^2.0.8",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { redux } from '@ohif/core';
|
import { redux, utils } from '@ohif/core';
|
||||||
import store from './../../store';
|
import store from './../../store';
|
||||||
|
|
||||||
const commandsModule = ({ commandsManager }) => {
|
const commandsModule = ({ commandsManager }) => {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { measurements, utils } from '@ohif/core';
|
import { measurements, utils } from '@ohif/core';
|
||||||
|
import { servicesManager } from './../../App.js';
|
||||||
const { MeasurementApi } = measurements;
|
const { MeasurementApi } = measurements;
|
||||||
const { studyMetadataManager } = utils;
|
const { studyMetadataManager } = utils;
|
||||||
|
|
||||||
@@ -19,6 +19,25 @@ export default function jumpToRowItem(
|
|||||||
timepointManagerState,
|
timepointManagerState,
|
||||||
options = { invertViewportTimepointsOrder: false, childToolKey: null }
|
options = { invertViewportTimepointsOrder: false, childToolKey: null }
|
||||||
) {
|
) {
|
||||||
|
const viewports = viewportsState.layout.viewports;
|
||||||
|
const activeViewportIndex = viewportsState.activeViewportIndex;
|
||||||
|
const activeViewport = viewports[activeViewportIndex];
|
||||||
|
if (activeViewport.vtk) {
|
||||||
|
const error = new Error('Measurements are not supported by the MPR mode.');
|
||||||
|
const { UINotificationService, LoggerService } = servicesManager.services;
|
||||||
|
LoggerService.error({ error, message: error.message });
|
||||||
|
UINotificationService.show({
|
||||||
|
title: 'Measurements panel',
|
||||||
|
message: error.message,
|
||||||
|
type: 'warning',
|
||||||
|
autoClose: true,
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
viewportSpecificData: [],
|
||||||
|
layout: [], // TODO: if we need to change layout, we should return this here
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const numViewports = viewportsState.layout.viewports.length;
|
const numViewports = viewportsState.layout.viewports.length;
|
||||||
const numTimepoints = timepointManagerState.timepoints.length;
|
const numTimepoints = timepointManagerState.timepoints.length;
|
||||||
const { measurements, timepoints } = timepointManagerState;
|
const { measurements, timepoints } = timepointManagerState;
|
||||||
|
|||||||
@@ -20,12 +20,20 @@ const mapDispatchToProps = (dispatch, ownProps) => {
|
|||||||
const { Modality } = displaySet;
|
const { Modality } = displaySet;
|
||||||
if (Modality === 'SEG' && servicesManager) {
|
if (Modality === 'SEG' && servicesManager) {
|
||||||
const onDisplaySetLoadFailureHandler = error => {
|
const onDisplaySetLoadFailureHandler = error => {
|
||||||
LoggerService.error({ error, message: error.message });
|
const message =
|
||||||
|
error.message.includes('orthogonal') ||
|
||||||
|
error.message.includes('oblique')
|
||||||
|
? 'The segmentation has been detected as non coplanar,\
|
||||||
|
If you really think it is coplanar,\
|
||||||
|
please adjust the tolerance in the segmentation panel settings (at your own peril!)'
|
||||||
|
: error.message;
|
||||||
|
|
||||||
|
LoggerService.error({ error, message });
|
||||||
UINotificationService.show({
|
UINotificationService.show({
|
||||||
title: 'DICOM Segmentation Loader',
|
title: 'DICOM Segmentation Loader',
|
||||||
message: error.message,
|
message,
|
||||||
type: 'error',
|
type: 'error',
|
||||||
autoClose: true,
|
autoClose: false,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -46,9 +54,11 @@ const mapDispatchToProps = (dispatch, ownProps) => {
|
|||||||
detail: { activatedLabelmapIndex: activatedLabelmapIndex },
|
detail: { activatedLabelmapIndex: activatedLabelmapIndex },
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
const segThumbnailSelected = new CustomEvent('segseriesselected');
|
||||||
document.dispatchEvent(selectionFired);
|
document.dispatchEvent(selectionFired);
|
||||||
|
document.dispatchEvent(segThumbnailSelected);
|
||||||
});
|
});
|
||||||
} else {
|
} else if (Modality !== 'SR') {
|
||||||
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
|
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -262,7 +262,11 @@ class Viewer extends Component {
|
|||||||
const { currentTimepointId } = this;
|
const { currentTimepointId } = this;
|
||||||
|
|
||||||
this.timepointApi.retrieveTimepoints({ PatientID });
|
this.timepointApi.retrieveTimepoints({ PatientID });
|
||||||
this.measurementApi.retrieveMeasurements(PatientID, [currentTimepointId]);
|
this.measurementApi
|
||||||
|
.retrieveMeasurements(PatientID, [currentTimepointId])
|
||||||
|
.then(() => {
|
||||||
|
this._updateThumbnails();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -469,7 +473,7 @@ const _checkForDerivedDisplaySets = async function(displaySet, study) {
|
|||||||
let derivedDisplaySetsNumber = 0;
|
let derivedDisplaySetsNumber = 0;
|
||||||
if (
|
if (
|
||||||
displaySet.Modality &&
|
displaySet.Modality &&
|
||||||
!['SEG', 'SR', 'RTSTRUCT', 'RTDOSE'].includes(displaySet.Modality)
|
!['SEG', 'SR', 'RTSTRUCT'].includes(displaySet.Modality)
|
||||||
) {
|
) {
|
||||||
const studyMetadata = studyMetadataManager.get(study.StudyInstanceUID);
|
const studyMetadata = studyMetadataManager.get(study.StudyInstanceUID);
|
||||||
|
|
||||||
@@ -501,14 +505,14 @@ const _checkForDerivedDisplaySets = async function(displaySet, study) {
|
|||||||
* @returns {[string]} an array of strings containing the warnings
|
* @returns {[string]} an array of strings containing the warnings
|
||||||
*/
|
*/
|
||||||
const _checkForSeriesInconsistencesWarnings = async function(displaySet) {
|
const _checkForSeriesInconsistencesWarnings = async function(displaySet) {
|
||||||
if (displaySet.inconsistencyWarnings) {
|
|
||||||
// warnings already checked and cached in displaySet
|
|
||||||
return displaySet.inconsistencyWarnings;
|
|
||||||
}
|
|
||||||
|
|
||||||
const inconsistencyWarnings = [];
|
const inconsistencyWarnings = [];
|
||||||
|
|
||||||
if (displaySet.Modality !== 'SEG') {
|
if (displaySet.Modality !== 'SEG') {
|
||||||
|
// warnings already checked and cached in displaySet
|
||||||
|
if (displaySet.inconsistencyWarnings) {
|
||||||
|
return displaySet.inconsistencyWarnings;
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
displaySet.reconstructionIssues &&
|
displaySet.reconstructionIssues &&
|
||||||
displaySet.reconstructionIssues.length !== 0
|
displaySet.reconstructionIssues.length !== 0
|
||||||
@@ -608,9 +612,29 @@ const _isDisplaySetActive = function(
|
|||||||
if (
|
if (
|
||||||
displaySet.Modality !== 'SEG' &&
|
displaySet.Modality !== 'SEG' &&
|
||||||
displaySet.Modality !== 'RTSTRUCT' &&
|
displaySet.Modality !== 'RTSTRUCT' &&
|
||||||
displaySet.Modality !== 'RTDOSE'
|
displaySet.Modality !== 'SR'
|
||||||
) {
|
) {
|
||||||
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
|
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
|
||||||
|
} else if (displaySet.Modality === 'SR') {
|
||||||
|
active = activeDisplaySetInstanceUID === displaySetInstanceUID;
|
||||||
|
|
||||||
|
if (!active && displaySet.getSourceDisplaySet) {
|
||||||
|
const referencedDisplaySet = displaySet.getSourceDisplaySet(
|
||||||
|
studies,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
if (referencedDisplaySet && referencedDisplaySet.length !== 0) {
|
||||||
|
for (let i = 0; i < referencedDisplaySet.length; i++) {
|
||||||
|
if (
|
||||||
|
referencedDisplaySet[i].displaySetInstanceUID ===
|
||||||
|
activeDisplaySetInstanceUID
|
||||||
|
) {
|
||||||
|
active = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} else if (displaySet.getSourceDisplaySet) {
|
} else if (displaySet.getSourceDisplaySet) {
|
||||||
if (displaySet.Modality === 'SEG') {
|
if (displaySet.Modality === 'SEG') {
|
||||||
const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
|
const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
|
||||||
|
|||||||
@@ -145,12 +145,19 @@ class ViewerMain extends Component {
|
|||||||
const { Modality } = displaySet;
|
const { Modality } = displaySet;
|
||||||
if (Modality === 'SEG' && servicesManager) {
|
if (Modality === 'SEG' && servicesManager) {
|
||||||
const onDisplaySetLoadFailureHandler = error => {
|
const onDisplaySetLoadFailureHandler = error => {
|
||||||
LoggerService.error({ error, message: error.message });
|
const message =
|
||||||
|
error.message.includes('orthogonal') ||
|
||||||
|
error.message.includes('oblique')
|
||||||
|
? 'The segmentation has been detected as non coplanar,\
|
||||||
|
If you really think it is coplanar,\
|
||||||
|
please adjust the tolerance in the segmentation panel settings (at your own peril!)'
|
||||||
|
: error.message;
|
||||||
|
LoggerService.error({ error, message });
|
||||||
UINotificationService.show({
|
UINotificationService.show({
|
||||||
title: 'DICOM Segmentation Loader',
|
title: 'DICOM Segmentation Loader',
|
||||||
message: error.message,
|
message,
|
||||||
type: 'error',
|
type: 'error',
|
||||||
autoClose: true,
|
autoClose: false,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -173,7 +180,7 @@ class ViewerMain extends Component {
|
|||||||
);
|
);
|
||||||
document.dispatchEvent(selectionFired);
|
document.dispatchEvent(selectionFired);
|
||||||
});
|
});
|
||||||
} else {
|
} else if (Modality !== 'SR') {
|
||||||
displaySet = displaySet.getSourceDisplaySet(this.props.studies);
|
displaySet = displaySet.getSourceDisplaySet(this.props.studies);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
3.7
|
3.8
|
||||||
@@ -721,14 +721,6 @@
|
|||||||
"@babel/helper-regex" "^7.4.4"
|
"@babel/helper-regex" "^7.4.4"
|
||||||
regexpu-core "^4.6.0"
|
regexpu-core "^4.6.0"
|
||||||
|
|
||||||
"@babel/polyfill@^7.8.3":
|
|
||||||
version "7.8.7"
|
|
||||||
resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
|
|
||||||
integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
|
|
||||||
dependencies:
|
|
||||||
core-js "^2.6.5"
|
|
||||||
regenerator-runtime "^0.13.4"
|
|
||||||
|
|
||||||
"@babel/preset-env@^7.5.0", "@babel/preset-env@^7.5.5":
|
"@babel/preset-env@^7.5.0", "@babel/preset-env@^7.5.5":
|
||||||
version "7.6.3"
|
version "7.6.3"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
|
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
|
||||||
@@ -796,7 +788,15 @@
|
|||||||
"@babel/plugin-transform-react-jsx-self" "^7.0.0"
|
"@babel/plugin-transform-react-jsx-self" "^7.0.0"
|
||||||
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
|
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
|
||||||
|
|
||||||
"@babel/runtime@7.1.2", "@babel/runtime@7.5.5", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.16.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.6":
|
"@babel/runtime-corejs2@^7.17.8":
|
||||||
|
version "7.18.9"
|
||||||
|
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.18.9.tgz#d88c327736ecc4b9db13ddef5a33a004b9aeac74"
|
||||||
|
integrity sha512-l057ZarpDX2QnXM89ViR2BgRFgTy2l5UFGDt0SbInhim1N/ljBgPeTJV0kRG1/Bo7CkHfYfrNNwTeQ2CPph9xQ==
|
||||||
|
dependencies:
|
||||||
|
core-js "^2.6.12"
|
||||||
|
regenerator-runtime "^0.13.4"
|
||||||
|
|
||||||
|
"@babel/runtime@7.1.2", "@babel/runtime@7.5.5", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.16.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.6":
|
||||||
version "7.5.5"
|
version "7.5.5"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
|
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
|
||||||
integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
|
integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
|
||||||
@@ -4242,13 +4242,13 @@ capture-exit@^2.0.0:
|
|||||||
rsvp "^4.8.4"
|
rsvp "^4.8.4"
|
||||||
|
|
||||||
cardboard-vr-display@^1.0.15:
|
cardboard-vr-display@^1.0.15:
|
||||||
version "1.0.16"
|
version "1.0.19"
|
||||||
resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.16.tgz#f91e2798e8fb70a348599638c6742c72dfeadabc"
|
resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.19.tgz#81dcde1804b329b8228b757ac00e1fd2afa9d748"
|
||||||
integrity sha512-GFBWPMH/ixy4Ji014BAO1ryddGHphtJlA8gUR6UdKsOpPjUQukCKpgsx2XIJ5oBlqXnDQOcLVRqBWyuvTI32jQ==
|
integrity sha512-+MjcnWKAkb95p68elqZLDPzoiF/dGncQilLGvPBM5ZorABp/ao3lCs7nnRcYBckmuNkg1V/5rdGDKoUaCVsHzQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
gl-preserve-state "^1.0.0"
|
gl-preserve-state "^1.0.0"
|
||||||
nosleep.js "^0.7.0"
|
nosleep.js "^0.7.0"
|
||||||
webvr-polyfill-dpdb "^1.0.11"
|
webvr-polyfill-dpdb "^1.0.17"
|
||||||
|
|
||||||
cardinal@^2.1.1:
|
cardinal@^2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
@@ -5079,11 +5079,16 @@ core-js-compat@^3.1.1:
|
|||||||
browserslist "^4.7.2"
|
browserslist "^4.7.2"
|
||||||
semver "^6.3.0"
|
semver "^6.3.0"
|
||||||
|
|
||||||
core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7, core-js@^2.6.5:
|
core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
|
||||||
version "2.6.10"
|
version "2.6.10"
|
||||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
|
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
|
||||||
integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
|
integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
|
||||||
|
|
||||||
|
core-js@^2.6.12:
|
||||||
|
version "2.6.12"
|
||||||
|
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
|
||||||
|
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
|
||||||
|
|
||||||
core-js@^3.2.1:
|
core-js@^3.2.1:
|
||||||
version "3.3.4"
|
version "3.3.4"
|
||||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.4.tgz#6b0a23392958317bfb46e40b090529a923add669"
|
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.4.tgz#6b0a23392958317bfb46e40b090529a923add669"
|
||||||
@@ -5112,10 +5117,10 @@ cornerstone-tools@^6.0.6:
|
|||||||
"@babel/runtime" "7.1.2"
|
"@babel/runtime" "7.1.2"
|
||||||
cornerstone-math "0.1.9"
|
cornerstone-math "0.1.9"
|
||||||
|
|
||||||
cornerstone-wado-image-loader@^4.1.0:
|
cornerstone-wado-image-loader@^4.2.1:
|
||||||
version "4.1.0"
|
version "4.2.1"
|
||||||
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.1.0.tgz#a85c206eb23e188181ed3f1dcf3ec715e65efcb4"
|
resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.2.1.tgz#ee37797fe8970dcb7e438a6d87b710e817066100"
|
||||||
integrity sha512-QRoMqBE5xEc1Jttg3eH6RB4jFY2aIEjd9rcbvJszefl0isow+JwcLv2kh1xkSvqGfHGozcz+F4mrORyTNNLuFQ==
|
integrity sha512-nRu+6GfHFERpZLytH/SCfymODCz1SC1NKRv/xn02pr3PEkzU6fvKI76sSxSFOozxDsYljupTRNi/qGMprfdBHA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@cornerstonejs/codec-charls" "^0.1.1"
|
"@cornerstonejs/codec-charls" "^0.1.1"
|
||||||
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7"
|
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^0.0.7"
|
||||||
@@ -5632,17 +5637,17 @@ dateformat@^3.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
|
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
|
||||||
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
|
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
|
||||||
|
|
||||||
dcmjs@0.19.9:
|
dcmjs@0.29.3:
|
||||||
version "0.19.9"
|
version "0.29.3"
|
||||||
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.19.9.tgz#be500101b1f75a28ea9eb7ef845a8ed197355e76"
|
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.3.tgz#e672ed079bd5371406e022361c60d7794af40d7b"
|
||||||
integrity sha512-V+0tND+SPX5e7WFeLzeoooaTsZbiKmEP2i3AyERsojaXXfaDV5E+pta5IqId4Ok1yfRT5qfTFwLGstGT6nLplA==
|
integrity sha512-aLAkrpejrFAatzU84ID9s01+oUFBzIP3gSkgyr2OcDfOphW7ms/JUDUdH24Y6361NaMovEo4gJ3bRrzsBmI8cA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/polyfill" "^7.8.3"
|
"@babel/runtime-corejs2" "^7.17.8"
|
||||||
"@babel/runtime" "^7.8.4"
|
|
||||||
gl-matrix "^3.1.0"
|
gl-matrix "^3.1.0"
|
||||||
lodash.clonedeep "^4.5.0"
|
lodash.clonedeep "^4.5.0"
|
||||||
loglevelnext "^3.0.1"
|
loglevelnext "^3.0.1"
|
||||||
ndarray "^1.0.19"
|
ndarray "^1.0.19"
|
||||||
|
pako "^2.0.4"
|
||||||
|
|
||||||
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
|
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
|
||||||
version "2.6.9"
|
version "2.6.9"
|
||||||
@@ -11204,7 +11209,7 @@ normalize-url@^3.0.0, normalize-url@^3.3.0:
|
|||||||
nosleep.js@^0.7.0:
|
nosleep.js@^0.7.0:
|
||||||
version "0.7.0"
|
version "0.7.0"
|
||||||
resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
|
resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
|
||||||
integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=
|
integrity sha512-Z4B1HgvzR+en62ghwZf6BwAR6x4/pjezsiMcbF9KMLh7xoscpoYhaSXfY3lLkqC68AtW+/qLJ1lzvBIj0FGaTA==
|
||||||
|
|
||||||
npm-bundled@^1.0.1:
|
npm-bundled@^1.0.1:
|
||||||
version "1.0.6"
|
version "1.0.6"
|
||||||
@@ -13515,10 +13520,10 @@ react-transition-group@^4.1.1:
|
|||||||
loose-envify "^1.4.0"
|
loose-envify "^1.4.0"
|
||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
|
|
||||||
react-vtkjs-viewport@^0.14.4:
|
react-vtkjs-viewport@^0.14.5:
|
||||||
version "0.14.4"
|
version "0.14.5"
|
||||||
resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.14.4.tgz#8cc5a49738fff3fee75ead61c98307bc24710151"
|
resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.14.5.tgz#95cda594370e557d43aa966392ed92926e6c53c1"
|
||||||
integrity sha512-WKU87iqH6AQ1R8zp1hUXU4hsGwfbkkoUhzSCjbBGZ9Di0ELYNx/xY9DtdmgsKOU5Y5Arp5+VQW/ziFsq2KTcTA==
|
integrity sha512-DE+Ytub6veya3DTvItJdZhkTR8MppoLkrq57qhN9vd2meykeS1fZp9cDyWmq92dJ7IHSuS5FPof8ucsae9ci5w==
|
||||||
dependencies:
|
dependencies:
|
||||||
date-fns "^2.2.1"
|
date-fns "^2.2.1"
|
||||||
gl-matrix "^3.1.0"
|
gl-matrix "^3.1.0"
|
||||||
@@ -14495,7 +14500,7 @@ scriptjs@^2.5.9:
|
|||||||
seedrandom@2.4.3:
|
seedrandom@2.4.3:
|
||||||
version "2.4.3"
|
version "2.4.3"
|
||||||
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc"
|
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc"
|
||||||
integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw=
|
integrity sha512-2CkZ9Wn2dS4mMUWQaXLsOAfGD+irMlLEeSP3cMxpGbgyOOzJGFa+MWCOMTOCMyZinHRPxyOj/S/C57li/1to6Q==
|
||||||
|
|
||||||
seedrandom@^3.0.5:
|
seedrandom@^3.0.5:
|
||||||
version "3.0.5"
|
version "3.0.5"
|
||||||
@@ -14711,7 +14716,7 @@ shebang-regex@^3.0.0:
|
|||||||
shelljs@0.7.8:
|
shelljs@0.7.8:
|
||||||
version "0.7.8"
|
version "0.7.8"
|
||||||
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
|
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
|
||||||
integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
|
integrity sha512-/YF5Uk8hcwi7ima04ppkbA4RaRMdPMBfwAvAf8sufYOxsJRtbdoBsT8vGvlb+799BrlGdYrd+oczIA2eN2JdWA==
|
||||||
dependencies:
|
dependencies:
|
||||||
glob "^7.0.0"
|
glob "^7.0.0"
|
||||||
interpret "^1.0.0"
|
interpret "^1.0.0"
|
||||||
@@ -16658,10 +16663,10 @@ websocket-extensions@>=0.1.1:
|
|||||||
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
|
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
|
||||||
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
|
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
|
||||||
|
|
||||||
webvr-polyfill-dpdb@^1.0.11:
|
webvr-polyfill-dpdb@^1.0.17:
|
||||||
version "1.0.16"
|
version "1.0.18"
|
||||||
resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.16.tgz#7f2cf88460c002a5f10ff69b2bf3a5663e0ad9dd"
|
resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
|
||||||
integrity sha512-FCciTtPhwkYYHGL0K67G8k7ZnNVqnEx3u4NVHLJ0+Ya6f2VTZUl/GJpaEo1Id2pBP/2l0RYZ3IGZE4Pe8fRalg==
|
integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
|
||||||
|
|
||||||
webvr-polyfill@0.10.8:
|
webvr-polyfill@0.10.8:
|
||||||
version "0.10.8"
|
version "0.10.8"
|
||||||
|
|||||||
Reference in new issue
Block a user