search

mastodon-sc / mastodon

Mastodon – a large-scale tracking and track-editing framework for large, multi-view images.
BSD 2-Clause "Simplified" License
66 stars 20 forks source link

Color TrackScheme Hierarchy according to the time point (Issue 213) #231

Closed stefanhahmann closed 1 year ago

stefanhahmann commented 1 year ago

Closes #213

maarzt commented 1 year ago

@tinevez I'm ok with this being merged now. But the changes are very complex. So please have a look first.

stefanhahmann commented 1 year ago

The PR somehow introduces a bug when rendering the the TrackScheme Branch. The bug is triggered by resorting the TrackScheme using one of the plugins in mastodon-tomancak. For example "Plugins > Trees Management > Flip Descendants".

GIF 05 05 2023 14-45-05 GIF 05 05 2023 14-45-05

This need to be clarified before merging.

Thanks for pointing this out.

This bug was unfortunately introduced by this commit: https://github.com/mastodon-sc/mastodon/pull/231/commits/740606684924c941e943d1483aca84502dcc1ec4

It should now be resolved by this commit: https://github.com/mastodon-sc/mastodon/pull/231/commits/37717dc112ce8376eb302000e73293d710c415fe

tinevez commented 1 year ago

Ready for review?

stefanhahmann commented 1 year ago

Ready for review?

Yes. @maarzt reviewed already extensively, but since the changes are massive, a second review would be good.

tinevez commented 1 year ago

Sorry I am late on this. Will work on it

stefanhahmann commented 1 year ago

Sorry I am late on this. Will work on it

@tinevez may we kindly remind you on this review? we would love to have this finished/merged.

tinevez commented 1 year ago

I made a PR for your PR with minor changes, mainly sizing the opportunity to fix the look of the settings panel. Take them if you feel like it. To me otherwise it is good to be merged to dev.

stefanhahmann commented 1 year ago

Hi @tinevez,

I merged your PR https://github.com/stefanhahmann/mastodon/pull/17.

However after merging the toolbar of the trackscheme windows looked like this on my (windows) machine:

grafik

Thus, I increased the size of the Group Locks Panel again: https://github.com/mastodon-sc/mastodon/pull/231/commits/316248399effe5b0d911e0022f2613f464874214

Also, I think, it is better to avoid abbreviations in user interfaces. Thus I made these changes:

which make the toolbar of trackscheme window look like this on my windows:

grafik

Hope you agree?

tinevez commented 1 year ago

Go for it!

stefanhahmann commented 1 year ago

Go for it!

@maarzt may I ask you to merge (I do not have the rights to do so)? If you have questions regarding the remaining conflict, you may contact me.

tinevez commented 1 year ago

Merged! But I had to do it via a local branch I had rights on. This PR can be marked as merged and closed.