Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Colordata #897

Merged
merged 6 commits into from
Dec 29, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/color/structuredata-colormaker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,18 @@ class StructuredataColormaker extends Colormaker {
@manageColor
bondColor(bond: BondProxy, fromTo: boolean) {
const val = this.bondData?.[bond.index]
return (val !== undefined) ? this.scale(val) : this.parameters.value

// Explicit bond data?
if (val !== undefined) return this.scale(val)

// No, fall back to atomData
ppillot marked this conversation as resolved.
Show resolved Hide resolved
if (this.atomProxy) {
this.atomProxy.index = fromTo ? bond.atomIndex1 : bond.atomIndex2
return this.atomColor(this.atomProxy)
}

// Fallback
return this.parameters.value
}
}

Expand Down