Commit Graph

178 Commits

Author SHA1 Message Date
Igor Octaviano
8d61e3ae4c
OHIF-8: Pass fuzzymatching option from config (#1837)
* Add fuzzmatching property

* Update param

* Add wildcards
2020-07-10 11:59:29 -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
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
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
801bf73a34
Update dcmjs to fix bidirectional issue. (#1848) 2020-07-02 10:56:36 +01: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
236b89a551 Make sure measurements table updates 2020-06-30 16:04:07 -04:00
dannyrb
eb0f38ebf2 Prevent default measurementpanel crash 2020-06-30 15:48:24 -04: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 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
igoroctaviano
38a92ae18d Fix broken solution 2020-06-29 16:12:42 -03: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
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
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
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
James A. Petts
74c1462271 Working local download, STOW to PACS an view in SR Viewport. 2020-06-25 17:21:03 +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
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
33cee9e898 fix null dropdowncontent 2020-06-16 00:43:16 -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
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
8c1a844558 Nested toolbar w/ "sticky" when clicked 2020-06-14 23:42:44 -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
dannyrb
0573cb18e6 Add support for SET_LAYOUT action on viewportGrid reducer 2020-06-07 11:48:13 -04:00
dannyrb
95249928a8 Replace measurementsPanel w/ a format that reduces nesting 2020-06-04 11:28:10 -04:00
dannyrb
c3dd2608b2 wire up some ActionBar data; default grid to 2x2 2020-05-27 08:56:52 -04:00
dannyrb
fae21bed9c Allow empty slots for rightPanels and leftPanels 2020-05-26 09:02:47 -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
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
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