Issue #957: updated labeling and color theme according to new site defs

src/TmFv3DApp/tmdet-extension/labeling.ts

@@ -15,16 +15,23 @@ import { createResidueListsPerChain, getChainAndResidueIds } from './tmdet-color
 import { ChainList, getResidue, ResidueItem } from './types';
 
 const siteLabels = [
-    "Side1",
-    "Side2",
-    "TM alpha",
-    "TM beta",
-    "TM re-entrant loop",
-    "Interfacial Helix",
-    "Unknown localization",
-    "Membrane Inside"
+    'Membrane',
+    'Alpha Helical Transmembrane',
+    'Beta Barrel Strain',
+    'Side1',
+    'Side2',
+    'Loop',
+    'Interfacial Helix',
+    'Membins',
+    'Intermembrane',
+    'Inside',
+    'Outside',
+    'Periplasm',
+    'False Positiv Error',
+    'False Negativ Error',
+    'Unknown Localization'
 ];
-const DefaultResidueLabel = 6; // Unknown localization
+const DefaultResidueLabel = 14; // Unknown localization
 
 
 export const TmDetLabelProvider: LociLabelProvider = {

src/TmFv3DApp/tmdet-extension/tmdet-color-theme.ts

@@ -85,15 +85,21 @@ const siteColors = [
 ];
 
 const siteCssNames = [
+    "ult_memb",
+    "ult_helix",
+    "ult_beta",
     "ult_side1",
     "ult_side2",
-    "ult_alpha",
-    "ult_beta",
-    "ult_reentrant",
+    "ult_loop",
     "ult_ifh",
-    "ult_unknown",
     "ult_membins",
-    "ult_periplasm"
+    "ult_intermemb",
+    "ult_inside",
+    "ult_outside",
+    "ult_periplasm",
+    "ult_error_fp",
+    "ult_error_fn",
+    "ult_unk"
 ];
 
 const regionColorMapFromCss = new Map();