Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/container-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,20 @@ jobs:

- name: Test web page
run: |
curl -sI http://localhost:8008/ | grep -o '200 OK'
curl -s http://localhost:8008/ | grep -o '<title>Slim</title>'
# Poll: compose returns as soon as the container process starts,
# before nginx is listening (same flake as a bare curl right after up).
for i in $(seq 1 30); do
if curl -sI http://localhost:8008/ | grep -q '200 OK' \
&& curl -s http://localhost:8008/ | grep -q '<title>Slim</title>'; then
echo "Slim web page ready"
exit 0
fi
sleep 2
done
echo "Slim web page did not become ready in time"
docker compose ps || true
docker compose logs --tail=80 app || true
exit 1

- name: Test DICOMweb service
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-to-firebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
cache: pnpm

- name: Install dependencies
run: pnpm install --frozen-lockfile --ignore-scripts
# Dependency build scripts are gated by allowBuilds in pnpm-workspace.yaml.
# The git-hosted dicom-microscopy-viewer needs its prepare script to build dist/.
run: pnpm install --frozen-lockfile

Check warning on line 41 in .github/workflows/deploy-to-firebase.yml

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Omitting "--ignore-scripts" allows lifecycle scripts to run during package installation.

See more on https://sonarcloud.io/project/issues?id=ImagingDataCommons_slim&issues=AZ_Zcc0gEAb1sO3FlLY-&open=AZ_Zcc0gEAb1sO3FlLY-&pullRequest=410

- name: Build
run: REACT_APP_CONFIG=preview PUBLIC_URL=/ pnpm run build
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-to-github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
cache: pnpm

- name: Install dependencies
run: pnpm install --frozen-lockfile --ignore-scripts
# Dependency build scripts are gated by allowBuilds in pnpm-workspace.yaml.
# The git-hosted dicom-microscopy-viewer needs its prepare script to build dist/.
run: pnpm install --frozen-lockfile

Check warning on line 40 in .github/workflows/deploy-to-github-pages.yml

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Omitting "--ignore-scripts" allows lifecycle scripts to run during package installation.

See more on https://sonarcloud.io/project/issues?id=ImagingDataCommons_slim&issues=AZ_Zcc0SEAb1sO3FlLY9&open=AZ_Zcc0SEAb1sO3FlLY9&pullRequest=410

- name: Build
run: pnpm run predeploy
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
cache: pnpm

- name: Install dependencies
run: pnpm install --frozen-lockfile --ignore-scripts
# Dependency build scripts are gated by allowBuilds in pnpm-workspace.yaml.
# The git-hosted dicom-microscopy-viewer needs its prepare script to build dist/.
run: pnpm install --frozen-lockfile

Check warning on line 37 in .github/workflows/unit-tests.yml

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Omitting "--ignore-scripts" allows lifecycle scripts to run during package installation.

See more on https://sonarcloud.io/project/issues?id=ImagingDataCommons_slim&issues=AZ_ZccxEEAb1sO3FlLY8&open=AZ_ZccxEEAb1sO3FlLY8&pullRequest=410

- name: Lint
run: pnpm run lint
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ _Slim_ also supports interactive visualization of image annotations and analysis
- [DICOM Segmentation](https://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_A.51.html) instances that contain binary or fractional segmentation masks
- [DICOM Parametric Map](https://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_A.75.html) instances that contain saliency maps, attention maps, class activation maps, and similar derived images

Fractional segmentations and parametric maps show an in-viewport color legend when at least one overlay is visible. The legend is collapsible and its per-item visibility toggles stay in sync with the switches in the right-hand panel.

| | DICOM IOD |
| :-: | :-------- |
| <img src="docs/screenshots/IDC_CPTAC_C3N-01016-22_segmentation.png" alt="IDC CPTAC Segmentation" width="350"> | Segmentation |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"classnames": "^2.2.6",
"dcmjs": "^0.35.0",
"detect-browser": "^5.2.1",
"dicom-microscopy-viewer": "^0.48.22",
"dicom-microscopy-viewer": "github:ImagingDataCommons/dicom-microscopy-viewer#03b4732f05fb7d02b6247e2d75e69c73ab5c88ff",
"dicomweb-client": "0.10.3",
"oidc-client": "^1.11.5",
"ol": "^10.7.0",
Expand Down
12 changes: 7 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ strictPeerDependencies: false
allowBuilds:
core-js: true
core-js-pure: true
# Allow the git-hosted dicom-microscopy-viewer to run its prepare script,
# which builds dist/ when installed from a commit tarball. pnpm matches
# git-hosted packages by their exact tarball URL, so this entry must be
# updated whenever the dependency pin in package.json changes.
dicom-microscopy-viewer: true
'dicom-microscopy-viewer@https://codeload.github.com/ImagingDataCommons/dicom-microscopy-viewer/tar.gz/03b4732f05fb7d02b6247e2d75e69c73ab5c88ff': true


overrides:
'@types/d3-dispatch': 3.0.6
Expand Down