|
|
@@ -27,12 +27,13 @@ import { StripedResidues } from './coloring';
|
|
|
import { TmDetColorThemeProvider } from './tmdet-color-theme';
|
|
|
|
|
|
const Tag = MembraneOrientation.Tag;
|
|
|
+const TMDET_MEMBRANE_ORIENTATION = 'Membrane Orientation';
|
|
|
|
|
|
export const TMDETMembraneOrientation = PluginBehavior.create<{ autoAttach: boolean }>({
|
|
|
name: 'tmdet-membrane-orientation-prop',
|
|
|
category: 'custom-props',
|
|
|
display: {
|
|
|
- name: 'Membrane Orientation',
|
|
|
+ name: TMDET_MEMBRANE_ORIENTATION,
|
|
|
description: 'Data calculated with TMDET algorithm.'
|
|
|
},
|
|
|
ctor: class extends PluginBehavior.Handler<{ autoAttach: boolean }> {
|
|
|
@@ -190,18 +191,16 @@ async function loadStructure(ctx: PluginUIContext, params: any, pdbtmDescriptor:
|
|
|
|
|
|
//
|
|
|
|
|
|
-export { MembraneOrientation3D };
|
|
|
-
|
|
|
-type MembraneOrientation3D = typeof MembraneOrientation3D
|
|
|
+type MembraneOrientation3DType = typeof MembraneOrientation3D
|
|
|
const MembraneOrientation3D = PluginStateTransform.BuiltIn({
|
|
|
- name: 'membrane-orientation-3d',
|
|
|
+ name: Tag.Representation,
|
|
|
display: {
|
|
|
- name: 'Membrane Orientation',
|
|
|
+ name: TMDET_MEMBRANE_ORIENTATION,
|
|
|
description: 'Membrane Orientation planes and rims. Data calculated with TMDET algorithm.'
|
|
|
},
|
|
|
from: PluginStateObject.Molecule.Structure,
|
|
|
to: PluginStateObject.Shape.Representation3D,
|
|
|
- params: (a) => {
|
|
|
+ params: () => {
|
|
|
return {
|
|
|
...MembraneOrientationParams,
|
|
|
};
|
|
|
@@ -211,7 +210,7 @@ const MembraneOrientation3D = PluginStateTransform.BuiltIn({
|
|
|
return true;
|
|
|
},
|
|
|
apply({ a, params }, plugin: PluginContext) {
|
|
|
- return Task.create('Membrane Orientation', async ctx => {
|
|
|
+ return Task.create(TMDET_MEMBRANE_ORIENTATION, async ctx => {
|
|
|
await MembraneOrientationProvider.attach({ runtime: ctx, assetManager: plugin.managers.asset }, a.data);
|
|
|
const repr = MembraneOrientationRepresentation({ webgl: plugin.canvas3d?.webgl, ...plugin.representation.structure.themes }, () => MembraneOrientationParams);
|
|
|
await repr.createOrUpdate(params, a.data).runInContext(ctx);
|
|
|
@@ -219,7 +218,7 @@ const MembraneOrientation3D = PluginStateTransform.BuiltIn({
|
|
|
});
|
|
|
},
|
|
|
update({ a, b, newParams }, plugin: PluginContext) {
|
|
|
- return Task.create('Membrane Orientation', async ctx => {
|
|
|
+ return Task.create(TMDET_MEMBRANE_ORIENTATION, async ctx => {
|
|
|
await MembraneOrientationProvider.attach({ runtime: ctx, assetManager: plugin.managers.asset }, a.data);
|
|
|
const props = { ...b.data.repr.props, ...newParams };
|
|
|
await b.data.repr.createOrUpdate(props, a.data).runInContext(ctx);
|
|
|
@@ -235,7 +234,7 @@ const MembraneOrientation3D = PluginStateTransform.BuiltIn({
|
|
|
export const MembraneOrientationPreset = StructureRepresentationPresetProvider({
|
|
|
id: 'preset-membrane-orientation',
|
|
|
display: {
|
|
|
- name: 'Membrane Orientation', group: 'Annotation',
|
|
|
+ name: TMDET_MEMBRANE_ORIENTATION, group: 'Annotation',
|
|
|
description: 'Shows orientation of membrane layers. Data calculated with TMDET algorithm.' // TODO add ' or obtained via RCSB PDB'
|
|
|
},
|
|
|
isApplicable(a) {
|
|
|
@@ -248,12 +247,13 @@ export const MembraneOrientationPreset = StructureRepresentationPresetProvider({
|
|
|
if (!structureCell || !structure) return {};
|
|
|
|
|
|
if (!MembraneOrientationProvider.get(structure).value) {
|
|
|
- await plugin.runTask(Task.create('Membrane Orientation', async runtime => {
|
|
|
+ await plugin.runTask(Task.create(TMDET_MEMBRANE_ORIENTATION, async runtime => {
|
|
|
await MembraneOrientationProvider.attach({ runtime, assetManager: plugin.managers.asset }, structure);
|
|
|
}));
|
|
|
}
|
|
|
|
|
|
const membraneOrientation = await tryCreateMembraneOrientation(plugin, structureCell);
|
|
|
+ // TODO: change colorTheme!!!
|
|
|
const colorTheme = HydrophobicityColorThemeProvider.name as any;
|
|
|
const preset = await PresetStructureRepresentations.auto.apply(ref, { ...params, theme: { globalName: colorTheme, focus: { name: colorTheme } } }, plugin);
|
|
|
|
|
|
@@ -261,9 +261,9 @@ export const MembraneOrientationPreset = StructureRepresentationPresetProvider({
|
|
|
}
|
|
|
});
|
|
|
|
|
|
-export function tryCreateMembraneOrientation(plugin: PluginContext, structure: StateObjectRef<PMS>, params?: StateTransformer.Params<MembraneOrientation3D>, initialState?: Partial<StateTransform.State>) {
|
|
|
+export function tryCreateMembraneOrientation(plugin: PluginContext, structure: StateObjectRef<PMS>, params?: StateTransformer.Params<MembraneOrientation3DType>, initialState?: Partial<StateTransform.State>) {
|
|
|
const state = plugin.state.data;
|
|
|
const membraneOrientation = state.build().to(structure)
|
|
|
- .applyOrUpdateTagged('membrane-orientation-3d', MembraneOrientation3D, params, { state: initialState });
|
|
|
+ .applyOrUpdateTagged(Tag.Representation, MembraneOrientation3D, params, { state: initialState });
|
|
|
return membraneOrientation.commit({ revertOnError: true });
|
|
|
}
|
