-
Notifications
You must be signed in to change notification settings - Fork 234
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
Patient Timeline Improvements #2950
Conversation
c46645b
to
2c35fc5
Compare
2c35fc5
to
524823c
Compare
Nice work! Not sure if this should be part of the work but i noticed some issues with how the ticks behave at different levels of zoom. It works for the default example here: https://rawgit.com/cBioPortal/clinical-timeline/master/index.html. But not for the other example JSON we exchanged before (see slack convo). Occasionally the number of ticks calculation seems really off. E.g. if I zoom in to a really tiny part I can never get the ticks to show up every 1 day for instance (smallest tick size seems to be 10 days?). Ideally the ticks would be readjusted 👆 It might be that the JSON example triggers a particular corner case |
How can I test this one? |
Hey @Luke-Sikina - is this the PR we should be testing? The deploy preview on Netlify doesn't seem to be working |
52deedc
to
c2b85d0
Compare
Hi @Luke-Sikina - somehow the zoom doesn't seem to be working for me? The TSV download seems to be working well 👍 |
@Luke-Sikina Noticed some missing parts in the TSV: Might be good to follow the input spec for the TSV i.e. the data that goes into cBioPortal can be the same format as if u download it from the timeline: https://docs.cbioportal.org/5.1-data-loading/data-loading/file-formats#timeline-data I see for instance for P04 that the field Medical Therapy is missing: The raw input data for that study is here: https://github.com/cBioPortal/datahub/tree/master/public/lgg_ucsf_2014 I'm not sure if there's a reason for having each track in a separate TSVs there. For a single patient that's prolly not necessary UPDATE: I don't think this is a show stopper tho. If zoom works that's great and some form of TSV download is better than no TSV download at all |
5f22201
to
764bdf8
Compare
Thanks a ton @Luke-Sikina! Looks great! Some things I found:
I'm not too worried about most of these. We can file them as a new issue. The first two and the last issue would prolly be good to fix before release. If it turns out some of those are really tricky to fix we can maybe do some workaround. Like enable zoom on demand and indicate that it's in beta or something |
93d7ec0
to
5c8af1c
Compare
@inodb I think I've fixed all the issues. The PR for the timeline repo is here: cBioPortal/clinical-timeline#122 One small note: using patient P04 to test trimming wont work well. There was an issue where the initial timeline wasn't getting trimmed, but when you zoomed in and out the timeline would trim. I fixed that, but P04 was an example where it was happening, so now it doesn't. |
5c8af1c
to
773594e
Compare
773594e
to
8d8e2af
Compare
@Luke-Sikina There are a few issues with download of the timeline images:
The above were tested with P17 (the last one after expanding the zig-zag) |
005db3f
to
3f6f0b3
Compare
3f6f0b3
to
7cee827
Compare
7cee827
to
1673542
Compare
@tmazor The zooming logic has been improved, nothing breaks when you zoom on the edge, and single click zooming works as you expected. |
@Luke-Sikina The single click zoom is great! A few things:
|
1673542
to
a998a33
Compare
Thanks so much for reviewing @tmazor ! We are hoping to release this soon. I thought it might be ok to release this without your last two comments fixed and follow up on those later. I've filed the last two things as separate issues: cBioPortal/cbioportal#7325 cBioPortal/cbioportal#7326 Let me know if you think that makes sense and if there's anything else that is required to be fixed before rolling out. Thank you! |
19fc71b
to
dc96ad9
Compare
fc6fc9b
to
b8a2c70
Compare
e51c117
to
46ecb4b
Compare
- Enable zoom - Add TSV download - Update version of clinical-timeline to 0.0.22. This comes with the following enhancements: - Zoom + Trim - Issue: when trimming the timeline, zooming would zoom on the wrong region - Root cause: start and end of zoom region were determined according to untrimmed timeline. This was happening inside the d3 library itself - Fix: take the point the the brush generates, determine its placement on the untrimmed timeline, find the nearest tick on the trimmed timeline, replace the point with that. - Cut off circles - Issue: mousing over points on the bottom lane of the timeline caused them to be cut off when they expanded. - Fix: added 3 pixels to the height of the svg - Ruler annotation - Problem - Month and day annotations for large values were hard to understand at a glance - Solution - Write larger values in `y{}m{}d{}` form - Ex: "1860d" => "5y1m5d" - Zoom - Problem - The start of the zoom is fixed now, but region ends too soon - Fix - Adjusted the zoom region when trimmed - Fix Scroll/drag text renders twice - Fix "Click + drag to zoom" text not part of right element, flickers - Change zoom brush overlay color - Got rid of translate(null,null) errors when zooming in See also: cBioPortal/clinical-timeline#122
46ecb4b
to
7339401
Compare
Decided to disable zoom for now because we still found issues unfortunately. We will merge the other fixes & updates |
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.
Decided to disable zoom for now because we still found issues unfortunately. We will merge the other fixes & updates 👍
…ents Patient Timeline Improvements Former-commit-id: 7984801
Fix cBioPortal/cbioportal#6882
Describe changes proposed in this pull request:
timeline caused them to be cut off when they expanded.
Test with
https://deploy-preview-2950--cbioportalfrontend.netlify.com/patient?caseId=P29&studyId=lgg_ucsf_2014#navCaseIds=lgg_ucsf_2014:P01,lgg_ucsf_2014:P02,lgg_ucsf_2014:P04,lgg_ucsf_2014:P05,lgg_ucsf_2014:P06,lgg_ucsf_2014:P07,lgg_ucsf_2014:P08,lgg_ucsf_2014:P09,lgg_ucsf_2014:P10,lgg_ucsf_2014:P11,lgg_ucsf_2014:P12,lgg_ucsf_2014:P13,lgg_ucsf_2014:P15,lgg_ucsf_2014:P16,lgg_ucsf_2014:P17,lgg_ucsf_2014:P18,lgg_ucsf_2014:P21,lgg_ucsf_2014:P24,lgg_ucsf_2014:P25,lgg_ucsf_2014:P26,lgg_ucsf_2014:P27,lgg_ucsf_2014:P28,lgg_ucsf_2014:P29
Also possible to test on private portals:
And refresh the page