Commit Graph
100 Commits
Author SHA1 Message Date
James PettsandJames Petts e849199eb0 fix(auth): oidc-react-issue (#4410)
Co-authored-by: James Petts <jamespetts@Yunu-MacBookPro-JamesPetts.local>
2024-10-11 09:09:26 -04:00
James Petts 509c41fbab fix: retrieveSeriesMetadata (#2703) 2022-02-08 08:17:37 -05:00
James A. Petts 414ebc6850 chore: Tag everything currently unused as legacy. 2021-02-11 17:29:07 +01: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 3267706b33 [OHIF-302] fix: Set SeriesNumber for generated SRs to 4700 or above (#1953) 2020-08-07 16:57:40 +02:00
James Petts 58c2c00663 Fix caching issues with related studies. (#1970) 2020-08-06 17:25:42 +02:00
James Petts 8e6b3ac580 Show 1-based in stack position of measurement in measurements panel. (#1967) 2020-08-06 12:25:27 +02:00
James Petts 2ded8b7ee8 change DP of SR viewport to 1dp (#1968) 2020-08-06 12:10:42 +02:00
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 14:56:02 +02:00
James Petts 5f487840a1 OHIF-325: Remove trailing zeroes from patient age (#1941) 2020-07-31 19:00:00 +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 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
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 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 PettsandDanny Brown 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
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
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
James A. Petts 56358ad95f WIP callout in SR viewport. 2020-06-30 19:00:37 +02:00
James A. Petts 2704bd7cbc fix length tracking bug 2020-06-30 18:20:20 +02:00
James A. Petts 690442555c Fix typo 2020-06-30 17:58:20 +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 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
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
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 11:24:19 +02:00
James Petts 81a764a78f [OHIF-177] - JSDocs (#1818)
* OHIF-177 JSDocs.

* Add proxy for activeDataSource to extensionManager.
2020-06-26 11:01:13 +02:00
James PettsandDanny Brown 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 18:46:17 +02:00
James A. Petts 0fe7083c51 Rebase on master 2020-06-25 18:24:57 +02: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 Petts c01466762d WIP Measurements service. (#1808) 2020-06-25 18:13:31 +02:00
James A. Petts 7b7b63de93 WIP Measurements service. 2020-06-25 12:15:33 +02: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 09:45:40 +02:00
James A. Petts 73bb4de140 SR viewport to cornerstone viewport consistency updates. 2020-06-17 09:25:10 +02:00
James A. Petts 00f0ae4bbc By default other tool state not loaded into the viewport. (set disabled) 2020-06-15 13:09:48 +02:00
James A. Petts e7501933dd Pull in master 2020-06-15 10:23:35 +02:00
James A. Petts c5e6e97980 Merge in feat/ui-v2-rebase-services 2020-06-11 18:26:38 +02:00
James A. Petts 2fc171e297 Enable non-thumbnail entries in thumbnail list. 2020-06-10 15:10:00 +02:00
James A. Petts 6f6fea973d WIP 2020-06-10 14:33:56 +02:00
James A. Petts c8b3e130d0 WIP 2020-06-10 10:09:33 +02:00
James A. Petts 83497795ca Finish render tool other than rotated ellipse and clean up. 2020-06-05 18:59:07 +02:00
James A. Petts f4470c9625 Generate render tool. 2020-06-05 17:36:11 +02:00
James A. Petts 7bd041a02c WIP 2020-06-05 10:19:43 +02:00
James A. Petts e9db84c2c2 WIP 2020-06-04 20:39:32 +02:00
James A. Petts d39d103552 SR Viewport WIP 2020-06-04 14:26:06 +02:00
James A. Petts 99bf0e07b0 WIP SR Viewport. 2020-06-04 11:34:43 +02:00
James A. Petts 558ab00c23 WIP SR viewport. 2020-06-03 19:12:13 +02:00
James A. Petts a3e1c216c4 Working cornerstone tools buttons, needs UI updates + onClicks wrapped in toolbarService 2020-05-20 18:49:17 +02:00
James A. Petts 52d1b6276d Add in checks. 2020-05-20 13:59:10 +02:00
James A. Petts d83c868cdd Working, needs optimisation. 2020-05-19 19:22:38 +02:00
James A. Petts 940e745d8d WIP bring back thumbnails. 2020-05-19 16:02:03 +02:00
James A. Petts cf0e88bd0b Rebuild study browser reactivity. 2020-05-19 15:56:25 +02:00
James A. Petts f7ae544716 WIP, wrap command manager controls so we can pass these to the UI component. 2020-05-19 14:01:39 +02:00
James A. Petts 156b9cfd09 Pull in upstream. 2020-05-19 11:04:42 +02:00
James A. Petts 6a3e0db53e ToolBarService 2020-05-19 11:01:44 +02:00
James A. Petts aec30e0db1 Update DisplaySetService 2020-05-19 10:30:16 +02:00
James A. Petts 7a8418f64b WIP DisplaySetService 2020-05-18 17:21:57 +02:00
James A. PettsandDanny Brown 649216fde4 Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> 2020-05-18 15:46:05 +02:00
James A. Petts 4fc3169fed display viewport. 2020-05-15 19:07:21 +02:00
James A. Petts 3b5764aea7 Rebase WADO + toolbar + displayset stuff on master 2020-05-15 14:04:53 +02:00
James A. Petts b8a4ac231d something WIP 2020-05-15 14:04:53 +02:00
James A. Petts 4b9a1ee9d1 Remove all the debugging. 2020-05-15 14:04:53 +02:00
James A. Petts 07ca72d0df Added other required definitions. 2020-05-15 14:04:51 +02:00
James A. Petts 41c508b2da Add layout tools based on mode. 2020-05-15 14:04:09 +02:00
James A. Petts c23c1e8db6 Add toolbar layout to context. 2020-05-15 14:04:09 +02:00
James A. Petts c42aa37d7f Update extension manager to ingest each module type. Add toolbar Manager. 2020-05-15 14:04:06 +02:00
James A. Petts a8340b9b69 WIP 2020-05-15 14:02:38 +02:00
James A. Petts 289d3f5703 Build WADO logic to fetch + build displaysets + generate imageIds based on prefs. 2020-05-15 14:02:04 +02:00
James A. Petts d5c83bf596 WIP 2020-05-15 14:02:04 +02:00
James A. Petts 5c19671d3c WIP build up displaysets. 2020-05-15 14:01:58 +02:00
James Petts c4f84b1174 fix: 🐛 Fix seg color load (#1724) 2020-05-12 16:47:35 +02:00
James Petts fa95bae6ef Support initialization of segment color from RecommendedDisplayCIELabValue (#1709)
* fix: 🐛 Proper error handling for derived display sets

* Revert idc.js change

* Load correct Segment colors.
2020-05-04 16:43:09 +02:00
James Petts 5b20d8f323 fix: 🐛 Proper error handling for derived display sets (#1708)
* fix: 🐛 Proper error handling for derived display sets

* Revert idc.js change
2020-05-04 16:10:39 +02:00
James Petts 71205618ec fix: 🐛 Multiframe fix (#1661) 2020-04-23 12:02:51 +02:00
James Pettsanddannyrb e96205de35 feat: configuration to hook into XHR Error handling
* Error handling.

* Fix error handling, add redirect example.

* remove debugger

* docs: whitelabeling and httpErrorHandler

* bump dicomweb-client version

* bump cornerstone-wado-image-loader version

* Add more documentation around httpErrorHandler callback

* test: add errorHandler as an expected top level export

Co-authored-by: dannyrb <danny.ri.brown@gmail.com>
2020-04-22 22:01:34 -04:00
James PettsandDanny Brown 9e0bd52c6a fix: 🐛 Fix multiframe images (#1595)
Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
2020-04-02 13:56:53 -04:00
James Petts b459b894bd Sm fix (#1585)
* Fix broken SM viewport.

* fix: 🐛 Fix broken SM viewport
2020-03-31 15:28:11 +02:00
James PettsandDanny 1d85f7a74e Instance metadata/metadata providers overhaul (#1481)
* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Update JSON CI

* Update casing of import.

* Fix jump for SR.

* Fix unit tests for measurements service

* Fix json CI test.

* fix: update yarn lock

* Fix local non-encapsulated pdf view

* CI updated to new sucess message.

Co-authored-by: Danny <danny.ri.brown@gmail.com>
2020-03-09 19:03:23 +00:00
James Petts 1d86b1a102 fix: 🐛 Upgrade react-vtkjs-viewport to fix volume orientation (#1143) 2019-11-04 10:45:53 +01:00
James Petts 460e375f0a fix: 🐛 Orthographic MPR fix (#1092)
* fix: 🐛 Orthographic MPR fix
2019-10-25 19:43:34 +02:00