Skip to content
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

Allow for annotating image-sequences when annotations not already present #18

Merged
merged 19 commits into from
Apr 2, 2020

Conversation

jjnesbitt
Copy link
Member

This addresses the major concern raised by @mattdawkins. The diff is fairly large, as there needed to be several changes to get this to work, including fixing usability.

@subdavis
Copy link
Contributor

This will mega-conflict with #17

@BryonLewis was first, so the git gods command ye to rebase (after he merges). :(

@jjnesbitt
Copy link
Member Author

This should be good regarding conflicts with #17. Since I've rebased off that branch, this PR should wait until that one is merged.

Copy link
Contributor

@subdavis subdavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple of little things.

client/src/views/Home.vue Outdated Show resolved Hide resolved
client/src/views/Viewer.vue Outdated Show resolved Hide resolved
client/src/views/Viewer.vue Outdated Show resolved Hide resolved
client/src/views/Viewer.vue Outdated Show resolved Hide resolved
client/src/views/Viewer.vue Outdated Show resolved Hide resolved
client/src/views/Viewer.vue Show resolved Hide resolved
});

detections = data
? data.map(detection => Object.freeze(detection))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it was never commented before, but using object.freeze to protect objects from reactivity like this really deserves some explanation. Some developer will come along later and wonder what was going on.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why it's being done either, it was there before I came onto the project. I think it's deserving of it's own PR though.

server/viame_server/event.py Outdated Show resolved Hide resolved
@jjnesbitt
Copy link
Member Author

@subdavis I think I addressed your concerns. I also added a small change in
f421a26 to match the client's list of valid image formats, tested locally no problem.

@@ -422,6 +422,11 @@ export default {
/* END TODO */
async loadDataset(datasetId) {
var { data: dataset } = await this.girderRest.get(`folder/${datasetId}`);

if (!dataset) {
throw "Could not fetch dataset!";
Copy link
Contributor

@subdavis subdavis Mar 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found an old stackoverflow thread that says this behaves unexpectedly in IE and safari, but that was in 2012. My gut says throw new Error() should always be used, but maybe you know something I don't.

Copy link
Contributor

@subdavis subdavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@jjnesbitt jjnesbitt merged commit 6d419af into master Apr 2, 2020
@jjnesbitt jjnesbitt deleted the fix_annotations branch April 2, 2020 14:58
@BryonLewis BryonLewis mentioned this pull request Apr 3, 2020
BryonLewis added a commit that referenced this pull request Apr 7, 2020
Create folder option resolves #18 and resolves #19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants