Commit Graph

786 Commits

Author SHA1 Message Date
Bill Wallace
b7fff77e17
fix(segmentation): failing to render SEG because it was on default tool group (#3222)
* fix: Segmentation service fixes for secondary volumes

* Remove toolgroupID in promptSeg
2023-03-10 13:57:23 -05:00
Joe Boccanfuso
5670a4d8d1
feat(PanelService): Left or right side panel to auto start as closed but auto open when needed (#3212)
* 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.
2023-03-09 22:30:09 -05:00
Alireza
38d452e17d
feat(measurementService): use the new api for annotation manager in cs3d (#3206)
* fix OHIF to use the new api for annotation manager in cs3d

* bump package versions

* fix tests

* remove unnecessary code
2023-03-02 17:11:51 -05:00
Joe Boccanfuso
35d0787211
feat(ViewportActionBar and CinePlayer): Add new design for action bar and cine player (#3204)
* 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.
2023-02-28 15:57:19 -05:00
Alireza
9b3f2e6638
chore: bump vtk version to fix rendering bug (#3192) 2023-02-22 21:51:33 -05:00
Bill Wallace
67fc3f733d
feat(SR): Measurement adapter mappings and save to same series (#3140)
* feat: Add adapter mappings for RectangleROI and Angle and save same

PR comments

* fix: Rehydrate check on non core measurement adapters
2023-02-17 16:44:21 -05:00
Alireza
926290f69e
feat: add more e2e tests for MPR and add test mode and extension (#3180)
* 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
2023-02-17 15:04:07 -05:00
Joe Boccanfuso
ae4183852f
fix: Patient name handling as either Alphabetic object or simply string object
- 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.
2023-02-16 13:50:59 -05:00
Joe Boccanfuso
f791a4cafb
fix(ViewportGrid) fill blank viewports with display sets not yet in grid. (#3154)
* 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.
2023-02-14 10:01:39 -05:00
Bill Wallace
8af0362d12
fix(typescript): rename services to fix typescript (#3165)
* fix: Rename services to lower camel case, hp, measure

* fix: Rename DisplaySetService instances to displaySetService

* fix: Rename CornerstoneViewportService to lower camel case

* fix: Added lower case segmentationService rename

* rename other services (#3166)

* rename uiDialogService

* rename toolGroupService

* rename uiNotificationService

* rename viewportGridService

* rename syncGroupService

* rename CornerstoneCacheService

* Fix a syntax error in hotkeys

* Fix a couple of rename issues that were missed

---------

Co-authored-by: Alireza <ar.sedghi@gmail.com>
2023-02-10 16:46:09 -05:00
Leonardo Campos
8edd4ec054
fix(SR): fix Length and Bidirectional tools (#3143) 2023-02-05 21:03:19 -05:00
Bill Wallace
980b44f18c
fix(misc): Update the data source name, provide a /datasources example customization for debug (#3036)
* fix(misc):Update the data source name, provide  a /datasources

Update the imports for a few things to match, to avoid 2 versions

Fix the datasources name

pr:Make the data source selector configurable

* Updated data source selector page as requested

* PR fixes
2023-02-03 16:56:27 -05:00
Alireza
123e3a569b
fix(Segmentation): bump packages to fix segmentation rendering (#3138)
* add test mode

* bump packages

* add reference lines

* update yarn lock

* fix netlify build

* fix num workers

* update year in doc
2023-02-03 09:33:28 -05:00
Joe Boccanfuso
58ae8690a7
fix: Clicking on measurement should highlight the measurement row in the measurement panel OHIF-433 (#3111)
* fix: OHIF-433 Clicking on measurement should highlight the measurement row in the measurement panel

Added selected flag to each OHIF measurement.
Listening to CS3D ANNOTATION_SELECTION_CHANGE to keep the selected flag in sync.

* fix: OHIF-433 Clicking on measurement should highlight the measurement row in the measurement panel

Fixed broken unit tests.

* PR feedback from Alireza:
- use MEASUREMENT_UPDATED event for selection changed
- added TODO to eventually have CS3D introduce the selected flag per annotation
- added MeasurementService._publishEvent

* PR feedback: now using _broadcastEvent
2023-01-13 13:57:18 -05:00
Joe Boccanfuso
a997198587
fix: app-config settings are ignored in OHIF v3 (#3114)
* fix: app-config settings are ignored in OHIF v3
github issue #3051

Remove default route from baked in routes if showStudyList is false.

* fix: app-config settings are ignored in OHIF v3
github issue #3051

PR feedback - simply remove default route from the baked in routes.

* fix: app-config settings are ignored in OHIF v3
github issue #3051

PR feedback - updated CS3D tools version
2023-01-12 16:38:12 -05:00
Alireza
1d1b33224a
feat: use wadors instead of streaming wadors for volume loading (#3109) 2023-01-11 07:19:27 -05:00
Joe Boccanfuso
ac90df356e
fix: OHIF-386 Disable Export and Create Report buttons if there are no tracked measurements (#3102)
Use the disabled Button component variant when no tracked measurements are present.
Made the buttons look as per the spec.

Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
2023-01-09 12:19:48 -05:00
Bill Wallace
9a03bde0ae
Fix/sr hydration non tracking (#3080)
* fix:DICOM SR hydration - remove redundancies

feat:Allow save and restore on non-tracking view

* PR comments
2022-12-29 10:13:06 -05:00
Alireza
42dca11ae3
fix: various bugs with v33 re cine and colors (#3052)
* fix various bugs

* feat: initial work for debug page

* change throw to console error for color lookup table

* update packages

* apply review

* apply review comments
2022-12-05 09:53:59 -05:00
Bill Wallace
daa56a8449
feat(CustomizationService):Add a customization service (#2984)
* feat(customization):Add a customization service

Update UICustomizationService to v3-stable.

Also, adds an example customization for tab colors

* moved the customization service to ui category
2022-11-24 16:28:10 -05:00
Alireza
32bb7e4c1e
fix: sr module and add URL docs (#3034)
* fix sr module and add docs

* bump version
2022-11-23 11:43:46 -05:00
Alireza
87eab39768
fix: remaining bugs for MPR and toolbar icon colors (#3026)
* feat: warn for overlapping segments

* fix: typo

* refactor mpr toggle and stack sync

* fix: wip for more general mpr

* fix: tool groups for mpr

* fix: changing of viewport id

* fix: viewport Id for the seg viewports

* fix

* update cornerstone version
2022-11-21 10:44:19 -05:00
Alireza
83ea228d86
feat: Add DICOM SEG support and MPR, referenceLines and StackSync and more (#3015)
* feat: add initial sop class handler for SEG

* feat: move segmentation service

* update segmentation service methods

* fix: viewport data structure

* feat: Add initial render for the DICOM SEG for each displaySet

* fix: various wrong architectural dependencies between services

* feat: initial separate SEG display in each viewport

* feat: refactore viewport action bar

* initial work for SEG hydration

* fix: various bugs regarding drag and dropping different viewports

* fix: rendering issues for multiple seg displaysets

* fix: bugs for thumbnail and hydration

* feat: fix the initial segment color

* update after rebase

* feat: initial design for the segmentation group table

* feat: initial new design for the segmentation panel

* feat: segmentation panel

* feat: make segmentation appear on all related viewports

* fix: segmentation load bug based on functional groups

* initial work for segmentation crosshairs

* fix: various stylings and functionality

* fix: various stylings for the seg panel

* fix: overflow styles

* feat: add more ui components

* feat: added segmentation config

* feat: add jump to segment

* feat: add jump to segment for DICOM SEG viewport

* fix: bugs after rebase

* feat: jump in segmentation viewport

* fix: mpr support for seg

* feat: add more icons

* feat: new icons

* feat: add new side panel

* feat: add segmentation config

* feat: add loading indicator to ohif

* feat: make hanging protocols follow matching rules for viewports

* feat: enhance drag and drop to be hanging protocol aware

* fix: mpr restore previous layout

* fix: crosshairs toggle

* fix: add auth headers to the dicom loader via dicomwebclient

* fix: bug for crosshairs toggle in mpr

* fix: seg viewport reusing old toolGroup

* feat: add loading animation with lottie

* fix: various bugs for Segmentation hydration in mpr

* feat: change outline alpha to outline opacity

* feat: loading indicator for seg viewport

* fix: various segmentation group styles

* fix: local mode for seg

* feat: add animation for the highlight

* fix: loading indicatro to show segment indices

* feat: enhance modality drop down ui

* fix: panels

* fix: download form

* fix: layout shift in loading indicator

* fix: loading indicator to have correct values

* fix: update software number

* fix: image jump between MPR and default

* fix: segmentation cleanup and cine service cleanup

* fix: segmentation toolgroup clena up

* fix: highlight interval should not trigger again

* fix: issue with multiframe sorting

* rename: change onSeriesChange to onArrowsClick

* fix: buttons for tmtv and layout shift

* fix: various bugs wrt crosshairs

* fix: crosshairs re init on reset camera

* fix: middle slice calculation different from cs middle reset camera

* fix: reset camera should reset viewport camera

* fix: loading segments in MPR mode

* fix: tmtv hp back to before

* fix: layout shift

* feat: orientation markers for volume viewport

* fix: capture for volume viewports

* fix: memory leak for back to worklist

* fix: loading bar bg color

* fix: side panel for only one panel

* fix: react select style in production

* fix: various styling for segmentation groups

* fix: various ui styles

* feat: add new segmentation config styles

* fix: hover state for segmentation item

* fix: side panel layout shift

* temp add panels

* try to fix scrollbar for thimbnail

* fix: scroll not appearing for side panels

* feat: changed styles for scrollbar

* feat: add cpu fallback warning

* fix: webworker destroy

* fix: select styles

* fix: orientation marker color and position

* fix: capture screenshot for volume viewports

* fix: hide segment visibility on mpr

* fix: reloading an already loaded seg displayset

* feat: add is equal

* fix: mpr jump to measurements

* apply review comments

* fix: optimization for the segmentation load

* fix: remove unnecessary context menu and hp service reset

* fix: segmentation service wrt brush settings

* feat: initial work for the stack synchronization

* fix: add validateDisplaySetSelectorsForNewDisplaySets to make sure drag and drop can follow requirements

* fix: various react proptypes

* fix: thumbnails for the tmtv and change default props to default params

* feat: make showing loading indicator configurable and add docs

* bump versions and add more docs

* fix demo

* update cornerstone versions

* apply review comments

* feat: add reference lines

* fix build

* fix unit tests

* add reference lines icon

* fix: e2e tests

* fix static wado config

* docs: add segmentation service docs

* fix: docker build

* fix: keep camera and bump versions

* Try re-enabling minification to fix deploy previews

Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
2022-11-16 14:19:52 -05:00
Bill Wallace
7dc9b3549f
fix(viewer): View two or more specified studies (#2815) 2022-11-03 16:57:32 -04:00
md-prog
17257ff0df
upgrade @cornerstonjs/core to 0.16.8 (#2980) 2022-10-14 16:17:09 -04:00
md-prog
dcf3fdbed3
dcmjs package reference upgraded to 0.28.3 (#2978)
Just a package version upgrade.
2022-10-14 14:48:14 -04:00
md-prog
b93067b6a2
feat: Annotation and Measurements support on multi-frame DICOM (#2973)
* added utilities to get frameNumber from imageId and add frameNumber to per-frame instance copy

* Fix measurements' display texts on the Measurements Panel to have the correct instance number and frame number

* fixed minor React bugs (errors on console)

* fixed React's console bugs that are logged for some series that doesn't have "description"

* bug fix - multi-frame files was not loading frames correctly. It was loading Frame 1 twice, and not loading the last frame. Due to wrong frame number indexing (frame number begins with 1, not 0)

* metadata parser fix - providing default values of imagePlaneModule

* measurement SR support on multi-frame DICOM

* bug fix - jumping to the selected measurment on multi-frame DICOM

* upgrade dcmjs dependency to 2.8.1

* StudySummary component - allow "description" to be null

* make getUIDsFromImageID() method public from MetadataProvider

* imageId usage fixes to be more stable

* change the variable name to be more meaningful

* fix metaProvider importing

* for(...of) instead of for(i=0;i<length;..)
as that doesn't assume anything about the layout/design and just gets next until done.

* use Array.findIndex instead of plain for loop

* use ReferencedSOPSequence[0] - because the ReferencedSOPSequence is an array that happens to have attributes of child zero when of length 1, but you shouldn't count on that.

* DisplaySetService.getDisplaySetForSOPInstanceUID() - added optional frameNumber parameter for future usage : now they are just ignored as we are not supporting multiframe splits

* simple code refactoring

* refactoring for checking undefined values - mappedAnnotations

* remove unreachable code

* code refactoring  - prefer conditional chaining

* fix how we access imageIds of viewport (StackViewport)
2022-10-13 11:07:56 -04:00
Alireza
7f770e4fb6
fix: cine scrolling was broken when navigating back to studylist (#2974)
* fix: cine clean up when exited

* fix: make cine work while dragging and dropping another displayset
2022-10-07 00:32:28 -04:00
Alireza
55a1704e4a
feat: upgrade tailwind to version 3 (#2933)
* initial upgrade commit for tailwind

* fix: inconsistensies in button

* fix: various places with conflicts

* final fixes

* fix: dialog header color

* apply review
2022-09-19 20:02:53 -04:00
Alireza
71f5fa8e2f
fix: left right hotkeys and remove non working ones (#2922)
* fix: constant should be enums in cs3d

* remove non working hotkeys for now
2022-09-08 22:02:20 -04:00
Alireza
a16d7e1402
fix: bump packages for crosshairs to get fixed (#2917) 2022-09-08 09:03:37 -04:00
Alireza
10b4ed5f8c
feat: new Total Metabolic Tumor Volume tmtv (#2866)
* fix: ptDisplaySet metadata problem

* fix: typo in xhrHeader field

* fix: temporary fix for crosshairs on reload data

* fix hotkey bug for input fields

* upgrade docusarusu to stable release

* circle ci node upgrade

* cypress node upgrade

* bump node in netlify

* bump node version

* remove versioned docs

* update resources

* fix: webpack injection of plugins

* fix meaningful label for panels

* add reviews and fix cli for creation

* copy over chunks if exists in the build

* edit templates

* edit templates

* fix yarn lock

* fix(plugin):Deploy on windows is broken

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
2022-08-17 15:13:59 -04:00
Erik Ziegler
bd1c38c00c
feat: cornerstone3D stack and volume viewports (#2787)
* feat: cs3d working stack viewport and tools (#19)

* Squashed everything

* fix weird react issue

* fix eslint / prettier stuff

* thumbnails work now with cpu rendering

* feat: use new loadImageToCanvas in cs3d

* make jump to measurement work

* fix active thumbnail

* fix measurement delete

* fix window level presets

* remove segmentation and sync groups for now

* fix the dicom pdf and dicom video

* fix cornerstone window assignment for cypress

* apply review comments

Co-authored-by: Erik <erik.sweed@gmail.com>

* feat: cs3d tools and toolGroups (#20)

* add more tools to work with cs3d mode

* fix hotkeys

* add stack manager usage for stach viewports

* add image scrollbar

* wip viewport overlay

* fix toAnnotation schema for tools

* fix the unnecessary size change that triggered resize

* hanging protocol improvement to allow unmatched errors

* study description matching for hanging protocol

* fix the displaysetOptions to work

* fix handle the active tool when a new viewport is added

* fix separate toolGroups for mode

* apply review comments

* apply review comments

* yarn lock

* feat: overlay component (#21)

* fix default displayset options

* add viewport overlay

* apply review comments

* feat: loading and orientation indicators (#22)

* add loading indicator

* add orientation marker initial work

* apply review comments

* fix: orientation markers (#23)

* finished the orientation markers

* fix various broken cypress tests

* apply review comments

* update yarn lock

* feat: re-working measurement tracking mode with cornerstone3d (#2805)

* feat: cs3d working stack viewport and tools (#19)

* Squashed everything

* fix weird react issue

* fix eslint / prettier stuff

* thumbnails work now with cpu rendering

* feat: use new loadImageToCanvas in cs3d

* make jump to measurement work

* fix active thumbnail

* fix measurement delete

* fix window level presets

* remove segmentation and sync groups for now

* fix the dicom pdf and dicom video

* fix cornerstone window assignment for cypress

* apply review comments

Co-authored-by: Erik <erik.sweed@gmail.com>

* feat: Add Measurement tracking mode with cs3D (#2789)

* feat: first render for cornerstone3d tracked viewport

* make tool active work

* wip for SR extension

* renamed dicom sr to cornerstone dicom sr

* remove cornerstone from dicom pdf and video

* move dicom sr logic to sr extension

* feat: Add hydration for the length tool

* fix SR display tool for length using cs3d

* fix default config

* fix: various bugs with sr viewport and tracking

* fix promptying to continue tracking for when SR is created

* feat: add keep trackign of unique identifiers

* fix hydration for same imageIds

* feat: Add SR toolGroup creation on modeEnter

* feat: remove the need for separate mapper for SR hydration

* add SR display for ellipse

* handle hydration of elliptical ROI tool

* remove cornerstone extension

* add arrow mapping

* feat: Add ArrowAnnotate SR display and hydration

* apply review comments

* apply review comments

* move viewport labels to the viewportData

* apply review comments

* fix: integration cypress tests with cornerstone3D and add CINE tool (#2795)

* fix: integration cypress tests with cornerstone3D

* revert to addOrUpdate as it makes more sense

* fix local drag and drop

* fix tests

* move dicomLoaderService to cornerstone extension

* fix various import bugs

* fix bug for local PT series

* fix various unit tests

* bump cs3d versions

* add angle and magnify tool

* bump dependencies to avoid broken peerDeps

* feat: add initial work for capture using cs3d

* feat: show annotations on the image capture

* feat: add svg layer export

* feat: Add CINE Tool

* feat: remove unnecessary viewport rendering for cine state changes

Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>

* docs: modify and improve documentation (#2800)

* cleanup docs versionings

* feat: Add all version explanations

* version docs for 3.0

* wip for changing docs

* wip for updated docs

* add utility module documentation

* fix demo with nohoisting of history

* add slides and video to resources

* apply review comments

* fix: drag and drop SR into SR viewport (#2803)

* update yarn lock

Co-authored-by: Erik <erik.sweed@gmail.com>

* update pathnames to match v3-stable

* update the e2e pathname

* fix: various bugs with regard to tracking workflow (#2811)

* fix: various issues with measurement panel

* fix: update default tool style for annotations

* fix: annotatoin label getting removed

* feat: Add backward compatibility for SR hydration with legacy cornerstone

* fix: cursors and ellipse ROI max style

* fix: ArrowAnnotate SRDisplay

* apply review comments

* bump package versions

* fix: bugin rehydration of SR

* fix: e2e tests

* fix active viewport thickness and arrowTool ui

* add readme for measurement tracking

* use uploaded image for readme

* add back images

* try to fix e2e test

* fix: window level presets hotkeys

* Update README.md

* update yarn lock

* feat: volume api and TMTV mode (#2817)

* feat: volumeAPI and TMTV mode

* feat: use cs3d cache service to obtain viewportData

* wip for volume api

* wip: fusion viewport

* feat: add blend mode option

* wip for image scrollbar

* fix drag and drop thumbnail

* wip for image scrollbar for voluems

* fix: element mismatch bug for scroll

* feat: Add image scrollbar to volumes

* feat: add syncGroups to volume api

* feat: add tmtv mode initial setup

* feat: add initial image options for the stack viewports

* feat: Add custom load strategy for volume viewports via HP

* apply review comments

fix: Jump presets cs3d (#2812)

* feat: Add JumpPreset to OHIF for Cornerstone3D

* fix: accessing viewport service from servicesManager

feat: volume API and TMTV mode (#2814)

* fix: do not display overlays on mip viewports

* feat: add optional disableCommands for toggle buttons

* fix: toggleCrossharis

* feat: config the crosshairs

* feat: add PetSUV Panel for changing metadata

* feat: initial work for the rectangleROIThreshold panel

* wip: measurement service

* roi threshold working

* feat: Add displayText to segmentations

* feat: add remove segmentation

* feat: add csv export

* feat: add RT export for annotations in tmtv mode

* fix: fusion to use pt in tmtv mode and measuremet mappings

* fix: various bugs

* apply review comments

* apply review comments

* feat: add fusion color maps

* add readme to tmtv mode

* Update README.md

* fix: try to fix build

* fix unit tests

* Update README.md

* feat: add about to the panel

* fix: changing strategy in roi panel

* apply review comments

* update package versions

* wip for stackPrefetch

* fix: cornerstone3d hydration and renaming (#2818)

* update readme

* renamed cornerstone extension

* wip for renaming cornerstone3D variables

* wip for renaming cornerstone3D variables

* wip for fixing bugs for SR viewport

* fix: jumpToMeasurement and initial label after hydration

* fix: fileName capitalization

* feat: use the new prefetch stack in the cs3d (#2820)

* feat: use the new prefetch stack in the cs3d

* use viewport scroll api for stack viewport

* fix cine stop when scrollbar changes

* feat: use new prefetch events

* fix loading state to not show repeatedly

* fix: various bugs for tmtv mode thresholding and new icons (#2823)

* feat: make tmtv mode available in worklist

* feat: add new icons for tmtv mode

* feat: add fusion color icon

* fix: parallel scale calculation

* fix: bump Cornerstone to get large image support working

* fix: Fix issues with CPU viewport flipping, including config files

* fix: bump cornerstone to fix magnify tool

* fix: Bump Cornerstone version to fix resetCamera issue in StackViewport

* ci: Add _headers file to enable CORS headers for Netlify Drag/Drop deploys

* fix: WADO-URI was not working. PET Metadata was coming from the wrong place. Fixed some minor React errors

* feat(OHIF):Allow modes and extensions to be added after commpile time. (#2838)

Also works with the compile time add that the existing cli uses, so that both build types work.
Eric and I agreed this doesn't change existing functionality, but is almost entirely build issues/fixes.

* bump: dependency versions to fix hydration bugs (#2848)

* bump: dcmjs version to fix hydration bugs

* try to fix tests

* bump dependency versions

Co-authored-by: Alireza <ar.sedghi@gmail.com>
Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
2022-07-27 12:39:04 -04:00
Alireza
7f0ad6f84d
feat(cli): Ohif cli for modes and extensions modification (#2696)
* feat: Add initial cli tool structure

* feat: add copying template files

* feat: Add mode template and command

* feat: Add readme template generation

* feat: Add documentation to extension template

* feat: Enhance documentation of the template mode

* fix: cli module type

* feat: Add config-based mode and extension registration (#2660)

* feat: Add ohif cli add/remove extension/mode (#2661)

* Basic working CLI for add-extension and remove-extension

* Basic cli for add/remove extension/mode, lots more to do.

* Cleanup and harden]

* feat: Add list of tasks to add-mode

Co-authored-by: Alireza <ar.sedghi@gmail.com>

* feat: Add git initialization for the mode or extension template (#2662)

* fix: package json file to include templates

* feat: Add git initialization for the mode or extension template

* feat: Add more checks of git and target dir

* feat: refactore library utilities

* feat: Add the list command to print extensions and modes (#2664)

* feat: Add the list command to print extensions and modes

* Add todo

* Feat/ohif cli validation + auto install (#2671)

* WIP

* Working mode keyword verification

* Validation

* auto install extensions based on modes

* WIP remove unused extensions on removeMove

* Working add-mode, remove-mode automatic extension management.

* If extension is in used by a mode, don't allow the CLI to uninstall it

* Cleanup addExtension

* cleanup removeExtension and addMode

* Cleanup removeMode

* Update existing extensions with the needed keywords/peer deps

* Fix broken config

* Feat/cli search (#2677)

* feat: refactor pretty print for console

* feat: add search for modes and extensions

* fix: ugly colors

* Feat/ohif cli error handling publishing (#2679)

* WIP

* fix: webpack imports

* wip

* fix: react router dom private routes

* from last commit

* wip

* fix: webpack prod builds

* WIP

* Working regsitration with new IDs

* Stable

Co-authored-by: Alireza <ar.sedghi@gmail.com>

* verify extensions when constructing modes. (#2681)

* verify extensions when constructing modes.

* Add version to unit tests so it conforms to schema

* Update ohif utils exposed via @ohif/core

* Fix import

* fix tests

* feat: ohif-cli link local modes/extensions for development (#2682)

* feat: enable cli to work with project root

* feat: add initial link package

* feat: add link and unlink extension

* feat: add link and unlink mode

* erro handling for link-package

* feat: add comment on ohif-cli linking for development (#2686)

* Docs/ohif cli (#2687)

* feat: Add documentation for templates

* feat: Add more documentation

* Fix/core publish (#2685)

* versions

* wip

* remove webpack clean output

* fix publish

* use next as dist tag for v3 for now

* fix webpack pro recipe for output

* fix: lerna publish next

* fix(cli): fix issues when trying to link an extension or a mode (#2725)

The generated package.json doesn't contain keywords property which is
required by the linkPackage function. The module apth wasn't correclty
handled too, and when there is no pluginOptions, it fails while reading
the file or while generating a default configuration.

* make dicom pdf and video work after cli merge

* add axios dependency

* comment out the chdir for now

* create id and version based on user inputs

* customizable path for extension and modes

* fix template to make the template mode load

* fix the questions to loop if path is not desirable

* fix templates

* correct package json order

* unify the package creation for extension and mode

* bump versions for each package

* bump extension versions to 3.0

* add gitignore to templates

* fix version requirements when ^

* update docs

* update docs and fix tests

* try to fix the tests

* bump node version

* remove the version from extensions

* remove the version from modes

* remove version from extensionManager

* fix eslint

* revert husky version

* fix eslint

* fix node version for new eslint

* fix documentatoin removing version

* fix cicle ci image version

* fix circle ci node image

* fix circle ci node image

* add back the video and pdf

Co-authored-by: Matthis Duclos <matthis.duclos@gmail.com>
Co-authored-by: James A. Petts <jamesapetts@gmail.com>
2022-04-06 13:28:42 -04:00
Alireza
5c8ee7f906
feat: OHIF-v3 UI Component Library (#2653)
* wip on storybook as a replacement for using UI components in docusaurus, since it causes too many problems

* fix: storybook webpack config

* feat: add more stories

* feat: add more stories

* feat: add more stories

* feat: fix logo and babel runtime error

* feat: move to mdx docs for ui

* feat: enhanced mdx for header and styles

* feat: Add button usecases

* feat: Add buttonGroup docs

* feat: Add docs and use case to cine and contex menu

* feat: fix decorators

* feat: add header and dropdown docs

* feat: add Icon and input docs

* feat: add more docs

* feat: add more stories

* fix: feedback section

* feat: Add doc page

* feat: Add typography and color stories

* yarn lock

* add analytics to v3-ui

* new banner image

* new viewport component

* update review comments
2022-02-10 14:08:34 -05:00
James Petts
509c41fbab
fix: retrieveSeriesMetadata (#2703) 2022-02-08 08:17:37 -05:00
Patrick Wespi
c2bbfc2cac fix: remove temporary link element after csv download 2022-01-04 09:10:35 +01:00
Erik Ziegler
ef06b7683f
fix: Address weird prefetching issues (#2574)
* fix: Address weird prefetching issues

* bump cornerstoneTools version

* remove debugger
2021-10-04 09:27:50 +02:00
Erik Ziegler
3c9f3cb273
feat: Update to WADO Image Loader 4.0.3 to add dynamically imported WebAssembly codec support 🚀 (#2538)
* feat: update to prerelease of WADO Image Loader, add copy plugin to pull dist/dynamic-import into OHIF

* fix: Set empty public path

* perf: Add webpackPrefetch tags to lazy loaded components

* Switch to using webpack alias to use dynamic import version of WADO Image Loader

* fix lockfile

* prevent polyfilling zlib

* bump to wado image loader 4.0.3 with fix for public path
2021-09-24 09:06:52 +02:00
Erik Ziegler
00d7192423 docs: Remove UI components for now, we will use Storybook instead later. Clean up links and introduction. (#2520) 2021-08-24 17:53:03 -04:00
Bill Wallace
2327b4ae12 feat: Add Static WADO display (#2499)
* Rebased to have just the static view changes

* Changes based on the PR

* Couple more changes for the PR

* Removed an extraneous log

* Fix the study worklist display when returning to the page

* Added some documentation on the static wado data source setup, and a
bounds check change on the Queue test which was failing

* PR updates - change the undefined study description to '' and remove the aws deploy

* Fixed the e2e tests to actually pass/fail correctly on actual results
2021-08-24 17:53:03 -04:00
Erik Ziegler
3220af737c
fix(tailwind): Ensure tailwind properly purges unused utility classes (#2485) 2021-07-26 13:22:25 +02:00
Erik Ziegler
7a9f113b91
Merge branch 'feat/v2-main' into feat/v2-main-docusaurus-netlify-monorepo 2021-07-20 15:55:21 +02:00
Alireza
3dec7cfcda
fix: Address various layout and prompt bugs (#2472)
* fix: layout should not reset when opening a new study in studyBrowser

* fix: added state to handle ignored SR series for hydration
2021-07-19 14:31:40 +02:00
Erik Ziegler
825e13bcf3 chore: Upgrade to webpack 5, fix conflicting issues with react-router under docusaurus with yarn workspaces 2021-07-08 15:23:09 +02:00
Erik Ziegler
e7b32cc51e
feat: Support for OpenID Connect (#2431)
* feat: Add OpenID Connect support, speed up docker rebuilds

* fix: Switch Google Cloud API URL to v1

* chore: Remove redux-oidc and use our own components instead
2021-06-23 20:41:27 +02:00
Alireza
1bf651e763
feat: Added support for i18n (#2439)
* Added translation for various react components in OHIF-v3

* Added a test language for debugging- test-LNG 

* Added copy for test language to not get overwritten
2021-06-15 10:56:33 -04:00
Erik Ziegler
99b8dc4759
feat: Add White Labelling, Hanging Protocols, and tons of Extensions / Mode fixes
* modified

* new files in existing extensions/libraries/modes

* fixed bugs and tests

* Clean up

* fix: viewport display fixed

* Fixed configs for deployment

* Removed unnecessary files and functions

* Fixed default HP module

* Added white labelling

* Fixed hash routing

* Removed unnecessary routers

Co-authored-by: Alireza Sedghi <ar.sedghi@gmail.com>
2021-05-28 14:32:48 -04:00
Erik Ziegler
0db81b30f3
chore: Clean up unused files, imports, and work on getting end-to-end tests and unit tests running (#2272) 2021-03-01 16:52:54 +01:00
Erik Ziegler
e0a31caebf
fix: Call load if necessary before rehydration prompt. Jump to first measurement on rehydration (OHIF-369) (#2184) 2020-11-25 13:35:43 +01:00
Danny Brown
2f4cba28a5
fix: update DICOMSR and Measurement Panel copy to use L/W (#2174)
* fix: update DICOMSR and Measurement Panel copy to use L/W

* functional viewport

* support the active viewport for snapshot

* Support empty viewport case

* bump cs-tools to pick up misc. fixes
2020-11-18 00:14:52 -05:00
Danny Brown
0d9da69580
fix: update DICOMSR and Measurement Panel copy to use L/W (#2104) 2020-10-12 21:43:28 -04:00
Danny Brown
0b80f19bfd
fix: ellipse should use exponent (#2086)
* fix: prevent app from blowing up when snapshot modal is opened

* fix: use superscript tag to indicate ellipse is mm squared

* fix: update measurement item to allow us to specify html in MeasurementItem display text
2020-10-05 21:45:43 -04:00
Danny Brown
6c40f581a6
fix: autofocus reject SR dialog input focus to "Yes" button (#2083) 2020-10-05 21:43:12 -04:00
Danny Brown
5689bf5369
fix: sort study cards by study date, descending (#2081) 2020-10-05 21:40:37 -04:00
Danny Brown
6a0563f1cf
fix: update csv column titles to be consistent (UIDs) (#2080) 2020-10-05 21:27:36 -04:00
Danny Brown
4ae848761d
fix: swallow update-image error for "clicking annotation arrows"; as doing _nothing_ if the image isn't loaded yet is perfectly okay (#2076) 2020-10-01 22:08:51 -04:00
Danny Brown
56824b9142
fix: button colors quick (#2056)
* add _redirects file for when output target is netlify

* temporarily swap dialog primary/secondary button types for dialogs
2020-09-22 21:41:42 -04:00
Danny Brown
ba38cebcd7
fix: duplicate measurements on hydration (#2047)
* chore: remove lingering debugger statements

* fix: order of arguments on `MeasurementService.remove` calls

* fix: ensure report is dirty when intial measurements are added
2020-09-17 22:02:32 -04:00
Danny Brown
876cc58348
fix: use instance number instead of index number in stack (#2046) 2020-09-17 16:28:41 -04:00
Danny Brown
41316fead0
fix: display instance num sr viewport (#2045)
* fix: duplicate and use TrackingViewport's overlay w/ SR Viewport

* chore: correct component naming for OHIFTrackingViewport
2020-09-17 16:08:11 -04:00
Danny Brown
3911d74cf4
fix: update reject/delete dialog title, body copy, and button text (#2043) 2020-09-16 22:45:13 -04:00
Danny Brown
5a66920d1d
fix: Misc. workflow fixes [OHIF-363] (#2040)
* fix: "Adding measurements to existing report" portion of issue

* fix: notes from investigation to fix "Creating a new report while tracking measurements"

* fix: "Measurements spanning multiple studies"

* chore: comments explaining isDirty behavior
2020-09-16 21:56:51 -04:00
Danny Brown
cae54b0779
Fix/update branch cherry pick (#2039)
* Update all the icons

* Turn off global tool sync; watch as the world burns

* Shift a bunch of things around so we can start tracking/setting per element

* ToolBarService to initiate one of three different calls; callback passed to all button types

* SplitButton and Toolbar Button to use new `onInteraction` prop and new toolbar state

* Changes to toolbar button interface and config

* Fix broken layout selector

* Update SR viewport to activate tools in viewport component

* Duplicate activation logic in measurement tracking extension

* Add alternative/dashed variants for SR Viewport

* pass through "setToolActive" commands for other viewport types

* fix small overlay bugs (no wwwc or scale info)

* Show SpacingBetweenSlices instead of PixelSpacing in patient information dialog

* Fix prop-types

* Update tracked viewport to have alternative tracked styling

* alt styling for SR viewports

* Update to support isLocked + isRehydratable

* fix broken logic

* fix broken logic

* switch icon style

* fix icon styles

* hover and click to start flow

* expedited workflow when data is not dirty (just after SR hydration)

* fix: setting elliptical roi tool

* fix arrow annotate dialog

* fix: do not show learn more button for now

* remove dead code

* simpler cache invalidation

* simpler cache invalidation part 2

* Fix for unable to spand study cards on separate pages
2020-09-14 21:18:46 -04:00
dannyrb
9587d27b02 fix: typo 2020-08-19 23:14:04 -04:00
James Petts
42b02a62d3
OHIF-326, export as CSV. (#1976) 2020-08-19 15:31:25 -04:00
James Petts
68332701ab
[OHIF-309] - Users should be able to delete an SR from the side panel when the behavior is supported by the data source (#1952)
* Remove trailing zeroes from patient age

* WIP reject + remove displaySet.

* ohif-316: Update DICOM SR thumbnail design to include a delete action (#1948)

* add "supportsReject" to netlify config

Co-authored-by: Igor Octaviano <igoroctaviano@gmail.com>
Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-08-19 15:27:34 -04:00
Igor Octaviano
760e2a62ae
OHIF-323: Cine Dialog (#1961)
* ohif-323: add cineplayer flow

* ohif-323: improve toolbar flow of cine

* ohif-323: improve cine styles

* ohif-323: use toggle instead of set

* ohif-323: add compatibility comment

* ohif-323: move cine logic to command

* ohif-323: cr update

* ohif-323: remove typo and update svg title

* ohif-323: remove log

* ohif-323: update props and remove dead code

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-08-19 15:24:07 -04:00
Igor Octaviano
e04f74499f
OHIF-301: Add sorting to worklist series (#1960)
* ohif-301: add sorting to work list series

* ohif-301: clearadd series date to qido

* ohif-301: add series date to qido

* Update qido.js

Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
2020-08-11 21:01:48 -04:00
James Petts
3267706b33
[OHIF-302] fix: Set SeriesNumber for generated SRs to 4700 or above (#1953) 2020-08-07 16:57:40 +02:00
Igor Octaviano
fc71ad0e4f
OHIF-343: jump to image on measurement edit (#1978) 2020-08-07 16:53:42 +02:00
James Petts
58c2c00663
Fix caching issues with related studies. (#1970) 2020-08-06 17:25:42 +02:00
James Petts
8e6b3ac580
Show 1-based in stack position of measurement in measurements panel. (#1967) 2020-08-06 12:25:27 +02:00
James Petts
401a2e38c8
[OHIF-193 + OHIF-313] (#1955)
* create context menu

* OHIF-193: Add context menu integration with measurement service

* OHIF-193: Update comments

* OHIF-CR Update: Add requested updates

* CR Update: Update measurement service remove function

* CR Update: Update casing

* CR Updates

* Update cornerstone measurments when the label is edited in the measurement service.

* Implement click outside behavior

* Address reviewer comments.

Co-authored-by: Rodrigo Antinarelli <rodrigoantinarelli@gmail.com>
Co-authored-by: igoroctaviano <igoroctaviano@gmail.com>
2020-08-05 13:56:02 +01:00
Igor Octaviano
39e68f3193
ohif-300: add primary to allstudies in all tab (#1954) 2020-08-04 16:45:53 +01:00
Danny Brown
2a51d75f77
[OHIF-339] - workflow changes (#1931)
* workflow changes

* Cherry pick OHIF-310 into this PR.

* fix label bug and dead code

* remove comment

* Wire up CreateReportButton

* fix additionalFindingTypes + save interaction

* Remove unused createReportAsync call

* stub for report hydration prompt

* Update PR

* Remove debuggers

* push updated code

* Push updates

* push

* fix sidebar save

* enable tracking of new study or series

* fix for duplicate created report series in sidebard

* fix for unexpected viewport dialog after visiting study list then a new study

* Fix for hydration not marking multiple series as active

* Reviewer changes.

* Respond to final review comment, add series description setting for export.

Co-authored-by: James A. Petts <jamesapetts@gmail.com>
2020-08-04 10:11:23 +01:00
Igor Octaviano
4d1d73b89c
OHIF-311: Set nav arrows as active for all viewports (#1930) 2020-07-28 10:44:48 +02:00
James Petts
32e28d2090
Arrow Annotate workflow updates. (#1921) 2020-07-24 15:34:10 +01:00
Erik Ziegler
55cf9f2306
OHIF-285/OHIF-274: Fix default hanging of display sets into the ViewportGrid (#1917)
* OHIF-285/OHIF-274: Fix default hanging of display sets into the ViewportGrid

Co-authored-by: James A. Petts <jamesapetts@gmail.com>
2020-07-24 11:51:57 +01:00
James Petts
a4f286feee
[OHIF 284] - JumpToMeasurement + prevent layout change on scroll Prevent layout change on scroll (#1889)
* No more setting on debounce, jumpToMeasurement service set up.

* Fix bug causing a race condition sometimes if you click super fast.

* Optimise rendering of Tracking viewport slightly.

* element => targetElement

* Remove complete TODO

* Respond to reviewer comments.

* Fix e2e workflow.

* Fix regression that removed highlighting on jump to.

* Make sure jump to works from panel as well as viewport.

* Fix typo and remove debugger.

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-22 19:40:40 +02:00
James Petts
59003362c3
[OHIF-278] Jumping to a measurement should set it to "active" in cornerstone-tools, highlighting it as green (#1888)
* Set cornerstone tool active when jumping to measurement.

* Remove debugger statement

* Also set active on left/right actionbar buttons.
2020-07-10 15:38:40 -04:00
James Petts
3eba027003
[OHIF-288] Rehydrating SRs is missing Labels (#1885)
* WIP

* Finish OHIF-288, need to update dcmjs.

* Remove unused copied resources.

* Cleaned up label import code.

* Update for dcmjs Findings -> Finding.

* Update dcmjs

* Remove debuggers

* Respond to reviewer comments.

* update dcmjs version

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-10 15:11:22 -04:00
James Petts
ce40f04f2e
[OHIF-295] - Esc button should stop the creation of a measurement or annotation (#1883)
* WIP, need to fix arrow making measurement

* Update cornerstoneTools to fix cst arrow annotate event bug.
2020-07-10 15:00:10 -04:00
Igor Octaviano
67f91251d8
fix/ohif-remove-measurements-label-notification (#1884) 2020-07-10 16:06:05 +01:00
Rodrigo Antinarelli
b28a70520e
fix: OHIF-219 - Viewport Labels should be sequential (#1881) 2020-07-10 15:06:45 +01:00
James Petts
25ded882ec
Disable double click for now. (#1872) 2020-07-06 08:28:21 -04:00
Danny Brown
86327cd808
bump RCV version and use new prop to control resize/refresh behavior (#1869) 2020-07-04 13:25:23 -04:00
Danny Brown
e2c72d48fe
Add support for "additional findings" section (#1867) 2020-07-03 15:57:35 -04:00
Igor Octaviano
b7760dc291
OHIF-228: Viewports should not be clipped after resizing (#1865)
* Fix overflow of viewports

* Apply changes to sr

* Add double click back

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-03 14:50:33 -04:00
James Petts
4dfe144bf8
[OHIF-251] - Double click to maximise viewport/ revert to previous layout. (#1860)
* WIP

* double click to maximise implemented at the viewport grid layer.

* Remove memory of cached layout when the layout is changed, or a different displaySet is set.

* WIP fix double click for cornerstone.

* Update CST

* Prevent maximising when double clicking the action bar

* Update extensions/dicom-sr/src/OHIFCornerstoneSRViewport.js

* Apply suggestions from code review

* Fix conflicts.

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-03 18:12:33 +01:00
James Petts
5ee4598bbe
[OHIF-173] - Jump between measurements (#1863)
* jump between measurements.

* Apply suggestions from code review

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-03 12:44:20 -04:00
Igor Octaviano
11fbe4cf01
OHIF-223: Add "Clear" all measurements to annotation toolbar (#1861)
* Add clear button

* Use james event

* Create new commands module to default
2020-07-03 12:39:41 -04:00
James Petts
61fc093fc5
[OHIF-248] - Update cornerstoneTools version to get handle rendering improvements. (#1854)
* Only process SR on consumption of viewport.

* Hide handles whilst moving + correct hide handles on hover.

* Up CST version

* Update cst

* Remove added cornerstone viewport checks
2020-07-03 10:51:38 +01:00
Igor Octaviano
454474ddb4
Fix typo (#1857) 2020-07-02 22:34:53 -04:00
Igor Octaviano
849c8a6ae1
Add new loading component (#1855) 2020-07-02 22:34:15 -04:00
Rodrigo Antinarelli
491afaa43d
fix: UI tweaks to satisfy OHIF-161, OHIF-254, OHIF-167, OHIF-249, OHIF-170, OHIF-162
* add group hover for borderColor

* measurements action buttons hover state

* fixes and button/buttongroup/iconButton refactor

* OHIF-161: Fix Tracked/Untracked Text in Thumbnail's Tooltip

* OHIF-254: Format SR series date

* OHIF-167 - Fix Study Date Time format

* OHIF-249: Fix viewport border thickness and action bar min height

* pass viewportIdentificator to SR Thumbnail

* show tooltip when hover over the SR thumbnail

* OHIF-170: Display tooltip when hovering over an untracked series in the Viewport Action Bar

* Undo accidental date change

* Sneak in "Create Report" messaging for createReport notifications

* Fix text clipping

* Add no-select text styles for action bar, thumbnail, and thumbnail no image (sr)

* fix for OHIF-162

Modified to remove Viewport Identifier. Text now only reads: “Structured Report”This was partly to address a bug where the Viewport Identifier was incorrect for all but the first displayed SR. Component API changed for ThumbnailNoImage to accomodate any generic “modalityTooltip”

* Some ViewportPane resize magic

Co-authored-by: dannyrb <danny.ri.brown@gmail.com>
2020-07-02 21:41:55 -04:00
Igor Octaviano
a156eadcb7
OHIF-208 (#1842)
* Set measurement as active

* Add basic dialog component

* Update styles and prop types

* Jump to image

* Update dialog

* Format date

* Update summary to use primary modalities

* delete empty studySummary page

* add missing PropTypes import

* fix for accidental sync'd viewports

* CR Updates

* CR Update avoid cache of measurements

* Use get measurement

* Add comment to edit function

* Remove request and merge modalities from series

* Update dependency: react-cornerstone-viewport@2.3.9

react-cornerstone-viewport
  * @ohif/extension-cornerstone: 2.3.8 → 2.3.9
  * @ohif/extension-dicom-sr: 2.3.8 → 2.3.9

* Update extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>

* Add debugs

* remove console.debug

* Update frameindex to imageindex

* Use new rcv debounced function

* Fix hovering

* Update dialog text

* Dismiss dialogs on esc

* Update dependency: react-cornerstone-viewport@3.0.0

react-cornerstone-viewport
  * @ohif/extension-cornerstone: 2.3.9 → 3.0.0
  * @ohif/extension-dicom-sr: 2.3.9 → 3.0.0

* OHIF-237

* remove console.debug

* Remove dead code brought in from rebase

* EmptyViewport should not display a message

* Remove more dead code from rebase

* fix variable naming

* remove unused hook

* bump yarn lock

* formatting

* Add arrow dialog

* Filter based on trackedSeries

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-02 16:53:38 -04:00
James Petts
c36f853a38
[OHIF-235] Lazy processing of DICOM SR for viewport. (#1849)
* Only process SR on consumption of viewport.

* remove debugger

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-02 10:17:04 -04:00
Igor Octaviano
279d1db997
Update measurement table display text to use cornerstone rendered value fixed points (#1852) 2020-07-02 10:12:10 -04:00
James Petts
801bf73a34
Update dcmjs to fix bidirectional issue. (#1848) 2020-07-02 10:56:36 +01:00
James A. Petts
7c3c717d33 Update dcmjs 2020-07-01 14:56:25 +01:00
James A. Petts
d956c3008c Pull in main 2020-07-01 10:12:41 +01:00
James Petts
bc2bde890b
OHIF-190 - Rehydrate PR (#1835)
* WIP rehydration.

* WIP OHIF-190 rehydrate.

* Remove debugger statements.

* Merge in and fix after OHIF-197 and OHIF-198

* Remove console.log

* Fix typo

* fix length tracking bug

* Respond to reviewer comments.
2020-07-01 10:08:56 +01:00
dannyrb
7b31e62e31 Fix undefined data source for local download/export 2020-06-30 22:54:36 -04:00
dannyrb
c8f48cf1fe pass servicesManager and extensionManager all the way to our UI prompts; use in exposed createReportAsync call 2020-06-30 22:54:09 -04:00
dannyrb
9fb3fe6dc2 Shift create report to a separate file 2020-06-30 22:32:54 -04:00
dannyrb
4b58d925d9 Use ImageViewer's StudyInstanceUIDs to set the initial/default list of expanded study ids 2020-06-30 22:08:41 -04:00
Danny Brown
06bf4d2960
Merge pull request #1840 from OHIF/feat/ohif-178
OHIF-178: Bump cs tools to fix issue
2020-06-30 21:03:41 -04:00
igoroctaviano
7f6aa0e260 Update dependency: cornerstone-tools@4.16.1
cornerstone-tools
  * @ohif/core: 4.16.0 → 4.16.1
  * @ohif/extension-cornerstone: 4.16.0 → 4.16.1
  * @ohif/extension-dicom-rt: 4.16.0 → 4.16.1
  * @ohif/extension-dicom-segmentation: 4.15.1 → 4.16.1
  * @ohif/extension-dicom-sr: 4.16.0 → 4.16.1
  * @ohif/extension-measurement-tracking: 4.15.1 → 4.16.1
  * @ohif/extension-vtk: 4.16.0 → 4.16.1
  * @ohif/viewer: 4.16.0 → 4.16.1
2020-06-30 21:55:59 -03:00
dannyrb
b967d064f0 Tidying up naming 2020-06-30 20:49:37 -04:00
Rodrigo Antinarelli
4b8dcef956 Merge branch 'feat/v2-main' of https://github.com/OHIF/Viewers into fix/OHIF-37-thumbnailDoubleClick 2020-06-30 17:59:57 -03:00
dannyrb
064df8a509 Fixing lint errors in PanelMeasurementTableTracking 2020-06-30 15:49:05 -04:00
Rodrigo Antinarelli
71544df16f pass currentDisplaySetUID 2020-06-30 15:55:17 -03:00
Rodrigo Antinarelli
c9a365f7e2 double click thumbnail loads SR in viewport 2020-06-30 15:47:09 -03:00
igoroctaviano
5ca6757b44 Add error message of generate reportt 2020-06-30 14:02:23 -03:00
igoroctaviano
d94bc2d5a2 Merge branch 'feat/v2-main' of github.com:OHIF/Viewers into feat/ohif-179 2020-06-30 12:43:19 -03:00
igoroctaviano
1bfb62d26d Add messages to sr pacs 2020-06-30 12:33:38 -03:00
James A. Petts
80a86d1251 Merge remote-tracking branch 'upstream/feat/v2-main' into OHIF-190 2020-06-30 16:28:05 +01:00
James Petts
2c11609c55
OHIF-198 - Jump to thumbnail when a new displaySet is added (#1834)
* Viewport letter only in multi-viewport layout.

* If SliceThickness not available print N/A

* Create displaySet in local session on SR generation.

* Jump to thumbnail when a new displaySet is added with the madeInClient property.

* Check if scrollIntoView exists.
2020-06-30 16:27:35 +01:00
James A. Petts
eaeae515a3 Complete rehydration. 2020-06-30 16:08:44 +01:00
James Petts
eb8f3a63f2
OHIF-197 (#1833)
* Viewport letter only in multi-viewport layout.

* If SliceThickness not available print N/A

* Create displaySet in local session on SR generation.

* remove empty line

* remove console log

* Give storeMeasurements an onSuccess handler instead of always creating dataSets.

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-06-30 15:10:27 +01:00
Danny Brown
d5d219c271
Merge pull request #1831 from OHIF/feat/ohif-203
OHIF-203: Add new viewport overlay
2020-06-30 08:41:20 -04:00
igoroctaviano
364f2db1dc Remove servicesmanager 2020-06-30 09:32:11 -03:00
James Petts
d266b944c2
[OHIF-192] - Viewport letter only if using multiple viewport layout. (#1822)
* Viewport letter only in multi-viewport layout.

* If SliceThickness not available print N/A
2020-06-30 11:41:50 +01:00
James A. Petts
baedf243bc WIP OHIF-190 rehydrate. 2020-06-30 10:28:46 +01:00
dannyrb
a0b0f365dd Handle for interaction outside of the ViewportDialog (default to cancel) 2020-06-29 23:29:40 -04:00
dannyrb
9403a091d9 Update measurement tracking workflow to match requirements 2020-06-29 22:30:39 -04:00
igoroctaviano
9e2ed50e79 add new overlay 2020-06-29 18:05:52 -03:00
James A. Petts
14005d61f3 WIP rehydration. 2020-06-29 18:22:19 +01:00
Danny Brown
0594525301
Merge pull request #1823 from OHIF/fix/minor-defects
fix: sort number of instances | format date in study panel
2020-06-29 12:45:56 -04:00
Rodrigo Antinarelli
9145215596 move formatDate to ohif/core 2020-06-26 16:17:25 -03:00
Danny Brown
1931d45450
Merge branch 'feat/v2-main' into dannyrb/ohif-154/restore-command-functionality-for-toolbar 2020-06-26 14:26:35 -04:00
dannyrb
c6ec439331 Make sure primary cornerstone extension has references to enabled elements 2020-06-26 14:14:25 -04:00
Rodrigo Antinarelli
a5170076db fix date format 2020-06-26 14:29:25 -03:00
dannyrb
3993c12701 Update dependents to use new exposed service 2020-06-26 13:28:30 -04:00
Igor Octaviano
554b9a0db4
OHIF-174: Patient Info Icon should be clickable and show the correct details (#1816)
* Update patient info to be clickable and update fields in viewers

* Add spacing

* Remove log

* round number

* Add default
2020-06-26 16:05:29 +01:00
Igor Octaviano
5180eb127d
OHIF-163: Patient Name is displayed in correct format "Last Name, First Name" (#1820)
* Add util to formatpn

* Format patient name in patient information tab
2020-06-26 15:11:00 +01:00
Igor Octaviano
1d8f5cfc42
Viewport grid load default as 1x1 and load first image of series by default (#1817) 2020-06-26 14:40:03 +01:00
Danny Brown
0264e5998d
Merge branch 'feat/v2-main' into feat/OHIF-177 2020-06-25 16:17:50 -04:00
Danny Brown
0ae95adf34
Remove console log 2020-06-25 12:49:05 -04:00
Danny Brown
bb26b86969
remove console log 2020-06-25 12:48:42 -04:00
James Petts
6aac69e1ba
OHIF-176: v2 - Render non-tracked measurements as a dashed lines. (#1805)
* Render non-tracked measurements as a dashed line.

* bump CST version.

* Update extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.js

remove tracked series console log

* Remove empty console log

* Remove debugger

* Remove debugger

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-06-25 17:46:17 +01:00
James A. Petts
74c1462271 Working local download, STOW to PACS an view in SR Viewport. 2020-06-25 17:21:03 +01:00
James Petts
c01466762d
WIP Measurements service. (#1808) 2020-06-25 17:13:31 +01:00
James A. Petts
7b7b63de93 WIP Measurements service. 2020-06-25 11:15:33 +01:00
dannyrb
a8954befee Fix unsubscribe bug in layout template 2020-06-16 23:02:46 -04:00
dannyrb
be6a04684b Don't try and "getImageSrc" for datasets without imageIds (DICOM SR) 2020-06-16 23:02:16 -04:00
dannyrb
6e65e7eaf5 Conditionally show left/right and userinfo for active viewport 2020-06-16 00:56:54 -04:00
dannyrb
4adea1b49a Map tracking info 2020-06-16 00:43:51 -04:00
dannyrb
9146a9ee32 Create new ToolbarButton type for Layout Selector; wire up custom UI; prep for viewportGridService usage 2020-06-15 00:51:36 -04:00
dannyrb
fab7334696 Remove dead code; clean-up comments 2020-06-09 13:39:17 -04:00
dannyrb
3b81ebcc96 Clear studySummary state when no study is set 2020-06-09 13:38:27 -04:00
dannyrb
47f9e1391a update measurements panel when measurements change (debounced) 2020-06-09 13:38:09 -04:00
dannyrb
7a67b28c3f Fix sidepanel measurement calculation 2020-06-09 11:18:55 -04:00
dannyrb
dc5fb8b585 Make sure ViewportDialogs are full-width 2020-06-08 21:47:15 -04:00
dannyrb
5fde65a2c1 hide overlays 2020-06-08 21:47:01 -04:00
dannyrb
7700069e7c filter and update measurements when trackedMeasurements updates 2020-06-08 21:46:52 -04:00
dannyrb
10cbe9e1d4 clean up dead code in TrackedMeasurementsContext 2020-06-08 21:46:05 -04:00
dannyrb
3b7560a282 ability to "untrack" a series from thumbnail list 2020-06-07 12:31:18 -04:00
dannyrb
ffbf7b4a76 bubble up thumbnail "untrack" clicks to parent "StudyBrowser" component w/ prop drilling 2020-06-07 12:08:50 -04:00
dannyrb
0573cb18e6 Add support for SET_LAYOUT action on viewportGrid reducer 2020-06-07 11:48:13 -04:00
dannyrb
490eefdae0 Use viewportIndex from transition event to set viewportDialog placement 2020-06-07 11:25:11 -04:00
dannyrb
dcfb57ea16 remove console log 2020-06-07 11:17:39 -04:00
dannyrb
bd60b66977 Custom message per prompt type 2020-06-06 23:40:02 -04:00
dannyrb
2d903d731f simplify stateMachine 2020-06-06 23:35:12 -04:00
dannyrb
00f8d56a4e get ViewportDialog to display as a part of machine transition 2020-06-05 15:19:09 -04:00
dannyrb
a4fc5e21b2 clean up study summary initial values and transitions 2020-06-04 12:49:09 -04:00
dannyrb
53407899e2 Set studySummary data 2020-06-04 12:18:57 -04:00
dannyrb
95249928a8 Replace measurementsPanel w/ a format that reduces nesting 2020-06-04 11:28:10 -04:00
dannyrb
98497f666c begin mapping measurement data to measurements table 2020-06-03 16:02:58 -04:00
dannyrb
9dd04122af pull in tracked measurements panel 2020-06-03 15:20:09 -04:00
dannyrb
8674e676b7 viewportLabels for panel 2020-05-28 00:02:05 -04:00
dannyrb
b444836469 Set isTracked in actionbar 2020-05-27 23:16:41 -04:00
dannyrb
05a0bdc55b OHIFCornerstoneComponent from class component to function component 2020-05-27 23:09:06 -04:00
dannyrb
0a4af79b44 use measurement service to trigger state machine transitions 2020-05-27 22:20:17 -04:00
dannyrb
870489be1d Test state machine hook 2020-05-27 21:25:44 -04:00
dannyrb
c3dd2608b2 wire up some ActionBar data; default grid to 2x2 2020-05-27 08:56:52 -04:00
dannyrb
8117857a89 default to untracked 2020-05-27 08:32:27 -04:00
dannyrb
11a4d4227d Pull in correct context; add xstate package 2020-05-27 08:21:58 -04:00
dannyrb
9e893bbf90 Add ActionBar to UI (dummy) 2020-05-27 08:21:23 -04:00
dannyrb
e1c7a76025 Rename files to clarify they're "tracking" variants (simplify ide search) 2020-05-27 08:20:54 -04:00
dannyrb
e748eb1974 Beginning of TrackedMesurementContext 2020-05-27 08:20:30 -04:00
dannyrb
d510cc8ad2 casing change 2020-05-26 10:50:59 -04:00
dannyrb
591e21e287 casing change 2020-05-26 10:50:03 -04:00
dannyrb
38e60e297b longitudinal mode to use "tracked" thumbnails 2020-05-26 10:39:40 -04:00
dannyrb
d557acbb40 Support for additional "tracking" mode 2020-05-26 09:03:58 -04:00