Skip to content
Snippets Groups Projects
Commit 4b8bf57d authored by Alexander Rose's avatar Alexander Rose
Browse files

simplified cellpack loadMembrane

parent a81f0d91
No related branches found
No related tags found
No related merge requests found
......@@ -389,28 +389,21 @@ async function loadMembrane(name: string, plugin: PluginContext, runtime: Runtim
if (file) ingredientFiles[file.name] = file
}
}
const url = `${params.baseUrl}/membranes/${name}.bcif`
//
const file = (ingredientFiles) ? ingredientFiles[fname] : null;
// can we check if url exist
let membrane
if (!file) {
membrane = await state.build().toRoot()
.apply(StateTransforms.Data.Download, { label: name, url, isBinary: true }, { state: { isGhost: true } })
.apply(StateTransforms.Data.ParseCif, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.TrajectoryFromMmCif, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.ModelFromTrajectory, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.StructureFromModel)
.commit()
let b = state.build().toRoot()
if (fname in ingredientFiles) {
const file = ingredientFiles[fname];
b = b.apply(StateTransforms.Data.ReadFile, { file, isBinary: true, label: file.name }, { state: { isGhost: true } })
} else {
membrane = await state.build().toRoot()
.apply(StateTransforms.Data.ReadFile, { file, isBinary: true, label: file.name }, { state: { isGhost: true } })
.apply(StateTransforms.Data.ParseCif, undefined, { state: { isGhost: true } })
const url = `${params.baseUrl}/membranes/${name}.bcif`
b = b.apply(StateTransforms.Data.Download, { url, isBinary: true, label: name }, { state: { isGhost: true } })
}
const membrane = await b.apply(StateTransforms.Data.ParseCif, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.TrajectoryFromMmCif, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.ModelFromTrajectory, undefined, { state: { isGhost: true } })
.apply(StateTransforms.Model.StructureFromModel)
.commit()
}
const membraneParams = {
representation: params.preset.representation,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment