Commit Graph
159 Commits
Author SHA1 Message Date
Igor Octaviano 39e68f3193 ohif-300: add primary to allstudies in all tab (#1954) 2020-08-04 17:45:53 +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
Erik ZieglerandJames A. Petts 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 12:51:57 +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 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 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
Igor Octaviano 67f91251d8 fix/ohif-remove-measurements-label-notification (#1884) 2020-07-10 17:06:05 +02:00
Rodrigo Antinarelli b28a70520e fix: OHIF-219 - Viewport Labels should be sequential (#1881) 2020-07-10 16:06:45 +02:00
Danny Brown e2c72d48fe Add support for "additional findings" section (#1867) 2020-07-03 15:57:35 -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
Rodrigo Antinarellianddannyrb 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 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
Igor Octaviano 279d1db997 Update measurement table display text to use cornerstone rendered value fixed points (#1852) 2020-07-02 10:12:10 -04:00
dannyrb 7b31e62e31 Fix undefined data source for local download/export 2020-06-30 22:54:36 -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
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 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 PettsandDanny Brown 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 16:10:27 +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
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
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 1d8f5cfc42 Viewport grid load default as 1x1 and load first image of series by default (#1817) 2020-06-26 15:40:03 +02: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 A. Petts 74c1462271 Working local download, STOW to PACS an view in SR Viewport. 2020-06-25 18:21:03 +02:00
James A. Petts 7b7b63de93 WIP Measurements service. 2020-06-25 12:15:33 +02: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 4adea1b49a Map tracking info 2020-06-16 00:43:51 -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 7700069e7c filter and update measurements when trackedMeasurements updates 2020-06-08 21:46:52 -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 490eefdae0 Use viewportIndex from transition event to set viewportDialog placement 2020-06-07 11:25:11 -04:00
dannyrb a4fc5e21b2 clean up study summary initial values and transitions 2020-06-04 12:49:09 -04:00