Commit Graph
72 Commits
Author SHA1 Message Date
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 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 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 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 365ba2fa72 bump react-cornerstone-viewport version 2020-08-20 12:30:38 -04:00
James Petts 42b02a62d3 OHIF-326, export as CSV. (#1976) 2020-08-19 15:31:25 -04:00
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
James Petts 2ded8b7ee8 change DP of SR viewport to 1dp (#1968) 2020-08-06 12:10:42 +02:00
Danny BrownandJames A. Petts 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 11:11:23 +02: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 5e00020fe3 OHIF-67: Fix Magnify issues by updating CornerstoneTools (#1923) 2020-07-24 21:51:52 +02:00
James Petts 32e28d2090 Arrow Annotate workflow updates. (#1921) 2020-07-24 16:34:10 +02:00
James Petts 1f1ef6a3f9 OHIF-328 up/down arrows keys on SR viewport. (#1922)
* Fix arrow key scroll on SR Viewport.

* Remove debuggers
2020-07-24 16:32:44 +02:00
James PettsandDanny Brown 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 PettsandDanny Brown 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 1507f9eb61 Add missing props (#1879) 2020-07-10 16:29:57 +02:00
Rodrigo Antinarelli b28a70520e fix: OHIF-219 - Viewport Labels should be sequential (#1881) 2020-07-10 16:06:45 +02: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
Igor OctavianoandDanny Brown 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 PettsandDanny Brown 14797a8973 [OHIF-261 & OHIF-262] (#1862)
* WIP

* Reset viewport grid on mode switch.

* Make lifecyclehooks distinct from modules. Add needed SR hydration state on creation.

* Update extensions/cornerstone/src/init.js

* Remove unused REMOVE_MEASUREMENT listener.

Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-07-03 19:18:59 +02:00
James PettsandDanny Brown 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 19:12:33 +02: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 11:51:38 +02:00
Igor OctavianoandDanny Brown 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 PettsandDanny Brown 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
James Petts 801bf73a34 Update dcmjs to fix bidirectional issue. (#1848) 2020-07-02 11:56:36 +02:00
James A. Petts 44c2927963 Fix export 2020-07-01 16:12:49 +02:00
James A. Petts 7c3c717d33 Update dcmjs 2020-07-01 15:56:25 +02:00
James A. Petts 413f5c9003 Remove debugger statements. 2020-07-01 15:35:29 +02:00
James A. Petts 7092fc858e Don't reposition textboxes for now. 2020-07-01 15:32:54 +02:00
James A. Petts e3f2e26e3b Render text properly, render arrow + freetext. Need to move textboxes appropriately. 2020-07-01 12:59:29 +02:00
James A. Petts d956c3008c Pull in main 2020-07-01 11:12:41 +02: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 11:08:56 +02: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
James A. Petts 56358ad95f WIP callout in SR viewport. 2020-06-30 19:00:37 +02:00
James A. Petts ef8683b8ea Remove console.log 2020-06-30 17:36:09 +02:00
James A. Petts 4ec07dba0b Merge in and fix after OHIF-197 and OHIF-198 2020-06-30 17:35:32 +02:00
James A. Petts 80a86d1251 Merge remote-tracking branch 'upstream/feat/v2-main' into OHIF-190 2020-06-30 17:28:05 +02: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 17:27:35 +02:00
James A. Petts b99488ad1b Remove debugger statements. 2020-06-30 17:09:54 +02:00
James A. Petts eaeae515a3 Complete rehydration. 2020-06-30 17:08:44 +02: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 12:41:50 +02:00
James A. Petts baedf243bc WIP OHIF-190 rehydrate. 2020-06-30 11:28:46 +02:00
James A. Petts 14005d61f3 WIP rehydration. 2020-06-29 19:22:19 +02: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