Skip to content
Snippets Groups Projects
Unverified Commit f81225cc authored by David Sehnal's avatar David Sehnal Committed by GitHub
Browse files

Merge pull request #592 from molstar/volume/defaults-for-em

Change EM Volume Streaming default Auto
parents 7618a5e2 eb47f439
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,8 @@ Note that since we don't clearly distinguish between a public and private interf ...@@ -8,7 +8,8 @@ Note that since we don't clearly distinguish between a public and private interf
- Add `PluginContext.initContainer/mount/unmount` methods; these should make it easier to reuse a plugin context with both custom and built-in UI - Add `PluginContext.initContainer/mount/unmount` methods; these should make it easier to reuse a plugin context with both custom and built-in UI
- Add `PluginContext.canvas3dInitialized` - Add `PluginContext.canvas3dInitialized`
- `createPluginUI` now resolves after the 3d canvas has been initialized. - `createPluginUI` now resolves after the 3d canvas has been initialized
- Change EM Volume Streaming default from `Whote Structure` to `Auto`
## [v3.22.0] - 2022-10-17 ## [v3.22.0] - 2022-10-17
......
...@@ -80,7 +80,7 @@ export namespace VolumeStreaming { ...@@ -80,7 +80,7 @@ export namespace VolumeStreaming {
const box = (structure && structure.boundary.box) || Box3D(); const box = (structure && structure.boundary.box) || Box3D();
return { return {
view: PD.MappedStatic(defaultView || (info.kind === 'em' ? 'cell' : 'selection-box'), { view: PD.MappedStatic(defaultView || (info.kind === 'em' ? 'auto' : 'selection-box'), {
'off': PD.Group<{}>({}), 'off': PD.Group<{}>({}),
'box': PD.Group({ 'box': PD.Group({
bottomLeft: PD.Vec3(box.min), bottomLeft: PD.Vec3(box.min),
......
...@@ -43,7 +43,7 @@ export const InitVolumeStreaming = StateAction.build({ ...@@ -43,7 +43,7 @@ export const InitVolumeStreaming = StateAction.build({
return { return {
method: PD.Select<VolumeServerInfo.Kind>(method, [['em', 'EM'], ['x-ray', 'X-Ray']]), method: PD.Select<VolumeServerInfo.Kind>(method, [['em', 'EM'], ['x-ray', 'X-Ray']]),
entries: PD.ObjectList({ id: PD.Text(ids[0] || '') }, ({ id }) => id, { defaultValue: ids.map(id => ({ id })) }), entries: PD.ObjectList({ id: PD.Text(ids[0] || '') }, ({ id }) => id, { defaultValue: ids.map(id => ({ id })) }),
defaultView: PD.Select<VolumeStreaming.ViewTypes>(method === 'em' ? 'cell' : 'selection-box', VolumeStreaming.ViewTypeOptions as any), defaultView: PD.Select<VolumeStreaming.ViewTypes>(method === 'em' ? 'auto' : 'selection-box', VolumeStreaming.ViewTypeOptions as any),
options: PD.Group({ options: PD.Group({
serverUrl: PD.Text(plugin.config.get(PluginConfig.VolumeStreaming.DefaultServer) || 'https://ds.litemol.org'), serverUrl: PD.Text(plugin.config.get(PluginConfig.VolumeStreaming.DefaultServer) || 'https://ds.litemol.org'),
behaviorRef: PD.Text('', { isHidden: true }), behaviorRef: PD.Text('', { isHidden: true }),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment