Skip to content

Commit fffe05d

Browse files
authored
Merge pull request #151 from ImagingDataCommons/master
Update IDC2servers to 4.12.31
2 parents 927b602 + d867f2b commit fffe05d

File tree

11 files changed

+56
-18
lines changed

11 files changed

+56
-18
lines changed

extensions/vtk/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ All notable changes to this project will be documented in this file. See
4343

4444

4545

46+
## [1.12.28](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-08-24)
47+
48+
**Note:** Version bump only for package @ohif/extension-vtk
49+
50+
51+
52+
53+
4654
## [1.12.27](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-06-30)
4755

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

extensions/vtk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ohif/extension-vtk",
3-
"version": "1.12.27",
3+
"version": "1.12.28",
44
"description": "OHIF extension for VTK.js",
55
"author": "OHIF",
66
"license": "MIT",
@@ -53,8 +53,8 @@
5353
"react-vtkjs-viewport": "^0.14.4"
5454
},
5555
"devDependencies": {
56-
"@ohif/core": "^2.16.22",
57-
"@ohif/ui": "^1.10.9",
56+
"@ohif/core": "^2.16.23",
57+
"@ohif/ui": "^1.10.10",
5858
"cornerstone-tools": "^6.0.6",
5959
"cornerstone-wado-image-loader": "^4.1.0",
6060
"dicom-parser": "^1.8.11",

platform/core/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.16.23](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-08-24)
7+
8+
**Note:** Version bump only for package @ohif/core
9+
10+
11+
12+
13+
614
## [2.16.22](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-06-30)
715

816
**Note:** Version bump only for package @ohif/core

platform/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ohif/core",
3-
"version": "2.16.22",
3+
"version": "2.16.23",
44
"description": "Generic business logic for web-based medical imaging applications",
55
"author": "OHIF Core Team",
66
"license": "MIT",

platform/core/src/DICOMSR/SCOORD3D/parseSCOORD3D.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
88
const { MeasurementService } = servicesManager.services;
99

1010
const srDisplaySets = displaySets.filter(ds => ds.Modality === 'SR');
11+
const imageDisplaySets = displaySets.filter(
12+
ds =>
13+
ds.Modality !== 'SR' &&
14+
ds.Modality !== 'SEG' &&
15+
ds.Modality !== 'RTSTRUCT' &&
16+
ds.Modality !== 'RTDOSE'
17+
);
18+
19+
imageDisplaySets.forEach(imageDisplaySet => {
20+
imageDisplaySet.SRLabels = [];
21+
});
1122

1223
srDisplaySets.forEach(srDisplaySet => {
1324
const firstInstance = srDisplaySet.metadata;
@@ -28,13 +39,6 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {
2839
srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
2940
srDisplaySet.isLoaded = true;
3041

31-
const imageDisplaySets = displaySets.filter(
32-
ds =>
33-
ds.Modality !== 'SR' &&
34-
ds.Modality !== 'SEG' &&
35-
ds.Modality !== 'RTSTRUCT' &&
36-
ds.Modality !== 'RTDOSE'
37-
);
3842
imageDisplaySets.forEach(imageDisplaySet => {
3943
// Check currently added displaySets and add measurements if the sources exist.
4044
checkIfCanAddMeasurementsToDisplaySet(srDisplaySet, imageDisplaySet);
@@ -127,7 +131,6 @@ const checkIfCanAddMeasurementsToDisplaySet = (
127131

128132
const imageIds = images.map(i => i.getImageId());
129133
const SOPInstanceUIDs = images.map(i => i.SOPInstanceUID);
130-
imageDisplaySet.SRLabels = [];
131134
const colors = new Map();
132135
measurements.forEach(measurement => {
133136
const { coords } = measurement;

platform/ui/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.10.10](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-08-24)
7+
8+
**Note:** Version bump only for package @ohif/ui
9+
10+
11+
12+
13+
614
## [1.10.9](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-06-29)
715

816
**Note:** Version bump only for package @ohif/ui

platform/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ohif/ui",
3-
"version": "1.10.9",
3+
"version": "1.10.10",
44
"description": "A set of React components for Medical Imaging Viewers",
55
"author": "OHIF Contributors",
66
"license": "MIT",

platform/ui/src/components/measurementTable/MeasurementTableItem.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ class MeasurementTableItem extends Component {
175175
>
176176
<div>
177177
<div className="icons">
178-
<span>{SRLabel.label + ' : ' + SRLabel.value}</span>
178+
<span style={{ width: '90px' }}>
179+
{SRLabel.label + ' : ' + SRLabel.value}
180+
</span>
179181
<Icon
180182
className={`eye-icon`}
181183
name={SRLabel.visible ? 'eye' : 'eye-closed'}

platform/ui/src/components/tableList/TableList.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ $headerRowHeight = 63px
1818

1919
.tableListHeaderTitle
2020
color: var(--text-secondary-color)
21+
max-width: 230px
2122
font-size: 22px
2223
font-weight: 300
2324
line-height: $headerRowHeight

platform/viewer/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.12.31](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-08-24)
7+
8+
**Note:** Version bump only for package @ohif/viewer
9+
10+
11+
12+
13+
614
## [4.12.30](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2022-06-30)
715

816
**Note:** Version bump only for package @ohif/viewer

0 commit comments

Comments
 (0)