Skip to content

Commit 74933b8

Browse files
committed
Merge branch 'main' of https://github.com/anaisabel1909/cornerstone3D into feat/3Dcursor
This commit introduces the volume picking inside cornerstone 3D, allowing users to interact with the 3D scene
2 parents b31b457 + 0b67f91 commit 74933b8

File tree

245 files changed

+5791
-17071
lines changed

Some content is hidden

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

245 files changed

+5791
-17071
lines changed

.circleci/config.yml

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ jobs:
4040
- run: bun install
4141
- persist_to_workspace:
4242
root: ~/repo
43-
paths: .
43+
paths:
44+
- "."
4445

4546
BUILD:
4647
<<: *defaults
@@ -64,22 +65,6 @@ jobs:
6465
- commit.txt
6566
- version.json
6667

67-
API_CHECK:
68-
<<: *defaults
69-
steps:
70-
- attach_workspace:
71-
at: ~/repo
72-
- install_bun
73-
- run: bun install -d ajv
74-
- run: bun run api-check
75-
FORMAT_CHECK:
76-
<<: *defaults
77-
steps:
78-
- attach_workspace:
79-
at: ~/repo
80-
- install_bun
81-
- run: bun run format-check
82-
8368
# https://circleci.com/docs/2.0/collect-test-data/#karma
8469
TEST:
8570
<<: *defaults
@@ -117,7 +102,8 @@ jobs:
117102
mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking
118103
no\n" > ~/.ssh/config
119104
- add_ssh_keys:
120-
fingerprints: 7e:0f:5b:bb:e3:7a:2e:2f:b4:85:bd:66:09:69:cb:f2
105+
fingerprints:
106+
- "7e:0f:5b:bb:e3:7a:2e:2f:b4:85:bd:66:09:69:cb:f2"
121107
- run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
122108
- run: git config --global user.email "[email protected]"
123109
- run: git config --global user.name "ohif-bot"
@@ -150,12 +136,6 @@ workflows:
150136
- BUILD:
151137
requires:
152138
- CHECKOUT
153-
- FORMAT_CHECK:
154-
requires:
155-
- BUILD
156-
- API_CHECK:
157-
requires:
158-
- BUILD
159139
- TEST:
160140
requires:
161141
- CHECKOUT # TODO: Also require build?
@@ -168,13 +148,17 @@ workflows:
168148
branches:
169149
only:
170150
- main
171-
# - beta
151+
- beta
172152
- BUILD:
173153
requires:
174154
- CHECKOUT
175155
- TEST:
176156
requires:
177157
- CHECKOUT
158+
# - HOLD_FOR_APPROVAL:
159+
# type: approval
160+
# requires:
161+
# - BUILD
178162
- NPM_PUBLISH:
179163
requires:
180164
- BUILD

.eslintrc.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,15 @@
5555
"tsconfigRootDir": "./",
5656
"warnOnUnsupportedTypeScriptVersion": false
5757
},
58-
"ignorePatterns": ["packages/docs", "dist", "**/*_test.js", "**/*_jest.js", "**/*babel*", "**/*.d.ts", "**/*_types.ts"],
58+
"ignorePatterns": [
59+
"packages/docs",
60+
"dist",
61+
"**/*_test.js",
62+
"**/*_jest.js",
63+
"**/*babel*",
64+
"**/*.d.ts",
65+
"**/*_types.ts"
66+
],
5967
"rules": {
6068
"import/no-cycle": ["error", { "maxDepth": 15 }],
6169
// Enforce consistent brace style for all control statements for readability

.github/pull_request_template.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ after the commits are squashed.
7272
- [] My code has been well-documented (function documentation, inline comments,
7373
etc.)
7474

75-
- [] I have run the `yarn build:update-api` to update the API documentation, and have
76-
committed the changes to this PR. (Read more here https://www.cornerstonejs.org/docs/contribute/update-api)
7775

7876

7977
#### Public Documentation Updates

.github/workflows/format-check.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Format Check
2+
3+
on:
4+
pull_request:
5+
branches: [ '*' ]
6+
push:
7+
branches: [ main, beta ]
8+
9+
jobs:
10+
format-check:
11+
timeout-minutes: 30
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
18+
- name: Setup Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: '20.18.1'
22+
cache: 'npm'
23+
24+
- name: Setup Bun
25+
uses: oven-sh/setup-bun@v2
26+
with:
27+
bun-version: latest
28+
29+
- name: Install dependencies
30+
run: bun install
31+
32+
- name: Build dependencies
33+
run: bun run build:esm
34+
35+
- name: Run format check
36+
run: bun run format-check
37+
env:
38+
NODE_OPTIONS: --max_old_space_size=32896

CHANGELOG.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,70 @@
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+
## [3.0.5](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.4...v3.0.5) (2025-03-06)
7+
8+
### Bug Fixes
9+
10+
- **segmentation:** Add segmentation ID requirement for threshold operations ([#1879](https://github.com/cornerstonejs/cornerstone3D/issues/1879)) ([eae9577](https://github.com/cornerstonejs/cornerstone3D/commit/eae957729848d44971050ca40d684dae8f919170))
11+
12+
## [3.0.4](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.3...v3.0.4) (2025-03-05)
13+
14+
### Bug Fixes
15+
16+
- **worker:** should not change type of input ([#1877](https://github.com/cornerstonejs/cornerstone3D/issues/1877)) ([a97effd](https://github.com/cornerstonejs/cornerstone3D/commit/a97effd52abe35eaf532a5634a69b76f932099e7))
17+
18+
## [3.0.3](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.2...v3.0.3) (2025-03-04)
19+
20+
### Bug Fixes
21+
22+
- try to pass the fake version number ([#1873](https://github.com/cornerstonejs/cornerstone3D/issues/1873)) ([06c82fb](https://github.com/cornerstonejs/cornerstone3D/commit/06c82fba65c1cf578eb322642dfe080d39ce0719))
23+
24+
## [3.0.2](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.1...v3.0.2) (2025-03-04)
25+
26+
### Bug Fixes
27+
28+
- **CrosshairsTool:** support HPDI screens in CrosshairsTool ([#1824](https://github.com/cornerstonejs/cornerstone3D/issues/1824)) ([cd299e4](https://github.com/cornerstonejs/cornerstone3D/commit/cd299e40723fb94a6f2568a8008935d8e01ff4f4)), closes [#1822](https://github.com/cornerstonejs/cornerstone3D/issues/1822)
29+
- **segmentation:** resolve variable declaration and null check issues ([#1872](https://github.com/cornerstonejs/cornerstone3D/issues/1872)) ([029966d](https://github.com/cornerstonejs/cornerstone3D/commit/029966d0a3ffc86fa38d3e089d9b0d7d5c105f32))
30+
31+
### Features
32+
33+
- **surface-segmentation:** add visibilty configuration for surface segmentation ([#1846](https://github.com/cornerstonejs/cornerstone3D/issues/1846)) ([e1b5bc6](https://github.com/cornerstonejs/cornerstone3D/commit/e1b5bc646f3997be88ec237f86406c310420379a))
34+
35+
## [3.0.1](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.0...v3.0.1) (2025-02-27)
36+
37+
**Note:** Version bump only for package root
38+
39+
# [3.0.0](https://github.com/cornerstonejs/cornerstone3D/compare/v2.19.16...v3.0.0) (2025-02-27)
40+
41+
### Features
42+
43+
- Cornerstone3D 3.0 ([#1865](https://github.com/cornerstonejs/cornerstone3D/issues/1865)) ([fe65459](https://github.com/cornerstonejs/cornerstone3D/commit/fe654590d16414e76361e1b2826fd64c3734ae87))
44+
45+
# [3.0.0-beta.6](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2025-02-27)
46+
47+
### Features
48+
49+
- Add key image adapters for key image point mark ([#1754](https://github.com/cornerstonejs/cornerstone3D/issues/1754)) ([a1fd3f9](https://github.com/cornerstonejs/cornerstone3D/commit/a1fd3f9d0ea40d53cafd792d59bc1dbfc90663a5))
50+
51+
# [3.0.0-beta.5](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2025-02-25)
52+
53+
**Note:** Version bump only for package root
54+
55+
# [3.0.0-beta.4](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2025-02-25)
56+
57+
**Note:** Version bump only for package root
58+
59+
# [3.0.0-beta.3](https://github.com/cornerstonejs/cornerstone3D/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2025-02-25)
60+
61+
**Note:** Version bump only for package root
62+
63+
# [3.0.0-beta.2](https://github.com/cornerstonejs/cornerstone3D/compare/v2.19.14...v3.0.0-beta.2) (2025-02-24)
64+
65+
### Bug Fixes
66+
67+
- publish beta for 3.0 ([6000ed8](https://github.com/cornerstonejs/cornerstone3D/commit/6000ed8cb2bee031a93fe57eeda81d926ee31240))
68+
- publish beta for 3.0 ([8bf65df](https://github.com/cornerstonejs/cornerstone3D/commit/8bf65df9bec5f52459de1c49c4834b316f680f1b))
69+
670
## [2.19.14](https://github.com/cornerstonejs/cornerstone3D/compare/v2.19.13...v2.19.14) (2025-02-24)
771

872
### Bug Fixes

addOns/externals/polyseg-wasm/CHANGELOG.md

Lines changed: 0 additions & 114 deletions
This file was deleted.

addOns/externals/polyseg-wasm/package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)