othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,541 Commits 1 Branch 2,327 Tags 465 MiB
87eab39768
Commit Graph

241 Commits

Author SHA1 Message Date
James Petts
58c2c00663
Fix caching issues with related studies. (#1970) 2020-08-06 17:25:42 +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
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
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
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
James Petts
25ded882ec
Disable double click for now. (#1872) 2020-07-06 08:28:21 -04:00
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
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
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
Igor Octaviano
f24f0bb11d
Fix preset values for window level (#1851) 2020-07-02 10:13:14 -04: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
igoroctaviano
5ca6757b44 Add error message of generate reportt 2020-06-30 14:02:23 -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 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
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
dannyrb
a0b0f365dd Handle for interaction outside of the ViewportDialog (default to cancel) 2020-06-29 23:29:40 -04:00
igoroctaviano
9e2ed50e79 add new overlay 2020-06-29 18:05:52 -03:00
Danny Brown
6db780842e
Merge pull request #1827 from OHIF/feat/ohif-127-196 
OHIF-127-196-191: Hotkeys config and defaults
 2020-06-29 15:09:06 -04:00
igoroctaviano
686acabd9f Wire presets 2020-06-29 14:53:49 -03:00
igoroctaviano
f96c1f6648 CR Updates 2020-06-29 13:58:36 -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
igoroctaviano
c8052e0e0a Add context to hotkeys manager 2020-06-29 11:57:16 -03:00
igoroctaviano
db795f3cb0 Add hotkeys config for modes and defaults to core 2020-06-29 11:53:46 -03: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
077143bd4a Update ViewportGridService interface 2020-06-26 13:28:50 -04: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
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
James Petts
81a764a78f
[OHIF-177] - JSDocs (#1818) 
* OHIF-177 JSDocs.

* Add proxy for activeDataSource to extensionManager.
 2020-06-26 10:01:13 +01:00
dannyrb
6e873cc92a Expose ViewportGridService API methods to extensions 2020-06-25 17:00:42 -04:00
Danny Brown
0264e5998d
Merge branch 'feat/v2-main' into feat/OHIF-177 2020-06-25 16:17:50 -04: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
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
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
83eb24337c Syntax error 2020-06-14 23:45:55 -04:00
dannyrb
8c1a844558 Nested toolbar w/ "sticky" when clicked 2020-06-14 23:42:44 -04:00
dannyrb
83e191b850 Update toolbar service to use button types, update longitudinal flow to use new service api 2020-06-14 21:20:32 -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
dannyrb
f3e783b63e wire up measurement service "removed" event w/ cornerstone ext 2020-06-09 13:37:26 -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
f4470c9625 Generate render tool. 2020-06-05 16:36:11 +01:00
dannyrb
df95db6d15 Add referenceStudyUID to measurement schema 2020-05-27 22:20:40 -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
f87d18936e basic pub/sub refresh for tabs from displaysets from dicommetadata 2020-05-21 20:34:53 -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
dannyrb
6bbe206a45 basic drop to set displaySet 2020-05-20 01:26:44 -04: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
James A. Petts
aec30e0db1 Update DisplaySetService 2020-05-19 09:30:16 +01: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
Erik Ziegler
979242c819 wip 2020-05-18 20:05:26 +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
44733b987e Thumbnails sort of show up 2020-05-15 14:53:31 +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
518ff4d6b5 Push grid, pane, and provider 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
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
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
Erik Ziegler
3ce4b886ac Fix context usage in ModeRoute 2020-05-15 13:02:00 +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
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
e4972a858c Remove quido portion of studies services, moved to IWebAPI implementation for dicomweb 2020-05-15 13:01:21 +01:00
dannyrb
b54e3734a7 Expose dicomMetadataStore in @ohif/core 2020-05-15 13:00:50 +01:00
dannyrb
e1690390d9 Expand extensionManager to index module definitions by namespace 2020-05-15 13:00:08 +01:00
dannyrb
f172f26dee Beginnings of a DICOMWeb API implementation that adheres to IWebApi interface 2020-05-15 13:00:07 +01:00
dannyrb
4edbb540da export named modules from DICOMWeb utility object 2020-05-15 13:00:07 +01:00