moorhen 0.6.8 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "moorhen",
3
- "version": "0.6.8",
3
+ "version": "0.7.1",
4
4
  "private": false,
5
5
  "main": "moorhen.js",
6
6
  "types": "./types/main.d.ts",
@@ -12,6 +12,9 @@ declare global {
12
12
 
13
13
  export namespace libcootApi {
14
14
  type CCP4ModuleType = {
15
+ get_non_selected_cids(gemmiStructure: gemmi.Structure, cid: string): emscriptem.vector<string>;
16
+ parse_multi_cids(gemmiStructure: gemmi.Structure, cid: string): emscriptem.vector<string>;
17
+ parse_ligand_dict_info(fileContent: string): emscriptem.vector<{ comp_id: string; dict_contents: string; }>;
15
18
  get_ligand_info_for_structure(gemmiStructure: gemmi.Structure): emscriptem.vector<{
16
19
  resName: string;
17
20
  chainName: string;
@@ -20,12 +23,12 @@ export namespace libcootApi {
20
23
  cid: string;
21
24
  }>;
22
25
  guess_coord_data_format(coordDataString: string): number;
23
- get_structure_bfactors(gemmiStructure: gemmi.Structure): emscriptem.vector<{ cid: string; bFactor: number }>;
26
+ get_structure_bfactors(gemmiStructure: gemmi.Structure): emscriptem.vector<{ cid: string; bFactor: number; normalised_bFactor }>;
24
27
  get_sequence_info(gemmiStructure: gemmi.Structure, molName: string): emscriptem.vector<SequenceEntry>;
25
28
  get_atom_info_for_selection(gemmiStructure: gemmi.Structure, arg1: string, arg2: string): emscriptem.vector<AtomInfo>;
26
29
  structure_is_ligand(gemmiStructure: gemmi.Structure): boolean;
27
30
  count_residues_in_selection(gemmiStructure: gemmi.Structure, selection: gemmi.Selection): number;
28
- remove_non_selected_residues(gemmiStructure: gemmi.Structure, selection: gemmi.Selection): gemmi.Structure;
31
+ remove_non_selected_atoms(gemmiStructure: gemmi.Structure, selection: gemmi.Selection): gemmi.Structure;
29
32
  check_polymer_type(polymerConst: emscriptem.instance<number>): {value: number};
30
33
  remove_ligands_and_waters_chain(chain: gemmi.Chain): void;
31
34
  gemmi_setup_entities(gemmiStructure: gemmi.Structure): void;
@@ -221,6 +224,10 @@ export namespace libcootApi {
221
224
  end: { x: number; y: number; z: number };
222
225
  dist: number;
223
226
  }
227
+ type DiffDiffMapPeaksJS = {
228
+ value: number;
229
+ coord: { x: number; y: number; z: number };
230
+ }[]
224
231
  type RotamerInfoJS = {
225
232
  name: string;
226
233
  rank: number;
@@ -234,11 +241,11 @@ export namespace libcootApi {
234
241
  interface SimpleMeshJS {
235
242
  prim_types: [[string]];
236
243
  useIndices?: [[boolean]];
237
- idx_tri: [[number[]]];
238
- vert_tri: [[number[]]];
239
- additional_norm_tri?: [[number[]]];
240
- norm_tri: [[number[]]];
241
- col_tri: [[number[]]];
244
+ idx_tri: [[number[]|Uint32Array]];
245
+ vert_tri: [[number[]|Float32Array]];
246
+ additional_norm_tri?: [[number[]|Float32Array]];
247
+ norm_tri: [[number[]|Float32Array]];
248
+ col_tri: [[number[]|Float32Array]];
242
249
  }
243
250
  interface SymmetryData {
244
251
  cell: CellTranslation;
@@ -284,13 +291,15 @@ export namespace libcootApi {
284
291
  model_number: number;
285
292
  chain_id: string;
286
293
  res_no: number;
287
- ins_code: string;
294
+ ins_code: string;
295
+ int_user_data: number;
288
296
  }
289
297
  interface ResidueSpecJS {
290
298
  resNum: number;
291
299
  insCode: string;
292
300
  modelNumber: number;
293
301
  chainId: string;
302
+ intUserData: number;
294
303
  }
295
304
  interface AtomSpecT {
296
305
  chain_id: string;
@@ -349,7 +358,7 @@ export namespace libcootApi {
349
358
  supperposeInfo: string,
350
359
  alignedPairsData: {reference: ValidationInformationJS, moving: ValidationInformationJS}[],
351
360
  }
352
- interface InstancedDataType extends emscriptem.instance<InstancedDataType> {
361
+ type InstancedDataType = {
353
362
  position: [number, number, number];
354
363
  size: [number, number, number];
355
364
  colour: [number, number, number, number];
@@ -420,6 +429,11 @@ export namespace libcootApi {
420
429
  psi: number;
421
430
  is_pre_pro: boolean;
422
431
  }
432
+ type fitLigandInfo = {
433
+ imol: number;
434
+ cluster_idx: number;
435
+ ligand_idx: number;
436
+ }
423
437
  type CootModule = {
424
438
  SmilesToPDB(arg0: string, arg1: string, arg2: number, arg3: number): PairType<string, string>;
425
439
  FS: {
@@ -429,6 +443,25 @@ export namespace libcootApi {
429
443
  FS_unlink(tempFilename: string): void;
430
444
  FS_createDataFile(arg0: string, arg1: string, arg2: Uint8Array | string, arg3: boolean, arg4: boolean, arg5?: boolean): void;
431
445
  molecules_container_js: { new(verbose: boolean): MoleculesContainerJS };
446
+ testFloat32Array( arg0: any ): Float32Array;
447
+ getPositionsFromSimpleMesh( arg0: any ): Float32Array;
448
+ getNormalsFromSimpleMesh( arg0: any ): Float32Array;
449
+ getReversedNormalsFromSimpleMesh( arg0: any ): Float32Array;
450
+ getColoursFromSimpleMesh( arg0: any ): Float32Array;
451
+
452
+ getPositionsFromSimpleMesh2( arg0: any, arg1: any ): void;
453
+ getNormalsFromSimpleMesh2( arg0: any, arg1: any ): void;
454
+ getReversedNormalsFromSimpleMesh2( arg0: any, arg1: any ): void;
455
+ getColoursFromSimpleMesh2( arg0: any, arg1: any ): void;
456
+
457
+ getLineIndicesFromSimpleMesh( arg0: any ): Uint32Array;
458
+ getPermutedTriangleIndicesFromSimpleMesh( arg0: any ): Uint32Array;
459
+ getTriangleIndicesFromSimpleMesh( arg0: any ): Uint32Array;
460
+
461
+ getLineIndicesFromSimpleMesh2( arg0: any, arg1: any ): void;
462
+ getPermutedTriangleIndicesFromSimpleMesh2( arg0: any, arg1: any ): void;
463
+ getTriangleIndicesFromSimpleMesh2( arg0: any, arg1: any ): void;
464
+
432
465
  Vectormoved_residue_t: { new(): emscriptem.vector<MovedResidueT>};
433
466
  moved_residue_t: { new(arg0: string, arg1: number, arg2: string): MovedResidueT};
434
467
  moved_atom_t: { new(arg0: string, arg1: string, arg2: number, arg3: number, arg4: number, arg5: number): MovedAtomT};
@@ -437,6 +470,8 @@ export namespace libcootApi {
437
470
  getRamachandranData(arg0: string, arg1: string): emscriptem.vector<RamaData>
438
471
  }
439
472
  interface MoleculesContainerJS {
473
+ set_max_number_of_threads(arg0: number): void;
474
+ set_map_is_contoured_with_thread_pool(arg0: boolean): void;
440
475
  close_molecule(molNo: number): number;
441
476
  copy_fragment_using_residue_range(molNo: number, chainId: string, res_no_start: number, res_no_end: number): number;
442
477
  writeCCP4Map(molNo: number, tempFilename: string): void;
package/types/main.d.ts CHANGED
@@ -2,7 +2,6 @@ import { moorhen as _moorhen } from "./moorhen"
2
2
  import { webGL } from "./mgWebGL";
3
3
  import { libcootApi } from "./libcoot";
4
4
  import { gemmi } from "./gemmi";
5
- import { emscriptem } from "./emscriptem";
6
5
 
7
6
  declare module 'moorhen' {
8
7
 
@@ -50,6 +49,9 @@ declare module 'moorhen' {
50
49
 
51
50
  class MoorhenMolecule implements _moorhen.Molecule {
52
51
  constructor(commandCentre: React.RefObject<_moorhen.CommandCentre>, glRef: React.RefObject<webGL.MGWebGL>, monomerLibrary: string)
52
+ getNonSelectedCids(cid: string): string[];
53
+ getSecondaryStructInfo(modelNumber?: number): Promise<libcootApi.ResidueSpecJS[]>;
54
+ parseCidIntoSelection(selectedCid: string): Promise<_moorhen.ResidueSelection>;
53
55
  animateRefine(n_cyc: number, n_iteration: number, final_n_cyc?: number): Promise<void>;
54
56
  refineResidueRange(chainId: string, start: number, stop: number, ncyc?: number, redraw?: boolean): Promise<void>;
55
57
  SSMSuperpose(movChainId: string, refMolNo: number, refChainId: string): Promise<_moorhen.WorkerResponse>;
@@ -83,7 +85,7 @@ declare module 'moorhen' {
83
85
  clearExtraRestraints(): Promise<_moorhen.WorkerResponse>;
84
86
  refineResiduesUsingAtomCid(cid: string, mode: string, ncyc?: number, redraw?: boolean): Promise<void>;
85
87
  getNcsRelatedChains(): Promise<string[][]>;
86
- getResidueBFactors(): { cid: string, bFactor: number }[];
88
+ getResidueBFactors(): { cid: string; bFactor: number; normalised_bFactor: number }[];
87
89
  redo(): Promise<void>;
88
90
  undo(): Promise<void>;
89
91
  show(style: string, cid?: string): void;
@@ -105,7 +107,7 @@ declare module 'moorhen' {
105
107
  hide: (style: string, cid?: string) => void;
106
108
  redraw: () => Promise<void>;
107
109
  setAtomsDirty: (newVal: boolean) => void;
108
- hasVisibleBuffers: (excludeBuffers?: string[]) => boolean;
110
+ isVisible: (excludeBuffers?: string[]) => boolean;
109
111
  centreAndAlignViewOn(selectionCid: string, animate?: boolean): Promise<void>;
110
112
  buffersInclude: (bufferIn: { id: string; }) => boolean;
111
113
  redrawRepresentation: (id: string) => Promise<void>;
@@ -116,7 +118,6 @@ declare module 'moorhen' {
116
118
  commandCentre: React.RefObject<_moorhen.CommandCentre>;
117
119
  glRef: React.RefObject<webGL.MGWebGL>;
118
120
  atomsDirty: boolean;
119
- isVisible: boolean;
120
121
  name: string;
121
122
  molNo: number;
122
123
  gemmiStructure: gemmi.Structure;
@@ -159,21 +160,30 @@ declare module 'moorhen' {
159
160
  getHistogram(nBins?: number, zoomFactor?: number): Promise<libcootApi.HistogramInfoJS>;
160
161
  setMapWeight(weight?: number): Promise<_moorhen.WorkerResponse>;
161
162
  estimateMapWeight(): Promise<void>;
162
- setAlpha(alpha: number, redraw?: boolean): Promise<void>;
163
+ fetchMapAlphaAndRedraw(): Promise<void>;
163
164
  centreOnMap(): Promise<void>;
164
165
  getSuggestedSettings(): Promise<void>;
165
- duplicate(): Promise<_moorhen.Map>;
166
- makeCootUnlive(): void;
167
- makeCootLive(): void;
168
- setColour(r: number, g: number, b: number, redraw?: boolean): Promise<void> ;
169
- setDiffMapColour(type: 'positiveDiffColour' | 'negativeDiffColour', r: number, g: number, b: number, redraw?: boolean): Promise<void> ;
166
+ copyMap(): Promise<_moorhen.Map>;
167
+ hideMapContour(): void;
168
+ drawMapContour(): Promise<void>;
169
+ getMapContourParams(): {
170
+ mapRadius: number;
171
+ contourLevel: number;
172
+ mapAlpha: number;
173
+ mapStyle: "lines" | "solid" | "lit-lines";
174
+ mapColour: {r: number; g: number; b: number};
175
+ positiveMapColour: {r: number; g: number; b: number};
176
+ negativeMapColour: {r: number; g: number; b: number}
177
+ };
178
+ fetchColourAndRedraw(): Promise<void> ;
179
+ fetchDiffMapColourAndRedraw(type: 'positiveDiffColour' | 'negativeDiffColour'): Promise<void> ;
170
180
  fetchMapRmsd(): Promise<number>;
171
181
  fetchSuggestedLevel(): Promise<number>;
172
182
  fetchMapCentre(): Promise<[number, number, number]>;
173
183
  replaceMapWithMtzFile(fileUrl: RequestInfo | URL, selectedColumns: _moorhen.selectedMtzColumns): Promise<void>;
174
184
  associateToReflectionData (selectedColumns: _moorhen.selectedMtzColumns, reflectionData: Uint8Array | ArrayBuffer): Promise<void>;
175
185
  delete(): Promise<void>
176
- doCootContour(x: number, y: number, z: number, radius: number, contourLevel: number): Promise<void>;
186
+ doCootContour(x: number, y: number, z: number, radius: number, contourLevel: number, style: "lines" | "lit-lines" | "solid"): Promise<void>;
177
187
  fetchReflectionData(): Promise<_moorhen.WorkerResponse<Uint8Array>>;
178
188
  getMap(): Promise<_moorhen.WorkerResponse>;
179
189
  loadToCootFromMtzURL(url: RequestInfo | URL, name: string, selectedColumns: _moorhen.selectedMtzColumns, options?: RequestInit): Promise<_moorhen.Map>;
@@ -190,14 +200,9 @@ declare module 'moorhen' {
190
200
  molNo: number;
191
201
  commandCentre: React.RefObject<_moorhen.CommandCentre>;
192
202
  glRef: React.RefObject<webGL.MGWebGL>;
193
- contourLevel: number;
194
- mapRadius: number;
195
- mapColour: [number, number, number, number];
196
203
  webMGContour: boolean;
197
- isVisible: boolean;
204
+ showOnLoad: boolean;
198
205
  displayObjects: any;
199
- litLines: boolean;
200
- solid: boolean;
201
206
  isDifference: boolean;
202
207
  hasReflectionData: boolean;
203
208
  selectedColumns: _moorhen.selectedMtzColumns;
@@ -206,12 +211,9 @@ declare module 'moorhen' {
206
211
  otherMapForColouring: {molNo: number, min: number, max: number};
207
212
  mapRmsd: number;
208
213
  suggestedMapWeight: number;
209
- rgba: {
210
- mapColour: {r: number, g: number, b: number};
211
- positiveDiffColour: {r: number, g: number, b: number};
212
- negativeDiffColour: {r: number, g: number, b: number};
213
- a: number;
214
- }
214
+ defaultMapColour: {r: number, g: number, b: number};
215
+ defaultPositiveMapColour: {r: number, g: number, b: number};
216
+ defaultNegativeMapColour: {r: number, g: number, b: number};
215
217
  }
216
218
  module.exports.MoorhenMap = MoorhenMap
217
219
 
@@ -227,6 +229,39 @@ declare module 'moorhen' {
227
229
  ): Promise<number>;
228
230
  module.exports = loadSessionData;
229
231
 
232
+ function setPositiveMapColours(arg0: {molNo: number, rgb: {r: number; g: number; b: number}}): any;
233
+ module.exports = setPositiveMapColours;
234
+
235
+ function setNegativeMapColours(arg0: {molNo: number, rgb: {r: number; g: number; b: number}}): any;
236
+ module.exports = setNegativeMapColours;
237
+
238
+ function setMapColours(arg0: {molNo: number, rgb: {r: number; g: number; b: number}}): any;
239
+ module.exports = setMapColours;
240
+
241
+ function setMapAlpha(arg0: {molNo: number, alpha: number}): any;
242
+ module.exports = setMapAlpha;
243
+
244
+ function showMap(arg0: {molNo: number, show: boolean}): any;
245
+ module.exports = showMap;
246
+
247
+ function hideMap(arg0: {molNo: number}): any;
248
+ module.exports = hideMap;
249
+
250
+ function setContourLevel(arg0: {molNo: number, level: number}): any;
251
+ module.exports = setContourLevel;
252
+
253
+ function showMolecule(arg0: {molNo: number, show: boolean}): any;
254
+ module.exports = showMolecule;
255
+
256
+ function hideMolecule(arg0: {molNo: number}): any;
257
+ module.exports = hideMolecule;
258
+
259
+ function setMapStyle(arg0: {molNo: number, style: "lines" | "solid" | "lit-lines"}): any;
260
+ module.exports = setMapStyle;
261
+
262
+ function setMapRadius(arg0: {molNo: number, radius: number}): any;
263
+ module.exports = setMapRadius;
264
+
230
265
  function setDefaultBackgroundColor(arg0: [number, number, number, number]): any;
231
266
  module.exports = setDefaultBackgroundColor;
232
267
 
@@ -42,8 +42,8 @@ export namespace webGL {
42
42
  drawSceneIfDirty() : void;
43
43
  drawFPSMeter() : void;
44
44
  linesToThickLines(axesVertices: number[], axesColours: number[], size: number) : any;
45
- linesToThickLinesWithIndicesAndNormals(axesVertices: number[], axesNormals: number[], axesColours: number[], axesIndices: number[], size: number) : any;
46
- linesToThickLinesWithIndices(axesVertices: number[], axesColours: number[], axesIndices: number[], size: number, axesNormals_old? : number) : any;
45
+ linesToThickLinesWithIndicesAndNormals(axesVertices: number[], axesNormals: number[], axesColours: number[], axesIndices: number[], size: number, doColour : boolean|null) : any;
46
+ linesToThickLinesWithIndices(axesVertices: number[], axesColours: number[], axesIndices: number[], size: number, axesNormals_old? : number[], doColour : boolean|null) : any;
47
47
  doWheel(event: Event) : void;
48
48
  doHover(event: Event, self: any) : void;
49
49
  handleKeyUp(event: Event, self: any) : void;
@@ -238,7 +238,7 @@ export namespace webGL {
238
238
  cancelMouseTrack: boolean;
239
239
  circleTex: WebGLTexture;
240
240
  clipChangedEvent: Event;
241
- context: CanvasRenderingContext2D;
241
+ context2d: CanvasRenderingContext2D;
242
242
  diskBuffer: DisplayBuffer;
243
243
  diskVertices: number[];
244
244
  doShadow: boolean;
@@ -288,6 +288,7 @@ export namespace webGL {
288
288
  mouseTrackPositionBuffer: WebGLBuffer;
289
289
  moveFactor: number;
290
290
  mspfArray: number[];
291
+ pointsArray: number[];
291
292
  mvInvMatrix: Float32Array;
292
293
  mvMatrix: Float32Array;
293
294
  nAnimationFrames: number;
@@ -397,6 +398,8 @@ export namespace webGL {
397
398
  ext: any;
398
399
  newTextLabels: any;
399
400
  drawingGBuffers: boolean;
401
+ initializeShaders() : void;
402
+ axesTexture: any;
400
403
 
401
404
  }
402
405
  }
@@ -28,6 +28,7 @@ export namespace moorhen {
28
28
  modelName: string;
29
29
  cid: string;
30
30
  svg?: string;
31
+ chem_comp_info?: {first: string; second: string}[];
31
32
  }
32
33
 
33
34
  type Sequence = {
@@ -91,8 +92,11 @@ export namespace moorhen {
91
92
  type coorFormats = 'pdb' | 'mmcif';
92
93
 
93
94
  interface Molecule {
95
+ getSecondaryStructInfo(modelNumber?: number): Promise<libcootApi.ResidueSpecJS[]>;
96
+ getNonSelectedCids(cid: string): string[];
97
+ parseCidIntoSelection(selectedCid: string): Promise<ResidueSelection>;
94
98
  downloadAtoms(format?: 'mmcif' | 'pdb'): Promise<void>;
95
- getResidueBFactors(): { cid: string, bFactor: number }[];
99
+ getResidueBFactors(): { cid: string; bFactor: number; normalised_bFactor: number }[];
96
100
  getNcsRelatedChains(): Promise<string[][]>;
97
101
  animateRefine(n_cyc: number, n_iteration: number, final_n_cyc?: number): Promise<void>;
98
102
  refineResidueRange(chainId: string, start: number, stop: number, ncyc?: number, redraw?: boolean): Promise<void>;
@@ -147,7 +151,7 @@ export namespace moorhen {
147
151
  hide: (style: string, cid?: string) => void;
148
152
  redraw: () => Promise<void>;
149
153
  setAtomsDirty: (newVal: boolean) => void;
150
- hasVisibleBuffers: (excludeBuffers?: string[]) => boolean;
154
+ isVisible: (excludeBuffers?: string[]) => boolean;
151
155
  centreAndAlignViewOn(selectionCid: string, animate?: boolean): Promise<void>;
152
156
  buffersInclude: (bufferIn: { id: string; }) => boolean;
153
157
  redrawRepresentation: (id: string) => Promise<void>;
@@ -157,7 +161,6 @@ export namespace moorhen {
157
161
  commandCentre: React.RefObject<CommandCentre>;
158
162
  glRef: React.RefObject<webGL.MGWebGL>;
159
163
  atomsDirty: boolean;
160
- isVisible: boolean;
161
164
  name: string;
162
165
  molNo: number;
163
166
  gemmiStructure: gemmi.Structure;
@@ -240,6 +243,7 @@ export namespace moorhen {
240
243
  second: null | string;
241
244
  cid: null | string | string[];
242
245
  isMultiCid: boolean;
246
+ label: string;
243
247
  }
244
248
 
245
249
  type HoveredAtom = {
@@ -363,21 +367,30 @@ export namespace moorhen {
363
367
  getHistogram(nBins?: number, zoomFactor?: number): Promise<libcootApi.HistogramInfoJS>;
364
368
  setMapWeight(weight?: number): Promise<WorkerResponse>;
365
369
  estimateMapWeight(): Promise<void>;
366
- setAlpha(alpha: number, redraw?: boolean): Promise<void>;
370
+ fetchMapAlphaAndRedraw(): Promise<void>;
367
371
  centreOnMap(): Promise<void>;
368
372
  getSuggestedSettings(): Promise<void>;
369
- duplicate(): Promise<Map>;
370
- makeCootUnlive(): void;
371
- makeCootLive(): void;
372
- setColour(r: number, g: number, b: number, redraw?: boolean): Promise<void> ;
373
- setDiffMapColour(type: 'positiveDiffColour' | 'negativeDiffColour', r: number, g: number, b: number, redraw?: boolean): Promise<void> ;
373
+ copyMap(): Promise<Map>;
374
+ getMapContourParams(): {
375
+ mapRadius: number;
376
+ contourLevel: number;
377
+ mapAlpha: number;
378
+ mapStyle: "lines" | "solid" | "lit-lines";
379
+ mapColour: {r: number; g: number; b: number};
380
+ positiveMapColour: {r: number; g: number; b: number};
381
+ negativeMapColour: {r: number; g: number; b: number}
382
+ };
383
+ hideMapContour(): void;
384
+ drawMapContour(): Promise<void>;
385
+ fetchColourAndRedraw(): Promise<void> ;
386
+ fetchDiffMapColourAndRedraw(type: 'positiveDiffColour' | 'negativeDiffColour'): Promise<void> ;
374
387
  fetchMapRmsd(): Promise<number>;
375
388
  fetchSuggestedLevel(): Promise<number>;
376
389
  fetchMapCentre(): Promise<[number, number, number]>;
377
390
  replaceMapWithMtzFile(fileUrl: RequestInfo | URL, selectedColumns: selectedMtzColumns): Promise<void>;
378
391
  associateToReflectionData (selectedColumns: selectedMtzColumns, reflectionData: Uint8Array | ArrayBuffer): Promise<void>;
379
392
  delete(): Promise<void>
380
- doCootContour(x: number, y: number, z: number, radius: number, contourLevel: number): Promise<void>;
393
+ doCootContour(x: number, y: number, z: number, radius: number, contourLevel: number, style: "lines" | "lit-lines" | "solid"): Promise<void>;
381
394
  fetchReflectionData(): Promise<WorkerResponse<Uint8Array>>;
382
395
  getMap(): Promise<WorkerResponse>;
383
396
  loadToCootFromMtzURL(url: RequestInfo | URL, name: string, selectedColumns: selectedMtzColumns, options?: RequestInit): Promise<Map>;
@@ -394,14 +407,9 @@ export namespace moorhen {
394
407
  molNo: number;
395
408
  commandCentre: React.RefObject<CommandCentre>;
396
409
  glRef: React.RefObject<webGL.MGWebGL>;
397
- contourLevel: number;
398
- mapRadius: number;
399
- mapColour: [number, number, number, number];
400
410
  webMGContour: boolean;
401
- isVisible: boolean;
411
+ showOnLoad: boolean;
402
412
  displayObjects: any;
403
- litLines: boolean;
404
- solid: boolean;
405
413
  isDifference: boolean;
406
414
  hasReflectionData: boolean;
407
415
  selectedColumns: selectedMtzColumns;
@@ -410,12 +418,9 @@ export namespace moorhen {
410
418
  otherMapForColouring: {molNo: number, min: number, max: number};
411
419
  mapRmsd: number;
412
420
  suggestedMapWeight: number;
413
- rgba: {
414
- mapColour: {r: number, g: number, b: number};
415
- positiveDiffColour: {r: number, g: number, b: number};
416
- negativeDiffColour: {r: number, g: number, b: number};
417
- a: number;
418
- }
421
+ defaultMapColour: {r: number, g: number, b: number};
422
+ defaultPositiveMapColour: {r: number, g: number, b: number};
423
+ defaultNegativeMapColour: {r: number, g: number, b: number};
419
424
  }
420
425
 
421
426
  interface backupKey {
@@ -446,11 +451,16 @@ export namespace moorhen {
446
451
  uniqueId: string;
447
452
  mapData: Uint8Array;
448
453
  reflectionData: Uint8Array;
449
- isVisible: boolean;
454
+ showOnLoad: boolean;
450
455
  contourLevel: number;
451
456
  radius: number;
452
- colour: [number, number, number, number];
453
- litLines: boolean;
457
+ rgba: {
458
+ mapColour: {r: number, g: number, b: number};
459
+ positiveDiffColour: {r: number, g: number, b: number};
460
+ negativeDiffColour: {r: number, g: number, b: number};
461
+ a: number;
462
+ };
463
+ style: "solid" | "lit-lines" | "lines";
454
464
  isDifference: boolean;
455
465
  selectedColumns: selectedMtzColumns;
456
466
  hasReflectionData: boolean;
@@ -530,24 +540,12 @@ export namespace moorhen {
530
540
 
531
541
  type MapRadiusChangeEvent = CustomEvent<{ factor: number; }>
532
542
 
533
- type ScoresUpdateEvent = CustomEvent<{
534
- modifiedMolecule: number;
535
- }>
536
-
537
- type ConnectMapsInfo = {
538
- molecule: number;
539
- maps: [number, number, number];
540
- uniqueMaps: number[];
541
- }
542
-
543
543
  type AtomClickedEvent = CustomEvent<{
544
544
  buffer: { id: string };
545
545
  atom: { label: string };
546
546
  isResidueSelection: boolean;
547
547
  }>
548
548
 
549
- type ConnectMapsEvent = CustomEvent<ConnectMapsInfo>
550
-
551
549
  type NewMapContourEvent = CustomEvent<{
552
550
  molNo: number;
553
551
  mapRadius: number;
@@ -731,12 +729,6 @@ export namespace moorhen {
731
729
  interface State {
732
730
  molecules: Molecule[];
733
731
  maps: Map[];
734
- mapSettings: {
735
- defaultMapSamplingRate: number;
736
- defaultMapLitLines: boolean;
737
- mapLineWidth: number;
738
- defaultMapSurface: boolean;
739
- };
740
732
  mouseSettings: {
741
733
  contourWheelSensitivityFactor: number;
742
734
  zoomWheelSensitivityFactor: number;
@@ -748,10 +740,6 @@ export namespace moorhen {
748
740
  maxBackupCount: number;
749
741
  modificationCountBackupThreshold: number;
750
742
  };
751
- updatingMapScoresSettings: {
752
- defaultUpdatingScores: string[];
753
- showScoresToast: boolean;
754
- };
755
743
  shortcutSettings: {
756
744
  shortcutOnHoveredAtom: boolean;
757
745
  showShortcutToast: boolean;
@@ -807,6 +795,7 @@ export namespace moorhen {
807
795
  isDraggingAtoms: boolean;
808
796
  isRotatingAtoms: boolean;
809
797
  newCootCommandAlert: boolean;
798
+ showResidueSelection: boolean;
810
799
  };
811
800
  hoveringStates: {
812
801
  enableAtomHovering: boolean;
@@ -817,11 +806,49 @@ export namespace moorhen {
817
806
  showModelsModal: boolean;
818
807
  showMapsModal: boolean;
819
808
  showCreateAcedrgLinkModal: boolean;
820
- showValidationModal: boolean;
821
809
  showQuerySequenceModal: boolean;
822
810
  showScriptingModal: boolean;
823
811
  showControlsModal: boolean;
824
812
  showFitLigandModal: boolean;
813
+ showRamaPlotModal: boolean;
814
+ showDiffMapPeaksModal: boolean;
815
+ showValidationPlotModal: boolean;
816
+ showLigandValidationModal: boolean;
817
+ showPepFlipsValidationModal: boolean;
818
+ showFillPartialResValidationModal: boolean;
819
+ showUnmodelledBlobsModal: boolean;
820
+ showMmrrccModal: boolean;
821
+ showWaterValidationModal: boolean;
822
+ showSceneSettingsModal: boolean;
823
+ focusHierarchy: string[];
824
+ };
825
+ mapContourSettings: {
826
+ visibleMaps: number[];
827
+ contourLevels: { molNo: number; contourLevel: number }[];
828
+ mapRadii: { molNo: number; radius: number }[];
829
+ mapAlpha: { molNo: number; alpha: number }[];
830
+ mapStyles: { molNo: number; style: "solid" | "lit-lines" | "lines" }[];
831
+ defaultMapSamplingRate: number;
832
+ defaultMapLitLines: boolean;
833
+ mapLineWidth: number;
834
+ defaultMapSurface: boolean;
835
+ mapColours: { molNo: number; rgb: {r: number, g: number, b: number} }[];
836
+ negativeMapColours: { molNo: number; rgb: {r: number, g: number, b: number} }[];
837
+ positiveMapColours: { molNo: number; rgb: {r: number, g: number, b: number} }[];
838
+ };
839
+ moleculeRepresentations: {
840
+ visibleMolecules: number[];
841
+ };
842
+ connectedMaps: {
843
+ updatingMapsIsEnabled: boolean;
844
+ connectedMolecule: number;
845
+ reflectionMap: number;
846
+ twoFoFcMap: number;
847
+ foFcMap: number;
848
+ uniqueMaps: number[];
849
+ defaultUpdatingScores: string[];
850
+ showScoresToast: boolean;
851
+ scoresUpdate: {toggle: boolean, molNo: number};
825
852
  };
826
853
  }
827
854