Add the ability to merge two different series queries to generate a complete study query result. Provides basic support for other types of merges, but those aren't yet added as full features.
This change makes the OHIF side consistent with the CS3D user calibration settings, and will correctly display px and rounding values consistent with the CS3D display.
There are a couple of changes here which should improve stability of the tests. Hopefully that will be sufficient, but it is difficult to tell for sure if it is complete.
* fix bugs for the RT for the new demo
* fix SM with the static-wado server
* remove thumbnail from tmtv
* migration guide
* fix stability for the rt struct
* apply review comments
* add loading indicator to SM
* pdf works
* try to fix relative bulkData
* fix the rest
* fix preflight for the SM
* fix typo
* apply review comments
* yarn lock
* fix(DicomTagBrowser): Fix parsing problems that was limiting nested tags rendering
* Added a progress indicator when switching to a list of more than 1000 rows.
* Switched to using react-window to virtualize the dicom tag browser window.
* Added filtering to the DICOM tag browser with a new search UI widget.
Lots of tweaks and updates to the look-and-feel.
* Removed unused import.
* PR feedback including some UI tweaks.
* More PR feedback.
---------
Co-authored-by: Igor Octaviano <igor.octaviano@radicalimaging.com>
Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
* fix(command): Added command and hotkey binding for navigate to next and previous display set.
* Centralized the sorting (function) of display sets since at least three
areas sort display sets: hanging protocols, study/thumbnail browser and
updateViewportDisplaySet command.
* Renamed some methods for clarity.
* Scrolling active thumbnail into view for an updateViewportDisplaySet
* Added a null check.
* Added check to minimize thumbnail scrolling.
* fix(Measurement): fixed line dashing of measurements in various scenarios
For a StackViewport simply rely on the SeriesInstanceUID being part of the
tracked measurements or not.
For a VolumeViewport first check the image id of the current image in the viewport
and then check the SeriesInstanceUID (like for a StackViewport) if an id is returned.
To reliably get the id of the current image, listen for the VOLUME_VIEWPORT_NEW_VOLUME event.
* Changes for PR comments.
* fix(Video): Added fallback checks for DICOM video
Added some docs for video, pdf and upload.
* Added separate headings for DICOM PDF, DICOM Video and DICOM Upload in the docs.
* Updated docs for singlepart data source configuration.
* fix(local): should use dicomlocal for localbasic
* chore(github): styling for issues forms
* try to fix netlify
* apply review comments
* apply review comments
- prevent non-cornerstone viewports from showing the image download dialogue
- passing the rendering engine id to ToolGroup.addViewport
- fixed the keep/dismiss aspect feature
* feat(custom displayOptions): add custom options to every level of hanging protocols
* move set preset down to cornerstone3d
* works
* fix tmtv based on new api
* fix unit test
* close
* review1
* upgrade packages
* update packages
* apply review comments
* recursive call
* less copy
* apply review comments
* fix e2e tests
* apply review comments
* revert
* apply review comments
* apply review comments
---------
Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
* fix(dicomlocal): navigate /local to the work list and /localbasic to the (basic) viewer
For TMTV, consider both the forward and back slash separator for modalities.
* Fix to TMTV isValidMode method.
* PR feedback:
- replace forward slashes with back slashes for modalities in the WorkList instead of in the Mode.
* Added query.series to DicomLocalDataSource.
* fix: KO series being displayed in browser list
* fix sr for volume viewports
* move highlight labelmap to RAF
* remove commented code
* fix the hydration bug for the SR
* apply review comments
* revert the key images for sr
* Remove some obsolete changes
* set initial image for sr instead of jump
* Remove viewportType stack
---------
Co-authored-by: Alireza <ar.sedghi@gmail.com>
* fix(Measurements): return {} instead of undefined for getSOPInstanceAttributes
* PR feedback:
- separated measurements from non-acquisition plane
- reverted to previous behaviour of returning undefined in getSOPInstanceAttributes
* Added unit tests for unmapped measurements.
* PR feedback: added comments to the unmappedMeasurement used in the unit tests.
* fix: multiframe
* fix the unnecessary use of prior since some servers dont like it
* add authentication via token in url
* add data citation
* add resources
* upgrade packages
* yarn lock
* apply review comments
Update HangingProtocolService doc to include example and instructions to use custom attributes included in @ohif/extension-test. Example shows usage of sameAs for frame of reference check in tmtv hanging protocol.
* fix(DICOM PDF and Video)
- added retrieve.directURL for local DICOM load data source; it returns a data URL
- fixed various checks for video using transfer syntaxes and SOP class UID with number of frames
- added call to 'rendered' endpoint for those data sources that support it; others get BulkDataURI
* Added DOC (PDF) and OT (for video in particular) to list of non-image thumbnail modalities.
* Fixed broken e2e tests.
* choe(modes, components): improved readability
This commit includes changes to improve performance in the basic-dev-mode and Thumbnail components.
Additionally, a change in the webpack configuration file was made to ignore ".min.js.map" files.
The defaultDataSourceName was also added to several configuration files, and whiteLabeling code was removed
from the local_orthanc configuration file.
* fix(cli): better path management and add dependencies
* better docs
* add default tool group to the templates
* add review comments
* apply review comments
* try to fix test
* fix thumbnail in tests
The description for the numberOfDisplaySetsWithImages property was corrected. The update also involves adding a callback property that returns several objects (matchedViewports, viewportMatchDetails, displaySetMatchDetails) and returning them from the method 'findViewportProtocols'. The refactored code also has better readability.
* fix: Jump to measurement after presentation store
* Fix initial load of DICOM SR
* Fix measurement highlight issues
* Clear measurements changed to array
* Fix merge issues
* PR comments
* Removed unused formatting. Change to single event
* Fix the unit test
* PR review comments
* refactor(viewport): simplify imports, align destructuring
Simplify import statements by removing unused imports, organize existing imports, and align destructured imports consistently across the component.
---------
* feat(DICOM Upload)
OHIF #3297
- DicomWebDataSource.store.dicom now accepts an ArrayBuffer of data sets to store
- DicomWebDataSource.store.dicom now also accepts optional callbacks to track upload and an AbortSignal object to cancel upload
- Added DicomFileUploader class that performs and tracks the upload of a DICOM file
- Added various UI pieces for the upload: DicomUpload, DicomUploadProgress, DicomUploadProgressItem
- ProgressLoadingBar was extracted from LoadingIndicatorProgress so it can be reused
- Modal dialogues can now optionally prevent an outside click from closing the Modal
* Passing an XMLHttpRequest to the dataSource.store.dicom method instead of callbacks and AbortSignal.
Cleanup of various UI pieces to minimize code and increase readability.
* Made the DicomUpload component a customization module exported by the cornerstone extension.
* Exposed a copy of the data source configuration via the IWebApiDataSource interface.
Added dicomUploadEnabled to a data source's configuration.
* Code clean up.
* Upgraded the dicomweb-client version to one that provides the ability to
pass a custom HTTP request. DICOM upload uses that custom HTTP request
to track progress and cancel requests.
* Distinguished between failed and cancelled uploads.
* Allow no selection in the upload dialogue.
Fixed the styling of various progress information so that everything aligns.
* Switched from cornerstone wado image loader to cornerstone dicom image loader for DICOM upload.
* Added special cancelled icon to differentiate from failed.
* Added a bit of spacing between the upload progress bar and percentage.
* Fixed minor issue with upload rejection.
* Performance improvement for cancel all uploads:
- use React memo for each upload item progress (row)
- do not await each request of a cancel all
* Fixed various padding/spacing for the DICOM upload drop zone component.
Changed the border dashing for the DICOM upload drop zone to be a background image gradient.
Added hover and active effects to the 'Cancel All Uploads' text.
* fix: viewportdialoge not appearing in non-tracked viewports
* feat(viewports): Introduce useViewportDialog and remove deprecated API
This commit introduces the `useViewportDialog` hook and replaces the deprecated `viewportDialogApi` with the new `viewportDialogState`. Additionally, the notifications in `OHIFCornerstoneRTViewport` and `OHIFCornerstoneViewport` have been removed. Finally, the `CinePlayer` component now accepts optional parameters.
* fix tests
* feat(cst): Add new command to get nearby annotation tools
This commit adds a new command `getNearbyAnnotation` to the `commandsModule.ts` file that identifies nearby annotation tools excluding Crosshairs and ReferenceLines. It also removes an unused mapping to `Crosshairs` in `initMeasurementService.js` and changes the command run in `findNearbyToolData.ts` to `getNearbyAnnotation`.
* perf(cornerstone): Improve performance by optimizing tools
Removes unnecessary imports to improve app's performance. Changes how annotations are detected on the `commandsModule.js` file by fetching the `isAnnotation` property of the tool instance if available. Updates `CrosshairsTool` and `ReferenceLinesTool` to not be annotations anymore. Adjusts the `localhost` URL ports for the `dcm4chee-arc` service interface on `local_dcm4chee.js` to allow for more efficient server communication.
* feat(cornerstone): Add CornerstoneServices type and ToolGroupService.getToolGroup to get tool group by ID or active viewport
This commit introduces the new CornerstoneServices interface to the code and adds the ToolGroupService.getToolGroup method, which can retrieve a specific tool group by ID or from the active viewport. The older _getToolGroup method has also been removed from commandsModule. When no tool group ID is provided, this method now retrieves the tool group from the currently active viewport with the help of getActiveViewportEnabledElement. Additionally, the required reference to @ohif/core has been removed.
* feat(storybook): Refactor Storybook to use Typescript
This commit updates the Storybook configuration to use Typescript, including renaming `main.js` to `main.ts`, updating `core.builder` and `framework.name` to use `@storybook/builder-webpack5` and `@storybook/react-webpack5`, respectively. The code also adds options to `addon-docs` to enable adding GFM support to the generated docs. Additionally, the commit modifies `staticDir`, removes outdated addons, and makes various devDependencies and PostCSS updates to align with Storybook 7.x.x. Finally, the commit removes some unused code and relocates `Button` and `AboutModal` story files.
* apply review comments
* update yarn lock
* fix(Browser history):
- fixed an NPE when navigating to a different study via the URL
- exposed browser history navigation via a command
* Added documentation for the navigateHistory command.
Moved the history object from UI to viewer.
* feat: initial RT support
* make the segmentation service work with representation data
* feat: make segmentation service work with representations
* fix rtss vis
* fix: rt hydration
* fix the rendering of rt names
* fix imports
* refactor: Modify status and click handling for hydration of RTStructures
Modify status and click handling for hydration of RTStructures by renaming `onPillClick` to `onStatusClick` in `OHIFCornerstoneRTViewport.tsx` and `_getStatusComponent.tsx` files. Also, update initial segmentation configurations in `PanelSegmentation.tsx` and simplify configuration changes and values for segmentation service in `SegmentationService.ts`. Finally, remove console debug in `CornerstoneViewportService.ts`.
* wip for highlighting contours
* refactor rt displayset code
* review code update
* update cornerstone dependencies
* refactor: Update license year, version number, and minor code cleanup
This commit updates the license year in several files, updates the version number in package.json, and contains minor code cleanup in two files.
* add bulkdataURI retrieve for RT
* fix package version
* apply review comments
* apply review comments
* apply review comments
* feat(panels): refactor and streamline segmentation configuration and inputs
Rewrote state hooks and streamlined the configuration input for `PanelSegmentation` to be more verbose and reusable. Included several new input types, including the `InputRange` component which now shows a fixed floating value based on the step provided. The `SegmentationConfig` component now works with dynamic values controlled by `initialConfig`. These changes should improve function usability and make the code more maintainable going forward.
* fix various bugs
* fix contour delete by upgrade cs3d version
* feat(viewport, inputNumber, segmentationConfig, orthanc): Implement minimum and maximum values for input number components, and useBulkDataURI for Orthanc configuration. Compare measurement view planes with absolute viewport view planes in Cornerstone viewport.
* update yarn lock
* fix: Make the cornerstone sR viewport show all measurements
* PR fixes
* PR fixes
* Add a DICOM SR hanging protocol
* Duplicate the hanging protocol for seg as well
* PR requested change
* PR requested changes
* PR fixes plus merge update fixes
* PR fixes and integration test fix
* PR - documentation
* feat: Add a new hanging protocol @ohif/mn
* Add @ohif/seg example
* PR comments and a couple more fixes to make things cleaner
* PR comment
* Added an example to cause the PR checks to rerun
* Use more consistent type/structure for services
* Fix restoring SR so the tests described work
* One more typed service
* Added types for the Cornerstone library
* Couple more type fixes
The sameAs function requires displaySetMatchDetails and displaySets to compare attributes between display sets, but these properties were not being passed into the options object. This commit adds the necessary lines of code to include displaySetMatchDetails and displaySets in the options object, fixing the issue where the custom attribute function 'sameAs' was missing required data.
* feat: Allow navigating to a specified series and sop instance
This was a feature in OHIF v2, so adding it to v3, albeit with new
parameters.
feat: Allow comma separated as well as repeated args params
* docs
* Test fixes
* feat: Navigate to SOP selected - PR fixes
* Updated docs
* PR fixes
* fix: The display of linked viewports during drag and drop has a race
* PR review comments
* fix: Segmentation display two up
* Removing console logs
* Fix the blank viewport can have stuff added to it
* Fix the null name on HP module
* Fix the navigate to initial image
* Fix the nth interleave loader
* Fix the unit tests
* PR comments - docs mostly
* fix: Exception thrown on change displayset after double click
* feat(DoubleClick): double click a viewport to one up and back
Added a toggleOneUp command that puts the active viewport into a 1x1 grid layout
and it toggles out of 'one-up' by restoring its saved 'toggleOneUpViewportGridStore'
from the StateSyncService.
Added double click customization for the Cornerstone extension with the
default double click handling being the toggleOneUp command.
Added a cypress test for the double click functionality.
* PR feedback:
- tracked viewport measurements no longer show as dashed when toggling one up
- disallowed double clicking near a measurement
- updated cornerstone3D dependencies to fix double click of TMTV and volume viewport 3D
- created ViewportGridService.getLayoutOptionsFromState
* Updated the ViewportGridService docs.
* Switched to using 'cornerstoneViewportClickCommands' and consistency with the context menu clicks.
* feat: Allow customizing the measurements panel.
Also includes default display of the site/finding values from the DICOM
SR object.
Update fixes
PR review comments - move the recordInteraction to COmmandsManager.run
PR fixes
fix: Dependency updates to allow right click to be recognized
PR fixes
* Use newer CSWIL
* Make both the base measurements and the tracking measurements show codes
* Fix the right click context menu bringing up menu
* feat: Context menu
feat: Custom context menu
Adding documentation
PR updates
* fix: Capture tool exception
* PR updates
* Add fully worked out examples in the basic test mode/extension
* Fix the menu display
* fix: Make the commands on clicks much more configurable
* Wait for load before double clicking
* docs
* PR changes - nothing functional, just moving things endlessly
* PR comments
* PR changes - rename the default context menu
* Renamed the cornerstoneContextMenu to measurementsContextMenu
* Add chevron right to the sub-menus
* fix: Some residual issues with hanging protocol after state sync
fix: Some issues introduced by the state syncing changes
* fix: PR fixes, mostly code cleanup
* Improve a race condition in an automated test
* Remove obsolete code
* PR fixes
* feat: Add state sync and use it to remember viewport grid info
fix: Version updates
Fixes for toggling MPR mode
Fix the display when the interleaved load module fails
Fix the memory of the state to restore correctly
PR fixes for the state sync service
PR fixes
PR fixes
PR fixes
Added a hack warning to remove volumeDeactivate
Fixes for TMTV colormap setting
Fix the casing
Missed renames
fix: tests not running due to variance in ordering
Reverting some fixes to change case
PR changes - mostly comments and minor improvements
fix: All display sets were being updated on drag and drop
PR fixes - mostly renames
PR fixes
Test support for OHIF, for HP branch
test: Add at least a minimal set of automated tests for hanging protocols
Docs
PR fixes
Merge fixes
DOCS updates
Add an example of the mn hanging protocol
PR fixes
PR fixes
PR fixes
* Fix the drag and drop
PR fixes
* PR changes - update default keys for next/previous stage
* fix: Was storing the custom viewport grid too aggressively
Caused by a PR change misspelling a variable
* feat(SidePanel)
OHIF issue #3135
- Added a method to set a callback for a Panel to invoke when it is ready
to be shown (e.g. its data is loaded).
- Implemented such methods for both the segmentation and measurement panels.
- The SidePanel component now adds a callback to Panel components so that
it will automatically open a Panel that was initially closed and yet to
be opened.
- Updated the OHIF documentation accordingly.
* PR feedback
- added a PanelService that centralized much of the logic that existed in panel PanelModule
- the SidePanel subscribes to PanelService.EVENTS.ACTIVATE_PANEL for each of its child panels
* Removed the PanelMeasurementTableTracking setMeasurementPanelContentReadyCallback method.
* Made the forceActive flag in the PanelService optional and defaulted it to false.
* Fixed failing top level exports unit test.
* - PanelService subscriptions are now per panel (id) so subscribers do not
necessarily need to check the panel id in the event when it is fired
- PanelService activate panel trigger subscriptions are now returned
so that they can be (better) managed outside of the service
- updated/created the various documentation for panels and PanelService
* Clarified various documentation.
Moved the code to add the activate panel triggers out of the extensions
and into the longitudinal mode.
* Removed the openWhenPanelActivated flag.
PanelService now conforms to extending PubSubService like the other services.
Updated various documentation.
* Fixed failing e2e, mpr test.
* Renamed the ActivatePanelTriggers type properties.
The ExtensionManager now sets the id of various modules as a property on each of those modules.
* overlay customization
* custom overlay definition and examples
* minor fix - import statement difference between cornerstone and cornerstone3D
* move "VOI" and "Zoom" calulation to the ViewportOverlay component, make OverlayItem fairly dull
* type specifications
* follow up fixes for CustomizationService changes on upstream
* [fix] various fixes related to custom overlays (formatting, toggling)
* [fix] various fixes related to custom overlays (formatting, toggling)
* right side overlay panels - align right
* [fix] remove "notification" from toggleOverlay command
* comments
* [refactor] remove unused imports
* documentation of customizable overlay configuration
* prettify
* review of documentation of customization service
* fix useCallback() dependencies
* fix useCallback dependencies
* documentation for customization service
* documentation for customization service
* Add CT volume in PET ROI Thresholding (#3053)
* Add CT volume in PET ROI Thresholding
* Change UI ROI Threshold config
* Refactoring ROI Threshold configuration Panel
* fix menus
* try to fix build preview
* try to fix build preview
---------
Co-authored-by: rodrigobasilio2022 <114958722+rodrigobasilio2022@users.noreply.github.com>
* feat(ViewportActionBar): OHIF issue #3123 (#3186)
* feat(ViewportActionBar): OHIF issue #3123
- Renamed previous viewport action bar to be LegacyViewportActionBar
- Components LegacyViewportActionBar depends on also renamed: LegacyCinePlayer and LegacyPatientInfo
- New Viewport coded to specs in issue
- added React hook useResizeObserver
- added some tailwind classes
* Updated tailwind to 3.2.7.
Put external imports like React at the top of the import list.
* feat(CinePlayer and ViewportActionBar) (#3198)
* feat(CinePlayer and ViewportActionBar)
- OHIF issue 3123
- new look cine control implemented
- new custom blue color in tailwind config for various hover backgrounds in the cine control
- new icons added for cine
- Tooltip component now can be placed top (center) on hover
- Tooltip component border colour now consistent with specs
- fixed NPE in ViewportActionBar
- upgraded tailwind to 3.2.7 in platform/ui
- fixed issues in various button components brought by tailwind 3.2.7 where classes now need important flag
- fixed issue with InputRange component so that the tracked value property can change externally
- InputRange component can now optionally show its label
- added new measurement tracking state service to hydrate SR without prompting
- segmentation can also now be hydrated without prompting
* PR feedback:
- cine centralized to OHIFCornerstoneViewport
- introduced a type for the CinePlayer properties
* Addressed PR comments and concerns...
The DOM ref for the root component of the ViewportActionBar is now added to state
so that the various callbacks and ResizeObserver are updated with it.
The CinePlayer FPS slider tooltip was moved up so that its arrow does not
intersect the FPS text.
The hover area for the CinePlayer slider tooltip is now the FPS < > buttons and text.
The tracked measurements are now filtered to only include those of the active
viewport series when the tracked measurement navigation arrows are used.
* Addressed PR comments...
The update to tailwind 3.2.7 caused several look-and-feel, UI regressions,
so we are rolling back to 3.2.4.
* tests: add various e2e tests for MPR and measurements
wip
add cypress config
feat: add mode and extension for testing
add hp applied through search params
add MPR tests
apply review comments
add more e2e tests
update yarn lock
* fix unit tests failing
- formatPN should accept a string person name as well as an object with a Alphabetic field.
- For DICOM JSON data sources, spread in the patient data from the study object into the instance.
* fix(ViewportGrid): In ViewportGrid, fill blank viewports with display sets not yet in grid.
ViewportGridService now allows off-screen viewports to remain so that
so as to maintain continuity if they were filled by the UI/user.
* PR feedback: moved getNumViewportPanes into the ViewportGridService API.
* PR feedback:
- renamed some variables
- proper import/export of IDisplaySet
- added some comments for clarification
- fixed broken e2e tests
* Some missed rename of Services.
