Commit Graph

889 Commits

Author SHA1 Message Date
James Petts
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 18:18:59 +01: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
Igor Octaviano
920c3e9455
OHIF-149: Apply default sort of Study Date descending (most recent -> oldest) when < 101 studies (#1850)
* Add dynamic default sorting

* Use different approach to sort

* Switch strategy to one that works even when filters are applied, but sort is not (there is no dicomweb sort/orderby)

Co-authored-by: dannyrb <danny.ri.brown@gmail.com>
2020-07-02 22:23:42 -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
44c2927963 Fix export 2020-07-01 15:12:49 +01:00
James A. Petts
7c3c717d33 Update dcmjs 2020-07-01 14:56:25 +01:00
James A. Petts
413f5c9003 Remove debugger statements. 2020-07-01 14:35:29 +01:00
James A. Petts
7092fc858e Don't reposition textboxes for now. 2020-07-01 14:32:54 +01:00
James A. Petts
e3f2e26e3b Render text properly, render arrow + freetext. Need to move textboxes appropriately. 2020-07-01 11:59:29 +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
236b89a551 Make sure measurements table updates 2020-06-30 16:04:07 -04:00
dannyrb
064df8a509 Fixing lint errors in PanelMeasurementTableTracking 2020-06-30 15:49:05 -04:00
dannyrb
eb0f38ebf2 Prevent default measurementpanel crash 2020-06-30 15:48:24 -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
James A. Petts
56358ad95f WIP callout in SR viewport. 2020-06-30 18:00:37 +01:00
James A. Petts
2704bd7cbc fix length tracking bug 2020-06-30 17:20:20 +01:00
James A. Petts
690442555c Fix typo 2020-06-30 16:58:20 +01: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
James A. Petts
ef8683b8ea Remove console.log 2020-06-30 16:36:09 +01:00
James A. Petts
4ec07dba0b Merge in and fix after OHIF-197 and OHIF-198 2020-06-30 16:35:32 +01: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
b99488ad1b Remove debugger statements. 2020-06-30 16:09:54 +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
igoroctaviano
38a92ae18d Fix broken solution 2020-06-29 16:12:42 -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
Danny Brown
aa402183f4
Merge pull request #1824 from OHIF/feat/ohif-125
OHIF-125: Error boundaries
2020-06-26 16:47:52 -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
33a2df6ad9 Update all cornerstone commands 2020-06-26 14:22:45 -04:00
dannyrb
8339154820 Clean up old comments 2020-06-26 14:17:45 -04:00
dannyrb
c6ec439331 Make sure primary cornerstone extension has references to enabled elements 2020-06-26 14:14:25 -04:00
dannyrb
8607659501 Test that we can access activeViewportIndex from extension 2020-06-26 13:51:27 -04:00
igoroctaviano
b34a9880f7 Use modal as default fallback 2020-06-26 14:47:18 -03: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
Rodrigo Antinarelli
0d53346d61 Merge branch 'feat/v2-main' of https://github.com/OHIF/Viewers into feat/ui-v2-Dropdown 2020-06-26 12:42:56 -03:00
Rodrigo Antinarelli
edd4a4118c
feat: Modal + ViewportDownloadForm (#1799)
* feat: Modal + ViewportDownloadForm

* styles for image preview box

* modal update & close handler

* open modal for Learn More (search info)

* change modal default alignment

* Update platform/ui/src/components/InputNumber/InputNumber.mdx

* nuke inputNumber and use inputText with refactor

* make input more reusable

* revert inputText "number" stuff

* replace inputText to Input

* fix input spacing + label

* fix modal overlay classes

* fix inline styles

* fix onclick learn more

* fix close icon

* revert transition

* remove inline styles

* remove unecessary stuff
2020-06-26 16:34:43 +01: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
James Petts
8f05cf73c7
Add authoring information to exported DICOMs using the DICOMWeb DataSource (#1819)
* OHIF-177 JSDocs.

* Add proxy for activeDataSource to extensionManager.

* Add app authoring information.
2020-06-26 10:24:19 +01:00
Danny Brown
0264e5998d
Merge branch 'feat/v2-main' into feat/OHIF-177 2020-06-25 16:17:50 -04:00
igoroctaviano
6eb474be88 Add active state 2020-06-25 16:51:48 -03:00
igoroctaviano
52521c5b56 Add active state 2020-06-25 16:49:46 -03:00
igoroctaviano
5d89460326 Merge branch 'feat/v2-main' of github.com:OHIF/Viewers into feat/ohif-151 2020-06-25 16:13:47 -03:00
igoroctaviano
3f0619848b Update code to avoid intercepting onclick 2020-06-25 16:03:06 -03:00
Danny Brown
11932f460e
Merge pull request #1813 from OHIF/feat/v2-main
catch-up
2020-06-25 14:39:45 -04:00
igoroctaviano
44297af965 Create window level dropdown menu 2020-06-25 15:27:42 -03:00
Rodrigo Antinarelli
3dc4cf6cea useCallback to avoid redeclaring functions 2020-06-25 14:08:09 -03: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
igoroctaviano
911f93d378 Update toolbar service and add active icon in nested button 2020-06-24 12:11:54 -03:00
Rodrigo Antinarelli
a19c1acd7b fix dropdown title 2020-06-24 01:27:02 -03:00
Rodrigo Antinarelli
db0ce2f6f7 minor fixes 2020-06-24 01:16:56 -03:00
Rodrigo Antinarelli
6ce531a6d2 fix icon dropdown 2020-06-23 23:40:45 -03:00
Rodrigo Antinarelli
9dbbc709f4 remove fragment 2020-06-23 23:22:57 -03:00
Rodrigo Antinarelli
8b2c68d1bf add i18n to header 2020-06-23 23:05:45 -03:00
Rodrigo Antinarelli
1441062d95 using dropdown and opening modal for preferences 2020-06-23 00:10:58 -03:00
Rodrigo Antinarelli
a538824cc7 feat: Modal + ViewportDownloadForm 2020-06-19 20:59:09 -03:00
dannyrb
4ec357bec4 Commands running on at least first viewport 2020-06-17 08:50:11 -04:00
dannyrb
16aa777bda Merge branch 'feat/ui-v2-rebase-services' of github.com:OHIF/Viewers into feat/ui-v2-rebase-services 2020-06-17 08:48:38 -04:00
James A. Petts
084697687d Fix reactivity of SR Viewport when the user scrolls away and then jumps to a measurement on the same slice as the currently active measurement. 2020-06-17 08:45:40 +01:00
James A. Petts
73bb4de140 SR viewport to cornerstone viewport consistency updates. 2020-06-17 08:25:10 +01:00
dannyrb
0f2bae008d Expose probe tool 2020-06-16 23:56:56 -04: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
5eb06d0916 Wire up mode buttons to mode routes; Expose displayName; 2020-06-16 22:06:54 -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
33cee9e898 fix null dropdowncontent 2020-06-16 00:43:16 -04:00
dannyrb
f2b77d2a4a fix missing import 2020-06-16 00:43:04 -04:00
dannyrb
7e856c7605 Remove debugger statements 2020-06-16 00:01:36 -04:00
dannyrb
140c562519 fix secondary toolbar styling 2020-06-16 00:00:47 -04:00
dannyrb
570424e3e9 Add support for LayoutSelector 2020-06-15 23:38:48 -04:00
James A. Petts
00f0ae4bbc By default other tool state not loaded into the viewport. (set disabled) 2020-06-15 12:09:48 +01:00
James A. Petts
e7501933dd Pull in master 2020-06-15 09:23:35 +01: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
acc2537140 New @ohif/ui does not have ViewportDownloadForm; stub Hello World for time being 2020-06-14 23:44:03 -04:00
dannyrb
2d278be3fd Remove storeContexts for capture modal form 2020-06-14 23:43:31 -04:00
dannyrb
e104fb9fbd Clear showDownloadViewport command errors 2020-06-14 23:43:09 -04:00
dannyrb
8c1a844558 Nested toolbar w/ "sticky" when clicked 2020-06-14 23:42:44 -04:00
dannyrb
217d848f9f Do not expose cornerstone's toolbarModule 2020-06-14 21:58:37 -04:00
dannyrb
38203c9b31 Update example extension 2020-06-14 21:48:56 -04:00
dannyrb
f70392a52a Change toolbarModule scheme and extensionManager 2020-06-14 21:18:29 -04:00
James A. Petts
c5e6e97980 Merge in feat/ui-v2-rebase-services 2020-06-11 17:26:38 +01:00
James A. Petts
2fc171e297 Enable non-thumbnail entries in thumbnail list. 2020-06-10 14:10:00 +01:00
James A. Petts
6f6fea973d WIP 2020-06-10 13:33:56 +01:00
James A. Petts
c8b3e130d0 WIP 2020-06-10 09:09:33 +01: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
f3e783b63e wire up measurement service "removed" event w/ cornerstone ext 2020-06-09 13:37:26 -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
47b068afe4 Only add measurements after initial completion from csTools to MeasurementService 2020-06-07 11:23:47 -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
James A. Petts
83497795ca Finish render tool other than rotated ellipse and clean up. 2020-06-05 17:59:07 +01:00
James A. Petts
f4470c9625 Generate render tool. 2020-06-05 16:36:11 +01:00
James A. Petts
7bd041a02c WIP 2020-06-05 09:19:43 +01:00
James A. Petts
e9db84c2c2 WIP 2020-06-04 19:39:32 +01: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
James A. Petts
d39d103552 SR Viewport WIP 2020-06-04 13:26:06 +01:00
James A. Petts
99bf0e07b0 WIP SR Viewport. 2020-06-04 10:34:43 +01: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
70c39b9ad4 temporarily remove p10 loader 2020-06-03 14:30:29 -04:00
James A. Petts
558ab00c23 WIP SR viewport. 2020-06-03 18:12:13 +01: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
7a38b0048c Simplify cornerstone measurement subscriptions (short-term) 2020-05-27 22:21:00 -04:00
dannyrb
df95db6d15 Add referenceStudyUID to measurement schema 2020-05-27 22:20:40 -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
dannyrb
fae21bed9c Allow empty slots for rightPanels and leftPanels 2020-05-26 09:02:47 -04:00
dannyrb
60c4a36cc5 Remove unused connectedCornerstoneViewport; guidance notes on how to migrate 2020-05-26 09:02:30 -04:00
dannyrb
7487cbb28c Hoist ViewportGrid context so UI Services can access/update it 2020-05-23 23:57:14 -04:00
dannyrb
c9a4ab13ef empty viewport, prevent duplicate series meta from add, protect broadcast events when no data has changed 2020-05-23 22:15:21 -04:00
dannyrb
3a78d313ac remove dead code 2020-05-23 20:48:09 -04:00
dannyrb
40a62b1329 hoist state for expanded studies; allow multiple open 2020-05-22 15:47:38 -04:00
dannyrb
7c1dcb53c2 hoist activeTab state 2020-05-22 15:33:07 -04:00
dannyrb
4a390bfb66 fix thumbnail persistence 2020-05-22 14:31:51 -04:00
dannyrb
23a94251fc map is not reactive 2020-05-21 20:51:48 -04:00
dannyrb
f87d18936e basic pub/sub refresh for tabs from displaysets from dicommetadata 2020-05-21 20:34:53 -04:00
dannyrb
1892ec2a2a fix incorrect argument to retrieve studies 2020-05-21 20:33:08 -04:00
dannyrb
715377c565 Move files around to confuse James and Erik 2020-05-21 16:24:35 -04:00
dannyrb
b5070dd518 Merge branch 'feat/ui-v2-rebase-services' of github.com:OHIF/Viewers into feat/ui-v2-rebase-services
# Conflicts:
#	platform/viewer/src/routes/Mode/Mode.jsx
2020-05-20 21:08:49 -04:00
dannyrb
a323157c62 capture changes 2020-05-20 21:07:25 -04:00
James A. Petts
a3e1c216c4 Working cornerstone tools buttons, needs UI updates + onClicks wrapped in toolbarService 2020-05-20 17:49:17 +01:00
James A. Petts
52d1b6276d Add in checks. 2020-05-20 12:59:10 +01:00
dannyrb
c3373357ee dropped item logs displaySetInstanceUID 2020-05-19 23:34:56 -04:00
dannyrb
591da12536 Drag and drop w/ dragSource + dragTarget w/o errors 2020-05-19 23:28:41 -04:00
dannyrb
1c33914e27 Display regular thumbnail; not tracked variant 2020-05-19 23:15:13 -04:00
James A. Petts
d83c868cdd Working, needs optimisation. 2020-05-19 18:22:38 +01:00
James A. Petts
940e745d8d WIP bring back thumbnails. 2020-05-19 15:02:03 +01:00
James A. Petts
cf0e88bd0b Rebuild study browser reactivity. 2020-05-19 14:56:25 +01:00
James A. Petts
f7ae544716 WIP, wrap command manager controls so we can pass these to the UI component. 2020-05-19 13:01:39 +01:00
Erik Ziegler
d54bd5738e WIP reorganization for study browser (again) 2020-05-19 13:55:38 +02:00
James A. Petts
156b9cfd09 Pull in upstream. 2020-05-19 10:04:42 +01:00
James A. Petts
6a3e0db53e ToolBarService 2020-05-19 10:01:44 +01:00
Erik Ziegler
b65a91129e Still broken, but app runs 2020-05-19 10:59:50 +02:00
Erik Ziegler
66c7bd7492 Fix viewports 2020-05-19 09:11:16 +02:00
Erik Ziegler
755e6b5f77 wip: need to fix StackManager 2020-05-18 23:40:28 +02:00
Erik Ziegler
63cf079288 Make thumbnails display 2020-05-18 23:21:41 +02:00
dannyrb
c55d069e32 refactor how we slowly build our studies array 2020-05-18 16:20:39 -04:00
dannyrb
351e0f76d6 start cleaning up panels 2020-05-18 15:05:49 -04:00
Erik Ziegler
1bb204b9a5 Stop using children 2020-05-18 19:49:32 +02:00
Erik Ziegler
488bb5d266 Fixed! 2020-05-18 18:21:43 +02:00
Erik Ziegler
4e683ecdde still broken 2020-05-18 18:11:24 +02:00
James A. Petts
7a8418f64b WIP DisplaySetService 2020-05-18 16:21:57 +01:00
Erik Ziegler
10930cda68 Avoid re-renders in study browser and entire page 2020-05-16 15:08:06 +02:00
James A. Petts
4fc3169fed display viewport. 2020-05-15 18:07:21 +01:00
Erik Ziegler
7c0d93f011 Try to do study panel the way react wants 2020-05-15 15:56:57 +02:00
Erik Ziegler
44733b987e Thumbnails sort of show up 2020-05-15 14:53:31 +02:00
Erik Ziegler
304caba873 Start adding measurement table 2020-05-15 14:31:18 +02:00
Erik Ziegler
f3f50d11fe Fixes after rebasing 2020-05-15 14:29:27 +02:00
Erik Ziegler
70b7158c9b StudyBrowser almost works 2020-05-15 13:09:46 +01:00
Erik Ziegler
ec2df02e83 Improve study browser 2020-05-15 13:06:23 +01:00
dannyrb
6044190ab1 Fine tune grid spacing 2020-05-15 13:05:56 +01:00
dannyrb
00347d3ecb Nuke "SecondaryToolbar" which is really just a Toolbar variant 2020-05-15 13:05:56 +01:00
dannyrb
ded1431fab Cleaner body styles on enter/exit for LayoutTemplate 2020-05-15 13:05:56 +01:00
dannyrb
6fdf35b370 Start to whittle away at ViewportGrid comment 2020-05-15 13:05:55 +01:00
dannyrb
ba152f082b Split ViewportLayout into parts and clean-up 2020-05-15 13:04:54 +01:00
Erik Ziegler
0c74a9bbcd Fixes for display sets, prep for tracking / grid stuff 2020-05-15 13:04:54 +01:00
Erik Ziegler
d131489aa3 Start adding StudyBrowser 2020-05-15 13:04:53 +01:00
James A. Petts
3b5764aea7 Rebase WADO + toolbar + displayset stuff on master 2020-05-15 13:04:53 +01:00
James A. Petts
b8a4ac231d something WIP 2020-05-15 13:04:53 +01:00
James A. Petts
4b9a1ee9d1 Remove all the debugging. 2020-05-15 13:04:53 +01:00
James A. Petts
07ca72d0df Added other required definitions. 2020-05-15 13:04:51 +01:00
James A. Petts
41c508b2da Add layout tools based on mode. 2020-05-15 13:04:09 +01:00
James A. Petts
c23c1e8db6 Add toolbar layout to context. 2020-05-15 13:04:09 +01:00
James A. Petts
c42aa37d7f Update extension manager to ingest each module type. Add toolbar Manager. 2020-05-15 13:04:06 +01:00
James A. Petts
a8340b9b69 WIP 2020-05-15 13:02:38 +01:00
James A. Petts
289d3f5703 Build WADO logic to fetch + build displaysets + generate imageIds based on prefs. 2020-05-15 13:02:04 +01:00
James A. Petts
d5c83bf596 WIP 2020-05-15 13:02:04 +01:00
dannyrb
4dccefb21f seriesInStudy method 2020-05-15 13:02:02 +01:00
dannyrb
1e58d8eb4b Wire up beginnings of series search 2020-05-15 13:02:02 +01:00
dannyrb
a11aea0439 Shift exampleInstances to a separate file 2020-05-15 13:02:02 +01:00
dannyrb
e29a777a9f fix studyDate sort and display 2020-05-15 13:02:01 +01:00
dannyrb
10729c2414 Sort for everything except studydate/time 2020-05-15 13:02:01 +01:00
dannyrb
1979928d59 Round trip mrn filtering 2020-05-15 13:02:01 +01:00
Erik Ziegler
3ce4b886ac Fix context usage in ModeRoute 2020-05-15 13:02:00 +01:00
dannyrb
8f284aafac apply start/end dates to qido search 2020-05-15 13:02:00 +01:00
dannyrb
1cd643314f parse and display correct time, if value is set 2020-05-15 13:01:59 +01:00
James A. Petts
5c19671d3c WIP build up displaysets. 2020-05-15 13:01:58 +01:00
Erik Ziegler
d4f51c5e3c Work on adding SOPClassHandler module based on default behaviour currently in OHIF 2020-05-15 13:01:55 +01:00
dannyrb
45ca73946d Very basic search test based on query param 2020-05-15 13:01:26 +01:00
dannyrb
6f9c27f10b basic initial search and passing data to LayoutTemplate for list route 2020-05-15 13:01:26 +01:00
Erik Ziegler
3cf2eb5ed8 Wire up contextModule, panelModule, layoutTemplateModule. Viewer sort of displays 2020-05-15 13:01:25 +01:00
Erik Ziegler
8acd744710 Continue the ModeRoute work. Routes are reachable, but extensionManager needs to be improve to provide module entries correctly 2020-05-15 13:01:25 +01:00
dannyrb
20dd83e702 Hydrate our first data source 2020-05-15 13:01:25 +01:00
dannyrb
14dabaabf6 layout template and side panel defaults
Co-authored-by: James Petts <jamesapetts@gmail.com>
Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
2020-05-15 13:00:06 +01:00
dannyrb
7069627266 Stub get context module
Co-authored-by: James Petts <jamesapetts@gmail.com>
Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
2020-05-15 13:00:06 +01:00