IDC-1532 multiple series search google #2026

JamesAPetts · 2020-09-03T09:56:16Z

Google Healthcare (and potentialy other platforms), only supports a single query parameter, so you can't filter on multiple SeriesInstanceUIDs.

This PR splits up the calls if using the google cloud adapter (I.e. if enableGoogleCloudAdapter is true in your app config).

codecov · 2020-09-03T09:56:42Z

Codecov Report

Merging #2026 into master will decrease coverage by 18.32%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master   #2026       +/-   ##
==========================================
- Coverage   19.24%   0.92%   -18.33%     
==========================================
  Files         188      97       -91     
  Lines        5097    2270     -2827     
  Branches     1012     380      -632     
==========================================
- Hits          981      21      -960     
+ Misses       3292    1874     -1418     
+ Partials      824     375      -449

Impacted Files	Coverage Δ
...r/src/appExtensions/GenericViewerCommands/index.js	`0.00% <0.00%> (ø)`
...iewer/src/appExtensions/MeasurementsPanel/index.js	`0.00% <0.00%> (ø)`
platform/viewer/src/connectedComponents/Viewer.js	`0.00% <ø> (ø)`
...wer/src/connectedComponents/ViewerLocalFileData.js	`0.00% <ø> (ø)`
...src/connectedComponents/ViewerRetrieveStudyData.js	`0.00% <0.00%> (ø)`
platform/viewer/src/index.js	`0.00% <0.00%> (ø)`
platform/viewer/src/routes/StandaloneRouting.js	`0.00% <ø> (ø)`
platform/core/src/redux/index.js
...orm/core/src/hanging-protocols/classes/Protocol.js
platform/core/src/measurements/lib/getLabel.js
... and 276 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 45ca88f...1b50577. Read the comment docs.

platform/core/src/studies/retrieveStudiesMetadata.js

swederik · 2020-09-03T11:12:21Z

platform/core/src/studies/retrieveStudyMetadata.js

+      filters
+    );
+  } else {
+    promise = new Promise((resolve, reject) => {


what is the point of this new promise? isn't it the same as promise = RetrieveMetadata(server, StudyInstanceUID, filters)?

This is just what was in the previous code. Hmm you are right, weird. Removed and tested, all works fine.

platform/core/src/studies/retrieveStudyMetadata.js

platform/viewer/public/config/idc.js

swederik · 2020-09-03T11:15:25Z

platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js

@@ -340,6 +341,10 @@ function ViewerRetrieveStudyData({
        }
      }

+      if (appConfig.enableGoogleCloudAdapter) {
+        retrieveParams.push(true); // Seperate SeriesInstanceUID filter calls.


This is really weird. Let's hope we never reorganize the arguments to the function.

I agree, I'd rather have a deconstructed object inside retrieveStudiesMetadata, but it'd change what is actually top level API in @ohif/core.

swederik

Seems fine if you fix the spelling of separate

* feat: 🎸 Update react-vtkjs-viewport usage to use requestPool (OHIF#1984) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * Remove debugger Co-authored-by: Erik Ziegler <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * fix: Avoid lerna:restore unless we are on Netlify (closes OHIF#1926, OHIF#1996) * wip * fix: Fix incorrect command name in Percy test (OHIF#1999) * perf(stackPrefetch): Added stackPrefetch config with 20 max concurrent requests (OHIF#2000) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * feat: 🎸 Filter/promote multiple series instances (OHIF#1533) improve filter/promote to be applied on multiple series instances ✅ Closes: 1532 Co-authored-by: Rodolfo Ladeira <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * fix: 🐛 Fail gracefully on an MPR load error (OHIF#1992) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * fix: 🐛 Fail gracefully on an MPR load error * Respond to reviewer comments. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1994] Sort series list by SeriesNumber, and sort by same SeriesNumber by date/time. (OHIF#2010) * Sort based on SeriesNumber and SeriesDate/SeriesTime. * Harden, and perform final sort in algorithm if last N entries have the same SeriesNumber. * Switch to insertion rather than sorting as sorting is too slow. Reimplement low priority sorting into new insertion method. * Fix local file viewing. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2017] Harden segmentation import to support more SEGs (OHIF#2024) * fix: 🐛 Upgrade dcmjs version to support more SEGs * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1939] Debug Dialog part 1 (OHIF#2011) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * IDC-1532 multiple series search google (OHIF#2026) * Multiple series search for google cloud adapter. * Revert IDC config. * fix: 🐛 Series filtering on multiple series for google * Revert changes to default config. * Address reviewers comments. * Fixed spelling mistakes * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * Split query parameter calls. (OHIF#2035) * chore(release): publish [skip ci] - @ohif/[email protected] * [IDC-1672] Highlight SEG segment/ RT structure when click to jump. (OHIF#2034) * Highlight for RTSTRUCT. * SEG temp crosshairs. * Disable RT highlighting for now. * Remove TODO * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1129] - DICOM Tag Viewer extension (OHIF#2022) * WIP render top level tags. * Add drop down to select series. * Fix errors with type 2 sequences. * WIP swap instance. * Fix formatting and make fullscreen. * Remove debuggers. * Finish formatting. * Fix error with double SeriesNumber deconstruction. * Address reviewer comments. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2006] - optional mailTo for debugging extension. (OHIF#2027) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * WIP * WIP * Finish mailTo * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1905] Hover tooltips for Segmentation + RTSTRUCT extension (OHIF#2044) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * WIP * WIP * Finish mailTo * tooltop Co-authored-by: Erik Ziegler <[email protected]> Co-authored-by: ohif-bot <[email protected]> Co-authored-by: Alex Broaddus <[email protected]> Co-authored-by: Danny Brown <[email protected]> Co-authored-by: ladeirarodolfo <[email protected]> Co-authored-by: Rodolfo Ladeira <[email protected]>

* feat: 🎸 Update react-vtkjs-viewport usage to use requestPool (OHIF#1984) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * Remove debugger Co-authored-by: Erik Ziegler <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * fix: Avoid lerna:restore unless we are on Netlify (closes OHIF#1926, OHIF#1996) * wip * fix: Fix incorrect command name in Percy test (OHIF#1999) * perf(stackPrefetch): Added stackPrefetch config with 20 max concurrent requests (OHIF#2000) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * feat: 🎸 Filter/promote multiple series instances (OHIF#1533) improve filter/promote to be applied on multiple series instances ✅ Closes: 1532 Co-authored-by: Rodolfo Ladeira <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * fix: 🐛 Fail gracefully on an MPR load error (OHIF#1992) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * fix: 🐛 Fail gracefully on an MPR load error * Respond to reviewer comments. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1994] Sort series list by SeriesNumber, and sort by same SeriesNumber by date/time. (OHIF#2010) * Sort based on SeriesNumber and SeriesDate/SeriesTime. * Harden, and perform final sort in algorithm if last N entries have the same SeriesNumber. * Switch to insertion rather than sorting as sorting is too slow. Reimplement low priority sorting into new insertion method. * Fix local file viewing. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2017] Harden segmentation import to support more SEGs (OHIF#2024) * fix: 🐛 Upgrade dcmjs version to support more SEGs * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1939] Debug Dialog part 1 (OHIF#2011) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * IDC-1532 multiple series search google (OHIF#2026) * Multiple series search for google cloud adapter. * Revert IDC config. * fix: 🐛 Series filtering on multiple series for google * Revert changes to default config. * Address reviewers comments. * Fixed spelling mistakes * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * Split query parameter calls. (OHIF#2035) * chore(release): publish [skip ci] - @ohif/[email protected] * [IDC-1672] Highlight SEG segment/ RT structure when click to jump. (OHIF#2034) * Highlight for RTSTRUCT. * SEG temp crosshairs. * Disable RT highlighting for now. * Remove TODO * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1129] - DICOM Tag Viewer extension (OHIF#2022) * WIP render top level tags. * Add drop down to select series. * Fix errors with type 2 sequences. * WIP swap instance. * Fix formatting and make fullscreen. * Remove debuggers. * Finish formatting. * Fix error with double SeriesNumber deconstruction. * Address reviewer comments. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2006] - optional mailTo for debugging extension. (OHIF#2027) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * WIP * WIP * Finish mailTo * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1905] Hover tooltips for Segmentation + RTSTRUCT extension (OHIF#2044) * WIP debug dialog * Rename the p10 downloader extension to debugger extension, add button to toolbar. Deactivate it by default. * Fix unit tests * WIP * WIP * Finish mailTo * tooltop * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2049] Sort Tags in Tag browser split items in sequences, add indent after space. (OHIF#2053) * Sort tag browser, add items, add indent. * Remove debugger. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * Update react-cornerstone-viewport for performance improvements (OHIF#2062) * Update react-cornerstone-viewport * Bump react-cornerstone-viewport version. * Comment out tests which always cause problems. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * [IDC-2052] PWA start url (OHIF#2070) Change start_url in manifest.json from "./index.html" to "./" Co-authored-by: Woonchan Cho <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] * fix: Enable port changes for Docker image using the PORT variable (OHIF#2016) * fix: use SeriesMetadata method instead of property in findMostRecentStructuredReport (OHIF#2038) fixes OHIF#1714 Call getInstanceCount() instead of manually checking length (which does not work) Co-authored-by: Stefan Silviu <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] Co-authored-by: Erik Ziegler <[email protected]> Co-authored-by: ohif-bot <[email protected]> Co-authored-by: Alex Broaddus <[email protected]> Co-authored-by: Danny Brown <[email protected]> Co-authored-by: ladeirarodolfo <[email protected]> Co-authored-by: Rodolfo Ladeira <[email protected]> Co-authored-by: Woonchan Cho <[email protected]> Co-authored-by: Woonchan Cho <[email protected]> Co-authored-by: Nicolas Byl <[email protected]> Co-authored-by: Ștefan Silviu-Alexandru <[email protected]> Co-authored-by: Stefan Silviu <[email protected]>

JamesAPetts added 3 commits September 3, 2020 10:52

Multiple series search for google cloud adapter.

c590dcc

Revert IDC config.

7c0d144

fix: 🐛 Series filtering on multiple series for google

4fdbf59

Revert changes to default config.

9fa43e0

swederik reviewed Sep 3, 2020

View reviewed changes

platform/core/src/studies/retrieveStudiesMetadata.js Outdated Show resolved Hide resolved

swederik reviewed Sep 3, 2020

View reviewed changes

platform/core/src/studies/retrieveStudyMetadata.js Show resolved Hide resolved

swederik reviewed Sep 3, 2020

View reviewed changes

platform/viewer/public/config/idc.js Outdated Show resolved Hide resolved

swederik reviewed Sep 3, 2020

View reviewed changes

swederik approved these changes Sep 3, 2020

View reviewed changes

JamesAPetts added 3 commits September 3, 2020 13:19

Address reviewers comments.

eea35d3

Fixed spelling mistakes

2a5925f

Merge branch 'master' into IDC-1532-multipleSeriesSearchGoogle

1b50577

JamesAPetts merged commit f389790 into master Sep 3, 2020

thibaut-etienne-deemea added a commit to Deemea/Viewers that referenced this pull request Dec 2, 2024

[OHIF#2026 Save calibration value from ohif to claude

bf9733b

thibaut-etienne-deemea added a commit to Deemea/Viewers that referenced this pull request Dec 9, 2024

[OHIF#2026 Save calibration value from ohif to claude (#18)

b9225b2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IDC-1532 multiple series search google #2026

IDC-1532 multiple series search google #2026

JamesAPetts commented Sep 3, 2020 •

edited

Loading

codecov bot commented Sep 3, 2020 •

edited

Loading

swederik Sep 3, 2020

JamesAPetts Sep 3, 2020

swederik Sep 3, 2020

JamesAPetts Sep 3, 2020

swederik left a comment

IDC-1532 multiple series search google #2026

IDC-1532 multiple series search google #2026

Conversation

JamesAPetts commented Sep 3, 2020 • edited Loading

codecov bot commented Sep 3, 2020 • edited Loading

Codecov Report

swederik Sep 3, 2020

Choose a reason for hiding this comment

JamesAPetts Sep 3, 2020

Choose a reason for hiding this comment

swederik Sep 3, 2020

Choose a reason for hiding this comment

JamesAPetts Sep 3, 2020

Choose a reason for hiding this comment

swederik left a comment

Choose a reason for hiding this comment

JamesAPetts commented Sep 3, 2020 •

edited

Loading

codecov bot commented Sep 3, 2020 •

edited

Loading