From 4aa577da4ffe521d5ea3e6d38b8a2bb5563ba6f2 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Fri, 31 Aug 2018 16:00:35 -0700
Subject: [PATCH] fixed quadratic runtime of unit-index colorscheme
---
src/mol-view/theme/color/unit-index.ts | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/mol-view/theme/color/unit-index.ts b/src/mol-view/theme/color/unit-index.ts
index 2b0231e0d..23411606c 100644
--- a/src/mol-view/theme/color/unit-index.ts
+++ b/src/mol-view/theme/color/unit-index.ts
@@ -6,7 +6,7 @@
import { ColorScale, Color } from 'mol-util/color';
import { Location } from 'mol-model/location';
-import { Unit, StructureElement, Link } from 'mol-model/structure';
+import { StructureElement, Link } from 'mol-model/structure';
import { ColorTheme, ColorThemeProps, LocationColor } from '../color';
const DefaultColor = Color(0xCCCCCC)
@@ -17,12 +17,16 @@ export function UnitIndexColorTheme(props: ColorThemeProps): ColorTheme {
if (props.structure) {
const { units } = props.structure
const scale = ColorScale.create({ domain: [ 0, units.length - 1 ] })
+ const unitIdColor = new Map<number, Color>()
+ for (let i = 0, il = units.length; i <il; ++i) {
+ unitIdColor.set(units[i].id, scale.color(units[i].id))
+ }
color = (location: Location): Color => {
if (StructureElement.isLocation(location)) {
- return scale.color(Unit.findUnitById(location.unit.id, units))
+ return unitIdColor.get(location.unit.id)!
} else if (Link.isLocation(location)) {
- return scale.color(Unit.findUnitById(location.aUnit.id, units))
+ return unitIdColor.get(location.aUnit.id)!
}
return DefaultColor
}
@@ -30,5 +34,5 @@ export function UnitIndexColorTheme(props: ColorThemeProps): ColorTheme {
color = () => DefaultColor
}
- return { kind: 'instance', color }
+ return { kind: 'groupInstance', color }
}
\ No newline at end of file
--
GitLab