fix(markerlabelmap): accept preview/reject preview not working when the marker annotation tools are active#5101
Merged
wayfarer3130 merged 3 commits intomasterfrom Jun 10, 2025
Merged
Conversation
✅ Deploy Preview for ohif-dev ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Member
Author
|
This is not the cleanest fix in the world, but we can remove once there's a better system for this in place |
Viewers
|
||||||||||||||||||||||||||||
| Project |
Viewers
|
| Branch Review |
fix/markerlabelmap
|
| Run status |
|
| Run duration | 02m 15s |
| Commit |
|
| Committer | Bill Wallace |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
Failures
|
0
|
Flaky
|
0
|
Pending
|
0
|
Skipped
|
0
|
Passing
|
37
|
| View all changes introduced in this branch ↗︎ | |
Contributor
|
@IbrahimCSAE - could you add a description of how to test this? I think I see it, but would like to know exactly what you are seeing. |
Member
Author
On the other hand, it works fine here: https://www.cornerstonejs.org/live-examples/samclientside If you press enter it will accept the preview as expected, the reason for this is that its called more directly here. |
IbrahimCSAE
commented
Jun 5, 2025
wayfarer3130
reviewed
Jun 6, 2025
Contributor
|
@IbrahimCSAE - are you able to update the PR as requested? |
Member
Author
Yes I haven’t had free time yet go get back to this. I’ll try today. |
Member
Author
It's done, should be good now. |
wayfarer3130
approved these changes
Jun 10, 2025
WillianVarela
added a commit
to cfaz-net/dicomviewer
that referenced
this pull request
Nov 10, 2025
* chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: e2e playwright tests runnigns (OHIF#5070) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(Customization): Fixed incorrect events broadcast (OHIF#5075) Co-authored-by: Dan Elkis <dan.elkis@signalpet.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(ui): Prevent unintended text selection and improve component behavior (OHIF#5077) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: create memo when manually adding and removing annotations (OHIF#5051) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * docs: Fixed incorrect documentation and variables names (OHIF#5080) Co-authored-by: Dan Elkis <dan.elkis@signalpet.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation): Allow for debounced pub/sub events to be reliably cancelled when unsubscribed to. (OHIF#5092) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(tmtv): Corrected the various section names being referenced. (OHIF#5093) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(touch): Allow for multi-touch in OHIF (OHIF#5099) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(WindowLevelActionMenu): The window level menu must show different contents for 3D volume viewports (OHIF#5113) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * docs: improved migration guides for 3p10 (OHIF#5110) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(touch): Prevent touch drag to refresh the browser page. (OHIF#5108) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(markerlabelmap): accept preview/reject preview not working when the marker annotation tools are active (OHIF#5101) Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: data-viewportId name is illegal, renamed to data-viewportid (OHIF#5121) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(commandsModule): Enhanced flipViewport and rotateViewport commands (OHIF#5065) Co-authored-by: Dan Elkis <dan.elkis@signalpet.com> * fix(ToolbarService): Fixed removeButton bug for removing buttons inside sections (OHIF#5123) Co-authored-by: Dan Elkis <dan.elkis@signalpet.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps): bump tar-fs from 2.1.2 to 2.1.3 (OHIF#5096) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(hp): When reapplying an hp the display set selectors should be considered. (OHIF#5074) Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(getToolbarModule): fix enabled state of image slice sync (OHIF#5136) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(UnitTest): run was failing due to JS tests importing TS modules (OHIF#5145) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(action-corners): check hideWhenDisabled at both the evaluator and prop levels (OHIF#5149) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps): bump pbkdf2 from 3.1.2 to 3.1.3 (OHIF#5152) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump webpack-dev-server from 4.7.3 to 5.2.1 (OHIF#5114) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> Co-authored-by: Joe Boccanfuso <109477394+jbocce@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: Ultrasound Pleura B-line Annotation Mode & Extension (OHIF#5061) * test(MeasurementPanel): Converted MeasurementPanel interaction tests from cypress to playwright (OHIF#5153) * feat(toolbar/hokeys): add pub sub events to hotkeys manager class, subscribe toolbar to hotkeys pressed event (OHIF#5157) * fix(build): BUILD_PACKAGES_QUICK PR check (OHIF#5160) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(unit-tests): Update bun.lock to fix unit tests. (OHIF#5159) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps-dev): bump webpack from 5.89.0 to 5.94.0 in /modes/usAnnotation (OHIF#5156) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(labelmap): Add labelmap segmentation in OHIF (OHIF#5158) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps-dev): bump webpack from 5.89.0 to 5.94.0 in /extensions/usAnnotation (OHIF#5162) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps): bump webpack to 5.95.0 (OHIF#5163) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation): Changes to fix problems with non hydrated/loaded segmentations to be viewable when switching hanging protocols (e.g. MPR) (OHIF#5139) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(hp): add onStageChange callback (OHIF#5165) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation): Added support for unhydrated RTSTRUCT in MPR. Added support for overlaying segmentations over display sets the segmentations do not reference. (OHIF#5168) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: Add possibility to add additional props for PanelSection (OHIF#5172) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore: recovery 2 (OHIF#5014) merge to 3.11 (OHIF#5175) Co-authored-by: Alireza <ar.sedghi@gmail.com> Co-authored-by: Dan Rukas <dan.rukas@gmail.com> Co-authored-by: Tang Cheng <45505657+tctco@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: add force to remove image from cache (OHIF#5176) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(overlay-menu): Adding, changing and removing segmentation overlays should update the overlay menu instantly (OHIF#5181) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(labeling): measurement labeling dialog was overwriting the entire measurement and breaking it (OHIF#5095) * fix(measurement-group): use measurment study uid instead of active study uid (OHIF#5091) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: add segment label tool (OHIF#5164) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation overlays): Allow for the addition of multiple segmentation overlays. (OHIF#5189) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(rendering): Introduce SequentialRenderingEngine to resolve canvas size limitation, performance degradation on high res monitors and enhance multi-monitor support (OHIF#5195) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(security): Patch for Babel vulnerability (OHIF#5193) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: group clear measurements history (OHIF#5194) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(rendering): Introduce WebGLContextPool for parallel rendering in ContextPoolRenderingEngine (OHIF#5196) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: exception in newly added segmentations (OHIF#5198) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(UnitTests): Fixing "Cannot find module @cornerstonejs/core" error while running unit tests (OHIF#5148) * ui(icons): Adds action and helper icon artwork for segmentation (OHIF#5200) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: enhance preview accept method (OHIF#5199) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(UI): Restored the scroll bar OHIF L&F (OHIF#5202) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(viewport): Enhance Orientation Menu with Reformat Option and UI Improvements (OHIF#5184) Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> Co-authored-by: Alireza <ar.sedghi@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(panels): Allow for setting the initial and minimum expanded widths of each side panel. (OHIF#5207) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation): Removed LOAD/hydrate button for segmentation overlays (OHIF#5214) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(TMTV): The TMTV CSV file now has the correct name and contents (OHIF#5215) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(segmentation): Fix segmentationid undefined 5106 (OHIF#5107) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(DicomUpload): Fix upload form and some scrollbars styles (OHIF#5125) * fix(black-viewports): MPR viewports were turning black if their parent stack had it's properties reset (OHIF#5219) * fix(viewportgrid): don't subscribe to duplicate event listeners (OHIF#5218) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: image slices are displayed in reverse order, if we switch from common layout to 2D MPR (OHIF#5022) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(multimonitor): Study browser more menu fixes (OHIF#5208) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: labelmap init (OHIF#5228) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(security): Pin eslint-config-prettier and eslint-plugin-prettier versions. (OHIF#5234) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(docs): Added entry for the showStudyList configuration setting. (OHIF#5235) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat(segmentation): Add customization for handling missing referencedDisplaySetInstanceUID for the SEG/RTSTRUCT. (OHIF#4983) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps): bump form-data from 4.0.3 to 4.0.4 (OHIF#5244) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> Co-authored-by: Joe Boccanfuso <109477394+jbocce@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(docs): Added docs for multimonitor and local linking (OHIF#5247) * fix(security): Removed stylus package due to potential security vulnerability and we don't use it. (OHIF#5250) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(ViewportOrientationMarkers): round rotation to fix floating point issue (OHIF#5135) Co-authored-by: Joe Boccanfuso <109477394+jbocce@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: disable seg download/export buttons until a user has drawn something (OHIF#4953) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(calibration): do not override user set calibration (OHIF#5231) Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore(deps): bump axios from 1.10.0 to 1.11.0 (OHIF#5252) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * Handle 200 status response and add default error handling (OHIF#5227) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: issue introduced from PR 5022 (OHIF#5223) Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * Fix flaky SEGDataOverlayForUnreferencedDisplaySetNoHydration test. (OHIF#5254) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(ArrowAnnotate): Allow free-form text for arrow annotations (OHIF#5259) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix: prevent failure in DICOM loader for wadouri type (OHIF#5260) Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(tooltips): tool tips should be portals (OHIF#5265) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * test(SegmentationPanel): add test for jump to center of segments from PACS and basic add, rename, delete from panel (OHIF#5262) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(multiframes): Corrected combining frame instances for multiframes. (OHIF#5264) * fix: null save voi range properties (OHIF#5268) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(colorbar): Allow for `AdvancedRenderingControls` to be placed at the top or bottom of the viewport. (OHIF#5270) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(colorbar): Allow for AdvancedRenderingControls to be placed at the left or right of the viewport. (OHIF#5273) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: improve segment label (OHIF#5217) Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * Adds containsAll validator (OHIF#5279) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * feat: add support to scoord3d (OHIF#5016) Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * fix(annotation): Add command to show pleura percentage in USAnnotationPanel and update condition for BLinePleuraPercentage (OHIF#5297) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore: release 3p11 * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] * chore: 3.11 Recovery 1 (OHIF#5514) * chore(version): version.json [skip ci] * chore(version): Update package versions [skip ci] --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: ohif-bot <danny.ri.brown+ohif-bot@gmail.com> Co-authored-by: Alireza <ar.sedghi@gmail.com> Co-authored-by: Dan <12800016+rinslow@users.noreply.github.com> Co-authored-by: Dan Elkis <dan.elkis@signalpet.com> Co-authored-by: Pedro Köhler <pedrokohlerbh@gmail.com> Co-authored-by: Joe Boccanfuso <109477394+jbocce@users.noreply.github.com> Co-authored-by: Ibrahim <93064150+IbrahimCSAE@users.noreply.github.com> Co-authored-by: Bill Wallace <wayfarer3130@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Patrick Wespi <pwespi@pm.me> Co-authored-by: Vinícius Alves de Faria Resende <viniciusfariaresende@gmail.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com> Co-authored-by: rodrigobasilio2022 <114958722+rodrigobasilio2022@users.noreply.github.com> Co-authored-by: dxlin <dxlin@users.noreply.github.com> Co-authored-by: Celian-abd <101793092+Celian-abd@users.noreply.github.com> Co-authored-by: Dan Rukas <dan.rukas@gmail.com> Co-authored-by: Tang Cheng <45505657+tctco@users.noreply.github.com> Co-authored-by: Salim Kanoun <salim.kanoun@gmail.com> Co-authored-by: Vishnu Suresh Perumbavoor <63797249+vishnusureshperumbavoor@users.noreply.github.com> Co-authored-by: Alexey Klimovich <alexeyklimovich@gmail.com> Co-authored-by: arul-trenser <arul.mozhi@trenser.com> Co-authored-by: Teo Udovčić <65370281+deepnothing@users.noreply.github.com> Co-authored-by: MatheusRdk <119511463+MatheusRdk@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: Mateus Cota <mateus.cota@cfaz.net> Co-authored-by: Will <70962569+WillianVarela@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context
The preview accept/reject functionality wasn't working properly for MarkerLabelmap tools. When MarkerInclude or MarkerExclude was the active tool, the corresponding MarkerLabelmap tool would be in passive mode and get
filtered out from preview actions.
Added logic to include passive MarkerLabelmap tools when their associated marker tools (MarkerInclude/MarkerExclude) are active in the same tool group. This ensures preview actions reach all relevant tools regardless
of their current mode state.