-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[IDC-1994] Sort series list by SeriesNumber, and sort by same SeriesNumber by date/time. #2010
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2010 +/- ##
==========================================
- Coverage 19.24% 0.92% -18.32%
==========================================
Files 188 97 -91
Lines 5097 2266 -2831
Branches 1012 379 -633
==========================================
- Hits 981 21 -960
+ Misses 3292 1871 -1421
+ Partials 824 374 -450 Continue to review full report at Codecov.
|
…lement low priority sorting into new insertion method.
@dannyrb ready for re-review. |
let startingIndex; | ||
|
||
// Find where the first low priority displaySet is. | ||
for (let i = 0; i < displaySets.length; i++) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
optimization, so not blocking: we can cache this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or we can maintain these as separate lists internally, and then provide "displaysets" by joining the two
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good points, we can keep further optimisations in mind if speed becomes an issue (maybe with multiple hundred SRs?), but I think we've already spent enough IDC time sorting the list.
@@ -372,7 +365,7 @@ export class StudyMetadata extends Metadata { | |||
*/ | |||
addDisplaySet(displaySet) { | |||
if (displaySet instanceof ImageSet || displaySet.sopClassModule) { | |||
this._displaySets.push(displaySet); | |||
this._insertDisplaySet(displaySet); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be nice to pull this bit out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean? pull this out where?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
Does it purr like a kitten now?
It does purr like a kitten meow. |
* 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 <erik.sweed@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.0 - @ohif/extension-dicom-rt@0.4.0 - @ohif/extension-dicom-segmentation@0.4.0 - @ohif/extension-vtk@1.7.0 - @ohif/core@2.10.0 - @ohif/viewer@4.4.0 * 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 <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.1 - @ohif/viewer@4.4.1 * 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 <rodolfo_radical@hotmail.com> * chore(release): publish [skip ci] - @ohif/viewer@4.5.0 * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.2 - @ohif/viewer@4.5.1 * 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/extension-vtk@1.7.1 - @ohif/viewer@4.5.2 * [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/extension-dicom-html@1.2.5 - @ohif/extension-dicom-microscopy@0.51.1 - @ohif/extension-dicom-pdf@1.0.4 - @ohif/extension-dicom-rt@0.4.1 - @ohif/extension-dicom-segmentation@0.4.1 - @ohif/extension-vtk@1.7.2 - @ohif/core@2.10.1 - @ohif/viewer@4.5.3 Co-authored-by: James Petts <jamesapetts@gmail.com> Co-authored-by: Erik Ziegler <erik.sweed@gmail.com> Co-authored-by: ohif-bot <danny.ri.brown+ohif-bot@gmail.com> Co-authored-by: Alex Broaddus <alexbroaddus1@gmail.com> Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> Co-authored-by: ladeirarodolfo <39910206+ladeirarodolfo@users.noreply.github.com> Co-authored-by: Rodolfo Ladeira <rodolfo_radical@hotmail.com>
* 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 <erik.sweed@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.0 - @ohif/extension-dicom-rt@0.4.0 - @ohif/extension-dicom-segmentation@0.4.0 - @ohif/extension-vtk@1.7.0 - @ohif/core@2.10.0 - @ohif/viewer@4.4.0 * 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 <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.1 - @ohif/viewer@4.4.1 * 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 <rodolfo_radical@hotmail.com> * chore(release): publish [skip ci] - @ohif/viewer@4.5.0 * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.2 - @ohif/viewer@4.5.1 * 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/extension-vtk@1.7.1 - @ohif/viewer@4.5.2 * [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/extension-dicom-html@1.2.5 - @ohif/extension-dicom-microscopy@0.51.1 - @ohif/extension-dicom-pdf@1.0.4 - @ohif/extension-dicom-rt@0.4.1 - @ohif/extension-dicom-segmentation@0.4.1 - @ohif/extension-vtk@1.7.2 - @ohif/core@2.10.1 - @ohif/viewer@4.5.3 * [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/extension-cornerstone@2.9.3 - @ohif/extension-dicom-html@1.2.6 - @ohif/extension-dicom-rt@0.4.2 - @ohif/extension-dicom-segmentation@0.4.2 - @ohif/extension-vtk@1.7.3 - @ohif/core@2.10.2 - @ohif/viewer@4.5.4 * [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/extension-cornerstone@2.9.4 - @ohif/extension-debugging@0.1.3 - @ohif/extension-dicom-html@1.2.7 - @ohif/extension-dicom-microscopy@0.51.2 - @ohif/extension-dicom-pdf@1.0.5 - @ohif/extension-dicom-rt@0.4.3 - @ohif/extension-dicom-segmentation@0.4.3 - @ohif/extension-lesion-tracker@0.2.1 - @ohif/extension-vtk@1.7.4 - @ohif/core@2.10.3 - @ohif/viewer@4.5.5 * 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/extension-vtk@1.7.5 - @ohif/core@2.10.4 - @ohif/viewer@4.5.6 * Split query parameter calls. (OHIF#2035) * chore(release): publish [skip ci] - @ohif/viewer@4.5.7 * [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/extension-debugging@0.1.4 - @ohif/extension-dicom-rt@0.4.4 - @ohif/extension-dicom-segmentation@0.4.4 - @ohif/viewer@4.5.8 * [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/extension-dicom-html@1.2.8 - @ohif/extension-dicom-microscopy@0.51.3 - @ohif/extension-dicom-pdf@1.0.6 - @ohif/extension-dicom-rt@0.4.5 - @ohif/extension-dicom-segmentation@0.4.5 - @ohif/extension-dicom-tag-browser@0.0.2 - @ohif/extension-vtk@1.7.6 - @ohif/core@2.10.5 - @ohif/ui@1.5.4 - @ohif/viewer@4.5.9 * [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/extension-debugging@0.1.5 - @ohif/extension-vtk@1.7.7 - @ohif/ui@1.5.5 - @ohif/viewer@4.5.10 * [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 <erik.sweed@gmail.com> Co-authored-by: ohif-bot <danny.ri.brown+ohif-bot@gmail.com> Co-authored-by: Alex Broaddus <alexbroaddus1@gmail.com> Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> Co-authored-by: ladeirarodolfo <39910206+ladeirarodolfo@users.noreply.github.com> Co-authored-by: Rodolfo Ladeira <rodolfo_radical@hotmail.com>
* 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 <erik.sweed@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.0 - @ohif/extension-dicom-rt@0.4.0 - @ohif/extension-dicom-segmentation@0.4.0 - @ohif/extension-vtk@1.7.0 - @ohif/core@2.10.0 - @ohif/viewer@4.4.0 * 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 <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.1 - @ohif/viewer@4.4.1 * 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 <rodolfo_radical@hotmail.com> * chore(release): publish [skip ci] - @ohif/viewer@4.5.0 * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> * chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.9.2 - @ohif/viewer@4.5.1 * 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/extension-vtk@1.7.1 - @ohif/viewer@4.5.2 * [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/extension-dicom-html@1.2.5 - @ohif/extension-dicom-microscopy@0.51.1 - @ohif/extension-dicom-pdf@1.0.4 - @ohif/extension-dicom-rt@0.4.1 - @ohif/extension-dicom-segmentation@0.4.1 - @ohif/extension-vtk@1.7.2 - @ohif/core@2.10.1 - @ohif/viewer@4.5.3 * [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/extension-cornerstone@2.9.3 - @ohif/extension-dicom-html@1.2.6 - @ohif/extension-dicom-rt@0.4.2 - @ohif/extension-dicom-segmentation@0.4.2 - @ohif/extension-vtk@1.7.3 - @ohif/core@2.10.2 - @ohif/viewer@4.5.4 * [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/extension-cornerstone@2.9.4 - @ohif/extension-debugging@0.1.3 - @ohif/extension-dicom-html@1.2.7 - @ohif/extension-dicom-microscopy@0.51.2 - @ohif/extension-dicom-pdf@1.0.5 - @ohif/extension-dicom-rt@0.4.3 - @ohif/extension-dicom-segmentation@0.4.3 - @ohif/extension-lesion-tracker@0.2.1 - @ohif/extension-vtk@1.7.4 - @ohif/core@2.10.3 - @ohif/viewer@4.5.5 * 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/extension-vtk@1.7.5 - @ohif/core@2.10.4 - @ohif/viewer@4.5.6 * Split query parameter calls. (OHIF#2035) * chore(release): publish [skip ci] - @ohif/viewer@4.5.7 * [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/extension-debugging@0.1.4 - @ohif/extension-dicom-rt@0.4.4 - @ohif/extension-dicom-segmentation@0.4.4 - @ohif/viewer@4.5.8 * [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/extension-dicom-html@1.2.8 - @ohif/extension-dicom-microscopy@0.51.3 - @ohif/extension-dicom-pdf@1.0.6 - @ohif/extension-dicom-rt@0.4.5 - @ohif/extension-dicom-segmentation@0.4.5 - @ohif/extension-dicom-tag-browser@0.0.2 - @ohif/extension-vtk@1.7.6 - @ohif/core@2.10.5 - @ohif/ui@1.5.4 - @ohif/viewer@4.5.9 * [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/extension-debugging@0.1.5 - @ohif/extension-vtk@1.7.7 - @ohif/ui@1.5.5 - @ohif/viewer@4.5.10 * [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/extension-dicom-rt@0.4.6 - @ohif/extension-dicom-segmentation@0.4.6 - @ohif/viewer@4.5.11 * [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/extension-dicom-tag-browser@0.0.3 - @ohif/viewer@4.5.12 * 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/extension-cornerstone@2.9.5 - @ohif/viewer@4.5.13 * [IDC-2052] PWA start url (OHIF#2070) Change start_url in manifest.json from "./index.html" to "./" Co-authored-by: Woonchan Cho <wcho24@wustl.edu> * chore(release): publish [skip ci] - @ohif/viewer@4.5.14 * 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 <silviu.stefan@ab4.systems> * chore(release): publish [skip ci] - @ohif/extension-vtk@1.7.8 - @ohif/core@2.10.6 - @ohif/viewer@4.5.15 Co-authored-by: Erik Ziegler <erik.sweed@gmail.com> Co-authored-by: ohif-bot <danny.ri.brown+ohif-bot@gmail.com> Co-authored-by: Alex Broaddus <alexbroaddus1@gmail.com> Co-authored-by: Danny Brown <danny.ri.brown@gmail.com> Co-authored-by: ladeirarodolfo <39910206+ladeirarodolfo@users.noreply.github.com> Co-authored-by: Rodolfo Ladeira <rodolfo_radical@hotmail.com> Co-authored-by: Woonchan Cho <cronus17@gmail.com> Co-authored-by: Woonchan Cho <wcho24@wustl.edu> Co-authored-by: Nicolas Byl <nico@nicolas-byl.eu> Co-authored-by: Ștefan Silviu-Alexandru <sylviu44@gmail.com> Co-authored-by: Stefan Silviu <silviu.stefan@ab4.systems>
RE: #1994
Update: