Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: V0.24.0dev #311

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f0f615e
Work in progress
CPBridge Jun 12, 2023
b976b2d
Add dimension indexing logic and frame loop, add tests
CPBridge Jun 13, 2023
4036b6b
Fix bits allocated bug
CPBridge Jun 14, 2023
5132d61
Fix building luts
CPBridge Jun 14, 2023
d356d35
Use frame label to index for labelmaps without frame of reference
CPBridge Jun 14, 2023
ef3696c
fixes after rebase
CPBridge Jan 28, 2024
9e6c376
Remove trailing whitespace
CPBridge Jan 28, 2024
2c7d9b8
Add labelmap to tiled tests, fixes
CPBridge Jan 28, 2024
eca9902
Add labelmap tiled_full test
CPBridge Jan 28, 2024
1d442f3
Update to allow providing a Palette color LUT or using MONOCHROME2
CPBridge Jan 30, 2024
f2bdc40
Style fixes
CPBridge Jan 30, 2024
49372ea
Fix failing LUT test
CPBridge Jan 30, 2024
4f4db40
Add import skipping
CPBridge Jan 31, 2024
de5667f
Fixes for 16bit and palette color LUTs
CPBridge Feb 1, 2024
081533f
Test fix for palette color LUT
CPBridge Feb 1, 2024
5d77c95
Add padding to ensure even LUT
CPBridge Feb 1, 2024
65eaf3b
Add coordinate for Measurement in SR
Fedalto Sep 26, 2024
8bf2a24
Merge branch 'master' into feature/labelmap
CPBridge Sep 30, 2024
acd1d8b
Linter fixes
CPBridge Sep 30, 2024
5256f8e
Add import skips in labelmap tests
CPBridge Sep 30, 2024
32c5c70
Misc tidy-ups
CPBridge Oct 2, 2024
73452a1
fix import style
Fedalto Oct 3, 2024
ab6bb55
Add `Measurement.referenced_coordinates` parameter
Fedalto Oct 3, 2024
867cee4
Add `purpose` parameter to CoordinatesForMeasurement.__init__
Fedalto Oct 3, 2024
81dd8fb
Change `SourceImageForRegion` concept name to `codes.SCT.Source`
Fedalto Oct 3, 2024
37e21c1
Add new labelmap segmentation UID
CPBridge Oct 4, 2024
764d19d
Add pixel padding value
CPBridge Oct 4, 2024
9f6d673
Only allow coordinates in measurements in `MeasurementsAndQualitative…
Fedalto Oct 3, 2024
602c91b
Update for DICOM standard 2024c
CPBridge Oct 4, 2024
002355e
Added display color to segment description
CPBridge Oct 4, 2024
10e34eb
Add background segment description
CPBridge Oct 4, 2024
73b289e
Generalize segment number logic
CPBridge Oct 4, 2024
33d586f
Linter fixes
CPBridge Oct 4, 2024
74fb560
Merge pull request #234 from ImagingDataCommons/feature/labelmap
CPBridge Oct 4, 2024
f97fe3a
Add `CoordinatesForMeasurement3D`
Fedalto Oct 15, 2024
1012fad
Change casting to use `cls`
CPBridge Oct 19, 2024
3aca8ff
Favour CoordinatesForMeasurement3D over Scoord3DContentItem
CPBridge Oct 19, 2024
ded30b1
Merge pull request #307 from Fedalto/add-coordinates-measurements-sr
CPBridge Oct 19, 2024
93d5d36
Test and lint fixes
CPBridge Oct 19, 2024
a824441
Add support and tests for python 3.13
CPBridge Oct 20, 2024
fdf564f
Add icc profiles as package data
CPBridge Oct 20, 2024
afcd403
Run workflow on any PR targeting a dev branch
CPBridge Oct 20, 2024
fb09294
Fix find package location
CPBridge Oct 20, 2024
80f1d61
Fix package data
CPBridge Oct 20, 2024
de73f6b
Merge pull request #312 from ImagingDataCommons/python_3.13
CPBridge Oct 20, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/run_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [ "master", "v*dev" ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
dependencies: [".", "'.[libjpeg]'"]

steps:
Expand Down
6 changes: 0 additions & 6 deletions MANIFEST.in

This file was deleted.

7 changes: 6 additions & 1 deletion bin/create_iods_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@ def _create_modules(directory):
except KeyError:
logger.error(f'keyword not found for attribute "{tag}"')
continue
try:
kw_path = [dictionary_keyword(t) for t in path]
except KeyError:
logger.error(f'keyword in path of attribute "{tag}" not found')
continue
mapping = {
'keyword': keyword,
'type': item['type'],
'path': [dictionary_keyword(t) for t in path],
'path': kw_path,
}
modules[item['moduleId']].append(mapping)
return modules
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Requirements
Installation
------------

Pre-build package available at PyPi:
Pre-built package available at PyPi:

.. code-block:: none

Expand Down
7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Multimedia :: Graphics",
"Topic :: Scientific/Engineering :: Information Analysis",
]
Expand Down Expand Up @@ -62,6 +63,12 @@ homepage = "https://github.com/imagingdatacommons/highdicom"
documentation = "https://highdicom.readthedocs.io/"
repository = "https://github.com/ImagingDataCommons/highdicom.git"

[tool.setuptools.packages.find]
where = [ "src" ]

[tool.setuptools.package-data]
highdicom = [ "**/*.icc" ]

[tool.pytest.ini_options]
minversion = "7"
addopts = ["--doctest-modules", "-ra", "--strict-config", "--strict-markers"]
Expand Down
Loading
Loading