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

renamed lociExpansion to granularity

parent b1a0f46a
No related branches found
No related tags found
No related merge requests found
...@@ -52,17 +52,17 @@ namespace Interactivity { ...@@ -52,17 +52,17 @@ namespace Interactivity {
export const Empty: Loci = { loci: EmptyLoci }; export const Empty: Loci = { loci: EmptyLoci };
} }
const LociExpansion = { const Granularity = {
'none': (loci: ModelLoci) => loci, 'element': (loci: ModelLoci) => loci,
'residue': (loci: ModelLoci) => SE.isLoci(loci) ? SE.Loci.extendToWholeResidues(loci) : loci, 'residue': (loci: ModelLoci) => SE.isLoci(loci) ? SE.Loci.extendToWholeResidues(loci) : loci,
'chain': (loci: ModelLoci) => SE.isLoci(loci) ? SE.Loci.extendToWholeChains(loci) : loci, 'chain': (loci: ModelLoci) => SE.isLoci(loci) ? SE.Loci.extendToWholeChains(loci) : loci,
'structure': (loci: ModelLoci) => SE.isLoci(loci) ? Structure.Loci(loci.structure) : loci 'structure': (loci: ModelLoci) => SE.isLoci(loci) ? Structure.Loci(loci.structure) : loci
} }
type LociExpansion = keyof typeof LociExpansion type Granularity = keyof typeof Granularity
const LociExpansionOptions = Object.keys(LociExpansion).map(n => [n, capitalize(n)]) as [LociExpansion, string][] const GranularityOptions = Object.keys(Granularity).map(n => [n, capitalize(n)]) as [Granularity, string][]
export const Params = { export const Params = {
lociExpansion: PD.Select('residue', LociExpansionOptions), granularity: PD.Select('residue', GranularityOptions),
} }
export type Props = PD.Values<typeof Params> export type Props = PD.Values<typeof Params>
...@@ -92,10 +92,10 @@ namespace Interactivity { ...@@ -92,10 +92,10 @@ namespace Interactivity {
normalizedLoci(interactivityLoci: Loci) { normalizedLoci(interactivityLoci: Loci) {
let { loci, repr } = interactivityLoci let { loci, repr } = interactivityLoci
if (this.props.lociExpansion !== 'none' && Link.isLoci(loci)) { if (this.props.granularity !== 'element' && Link.isLoci(loci)) {
loci = Link.toStructureElementLoci(loci) loci = Link.toStructureElementLoci(loci)
} }
loci = LociExpansion[this.props.lociExpansion](loci) loci = Granularity[this.props.granularity](loci)
return { loci, repr } return { loci, repr }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment