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

Move outline to glsl #92

Merged
merged 24 commits into from
May 1, 2022
Merged

Conversation

thejohnhoffer
Copy link
Contributor

I've moved the outline rendering from the canvas to WebGL with modifications to the fragment shader.

@thejohnhoffer
Copy link
Contributor Author

It seems I've broken the rendering of the pie-chart centroids (OR-mode).
I'll try to resolve that before marking as ready for review.

@thejohnhoffer thejohnhoffer marked this pull request as draft April 15, 2022 19:22
@thejohnhoffer
Copy link
Contributor Author

It seems I've broken the rendering of the pie-chart centroids (OR-mode). I'll try to resolve that before marking as ready for review.

Ah, it seems centroids are broken before my changes:

// Retrieve color (FIXME - need to integrate into viewer manager)

@thejohnhoffer
Copy link
Contributor Author

thejohnhoffer commented Apr 15, 2022

I've filed the OR-mode bug as a separate issue. I'll see if switching centroid mode to WebGL solves that problem.

Solved my issue with centroids!:

Ah, my issue stems from attempting to perform gating on a channel that is not selected.

@thejohnhoffer thejohnhoffer marked this pull request as ready for review April 15, 2022 19:53
@thejohnhoffer
Copy link
Contributor Author

I've marked this PR as ready for review... I can handle the centroid rendering in another PR.

@kruegert
Copy link
Member

kruegert commented Apr 17, 2022

renders very fast. This is awesome!

currently draws whole cells:
image
Could it draw outlines? This would be important to see the underlying image data.

Getting error:
gl not defined when changing color and color mapping slider on the left channel panel:
image
adding a this solves it:
const size_2fv = [this.gl.canvas.height, this.gl.canvas.width];

@labsyspharm labsyspharm deleted a comment from tvquizphd Apr 19, 2022
@thejohnhoffer
Copy link
Contributor Author

thejohnhoffer commented Apr 19, 2022

ezgif com-gif-maker (25)

@thejohnhoffer
Copy link
Contributor Author

thejohnhoffer commented Apr 21, 2022

I've moved more of the logic to the shaders... there's one more (edit: two more )more rendering optimization(s) I'd like to make before reviewing for the merge. Edit: Also, there's a rendering issue for pie-charts when rendering 4+ markers.

@thejohnhoffer
Copy link
Contributor Author

I've solved the pie chart issue for 4+ markers... there is still an optimization on the ordering of selection kesy.

@thejohnhoffer
Copy link
Contributor Author

showing outlines and or mode)

Copy link
Contributor Author

@thejohnhoffer thejohnhoffer left a comment

Choose a reason for hiding this comment

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

I've updated the image viewer so that it doesn't render images when the gating parameters are loading from the server. One last step may be to add a loading icon so the users know when the client is waiting on the server.

@kruegert kruegert merged commit 97a1134 into labsyspharm:gating May 1, 2022
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.

2 participants