Skip to content
This repository has been archived by the owner on Sep 7, 2022. It is now read-only.

Merge Google's master branch into ndmaster and resolve conflicts #23

Merged
merged 17 commits into from
Apr 30, 2021

Conversation

hannah-martinez
Copy link
Member

@hannah-martinez hannah-martinez commented Apr 29, 2021

Hey all,

The other pull request that wei/pull generated (#20) has a merge conflict. The easiest way to resolve it is to create a new branch and commit the resolution here. Once this branch has been merged, I'll delete the other PR generated by wei/pull.

New features in this PR:

  • Window manager-like functionality for the layer panels allows you to drag and drop them to different sides to the screen, including, left, right, top, and bottom, and to stack multiple panels next to each other.
  • Three new buttons on the top right bar:
    • "Hide layer side panel" toggle
    • "Hide selection panel details" toggle
    • "Show layer list panel" toggle (The layer list panel is a new feature which allows you to archive layers)

Let me know if there are any questions. I have put the new version up on http://neuroglancer-dev.s3-website-us-east-1.amazonaws.com/. My browser cache was acting funny, so try opening in an incognito window if you don't see six icons in the top right like this:

image

chrisj and others added 17 commits April 7, 2021 16:42
…to a server that accepts a json encoded version of the neuroglancer state. the "state server" is expected to return a url that will respond that same json string
This implements the spec change described here:
zarr-developers/zarr-python#715

This also adds a query string parameter by the same name.

Fixes google#241.
…default

This was mistakenly left on by default.
…nfig file and a select element if there is more than 1 server
feat: add state saving/sharing ui
Previously, only two side panels were supported, the layer side panel
and the selection details side panel.  Only a static configuration was
supported, a single column on the right, with the layer side panel on
top and the selection details below, and the vertical height divided
equally.

This commit adds support for an arbitrary number of side panels, to
the left/right/top/bottom of the main data panels.  Panels can be
moved via drag and drop, and the size can also be adjusted.  The side
panels for multiple layers can now be shown at once, and individual
tabs of side panels can also be dragged to separate panels.
Archived layers are shown only in the new layer list panel; they are
not visible and are not shown in the layer bar.  They may be useful in
the case where there are a large number of layers that would otherwise
clutter up the layer bar.

This commit also improves the visual feedback during layer and drop
operations.
Annotation rendering maps properties to shader vertex attributes, and
WebGL implementations limit the number of attributes to ~16.
Furthermore, previously all properties were bound even if not
referenced.  With this commit, only properties actually referenced by
the shader are bound.  This allows annotation layers to support data
sources with a large number of properties, provided that only a small
number are actually referenced by the shader at once.
…avior

Segmentation layers have a "pick" boolean option that previously
controlled two things:

1. When off, double clicking does not select/deselect segments in the
layer.

2. When on, picking of transparent meshes behaves exactly the same as
if the mesh were opaque --- i.e. it is not possible to pick objects
behind/inside the mesh.  When off, picking of transparent meshes has
lower precendence than opaque objects behind.

In practice, the picking behavior for transparent objects with
"picking on", which made it impossible to pick opaque objects behind,
is not very useful.

With this change, the second behavior change no longer applies:
transparent objects now always have lower picking precendence than
opaque objects, making it possible to pick opaque objects behind
transparent objects.
This allows slider controls in the body of side panels to work correctly.

Also disables auto-select on focus behavior for the name input field
of the layer side panels.  The previous auto-select on focus behavior
meant that attempting to start a drag from the text area (which takes
up most of the title bar and is the most natural place to drag from)
worked, but showed the text itself being dragged rather than the
entire panel.
@hannah-martinez hannah-martinez changed the title Merge Google's master branch into ndmaster and resolve conflicts WIP: Merge Google's master branch into ndmaster and resolve conflicts Apr 29, 2021
@hannah-martinez hannah-martinez changed the title WIP: Merge Google's master branch into ndmaster and resolve conflicts Merge Google's master branch into ndmaster and resolve conflicts Apr 29, 2021
@hannah-martinez hannah-martinez merged commit 2ff8d53 into ndmaster Apr 30, 2021
@hannah-martinez hannah-martinez deleted the google-master branch April 30, 2021 20:35
@hannah-martinez hannah-martinez restored the google-master branch May 5, 2021 12:55
@hannah-martinez hannah-martinez mentioned this pull request May 5, 2021
@hannah-martinez hannah-martinez deleted the google-master branch May 5, 2021 15:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants