@datagrok/bio 2.20.5 → 2.21.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
@@ -5,7 +5,7 @@
5
5
  "name": "Leonid Stolbov",
6
6
  "email": "lstolbov@datagrok.ai"
7
7
  },
8
- "version": "2.20.5",
8
+ "version": "2.21.1",
9
9
  "description": "Bioinformatics support (import/export of sequences, conversion, visualization, analysis). [See more](https://github.com/datagrok-ai/public/blob/master/packages/Bio/README.md) for details.",
10
10
  "repository": {
11
11
  "type": "git",
@@ -44,7 +44,7 @@
44
44
  ],
45
45
  "dependencies": {
46
46
  "@biowasm/aioli": "^3.1.0",
47
- "@datagrok-libraries/bio": "^5.51.0",
47
+ "@datagrok-libraries/bio": "^5.51.1",
48
48
  "@datagrok-libraries/chem-meta": "^1.2.7",
49
49
  "@datagrok-libraries/math": "^1.2.4",
50
50
  "@datagrok-libraries/ml": "^6.10.0",
package/src/package.ts CHANGED
@@ -524,7 +524,6 @@ export async function activityCliffs(table: DG.DataFrame, molecules: DG.Column<s
524
524
  //tags: dim-red-preprocessing-function
525
525
  //meta.supportedSemTypes: Macromolecule
526
526
  //meta.supportedTypes: string
527
- //meta.supportedUnits: fasta,separator,helm
528
527
  //meta.supportedDistanceFunctions: Hamming,Levenshtein,Monomer chemical distance,Needlemann-Wunsch
529
528
  //input: column col {semType: Macromolecule}
530
529
  //input: string metric
@@ -31,6 +31,7 @@ import {CellRendererWithMonomerLibBackBase} from './monomer-cell-renderer-base';
31
31
  import * as C from './constants';
32
32
 
33
33
  import {_package} from '../package';
34
+ import {SeqTemps} from '@datagrok-libraries/bio/src/utils/macromolecule/seq-handler';
34
35
 
35
36
  type TempType = { [tagName: string]: any };
36
37
 
@@ -221,7 +222,7 @@ export class MacromoleculeDifferenceCellRendererBack extends CellRendererWithMon
221
222
  w = getUpdatedWidth(grid, g, x, w, dpr);
222
223
  //TODO: can this be replaced/merged with splitSequence?
223
224
  const [s1, s2] = s.split('#');
224
- const splitter = getSplitter(units, separator);
225
+ const splitter = this.tableCol.temp[SeqTemps.notationProvider]?.separatorSplitter ?? getSplitter(units, separator);
225
226
  const s1SS = splitter(s1);
226
227
  const s2SS = splitter(s2);
227
228
  const subParts1 = wu.count(0).take(s1SS.length).map((posIdx) => s1SS.getCanonical(posIdx)).toArray();
@@ -209,8 +209,22 @@ export class MonomerLibBase implements IMonomerLibBase {
209
209
  {style: {display: 'flex', flexDirection: 'row', justifyContent: 'center', margin: '6px'}}));
210
210
 
211
211
  // Source
212
- if (monomer.symbol != GAP_SYMBOL)
213
- res.append(ui.divText(monomer.lib?.source ?? 'Missed in libraries'));
212
+ if (monomer.symbol != GAP_SYMBOL) {
213
+ let source = monomer.lib?.source;
214
+ if (!source)
215
+ res.append(ui.divText('Missed in libraries'));
216
+ else {
217
+ // remove.json extension
218
+ if (source.endsWith('.json'))
219
+ source = source.substring(0, source.length - 5);
220
+ // convert campelCase/snake_case/kebab-case to space separated words
221
+ source = source
222
+ .replace(/_/g, ' ')
223
+ .replace(/-/g, ' ')
224
+ .replace(/([a-z])([a-z])([A-Z])/g, '$1$2 $3');
225
+ res.append(ui.divText(source));
226
+ }
227
+ }
214
228
  } else {
215
229
  res.append(ui.divV([
216
230
  ui.divText(`Monomer '${monomerSymbol}' of type '${polymerType}' not found.`),
@@ -54,7 +54,7 @@ export class SeqHandler implements ISeqHandler {
54
54
  const defaultGapOriginal = this.isFasta() ? GapOriginals[NOTATION.FASTA] :
55
55
  this.isSeparator() ? GapOriginals[NOTATION.SEPARATOR] :
56
56
  this.isHelm() ? GapOriginals[NOTATION.HELM] :
57
- this.isCustom() ? this.notationProvider.defaultGapOriginal :
57
+ this.isCustom() ? (this.notationProvider?.defaultGapOriginal ?? GapOriginals[NOTATION.SEPARATOR]) :
58
58
  undefined;
59
59
  if (defaultGapOriginal == undefined)
60
60
  throw new Error(`Unexpected defaultGapOriginal for notation '${this.notation}'`);
@@ -97,6 +97,72 @@ export class SeqHandler implements ISeqHandler {
97
97
  }
98
98
 
99
99
  this.columnVersion = this.column.version;
100
+ // refine separator only at this stage
101
+ if (this.isSeparator() && (!this.isCustom() || !this.notationProvider) && !col.temp['seqHandlerRefined']) {
102
+ this.refineSeparatorNotation();
103
+ col.temp['seqHandlerRefined'] = true;
104
+ }
105
+ }
106
+
107
+ private async refineSeparatorNotation() {
108
+ // from detectors.
109
+ const SEQ_SAMPLE_LIMIT = 100; const SEQ_SAMPLE_LENGTH_LIMIT = 100;
110
+ const categoriesSample = [...new Set((this.column.length < SEQ_SAMPLE_LIMIT ?
111
+ wu.count(0).take(Math.min(SEQ_SAMPLE_LIMIT, this.column.length)).map((rowI) => this.column.get(rowI)) :
112
+ this.column.categories.slice(0, SEQ_SAMPLE_LIMIT))
113
+ .map((seq) => !!seq ? seq.substring(0, SEQ_SAMPLE_LENGTH_LIMIT * 5) : '')
114
+ .filter((seq) => seq.length !== 0/* skip empty values for detector */),
115
+ )];
116
+
117
+ const getStats = (values: string[], minLength: number, splitter: (s: string) => string[]) => {
118
+ const freq:{[key: string]: number} = {};
119
+ let sameLength = true;
120
+ let firstLength = null;
121
+
122
+ for (const seq of values) {
123
+ const mSeq = !!seq ? splitter(seq) : [];
124
+
125
+ if (firstLength === null)
126
+ firstLength = mSeq.length;
127
+ else if (mSeq.length !== firstLength)
128
+ sameLength = false;
129
+
130
+ if (mSeq.length >= minLength) {
131
+ for (const m of mSeq) {
132
+ if (!(m in freq)) freq[m] = 0;
133
+ freq[m] += 1;
134
+ }
135
+ }
136
+ }
137
+ return {freq: freq, sameLength: sameLength};
138
+ };
139
+
140
+ const stats = getStats(categoriesSample, 3, (s) => s.split(this.separator!));
141
+ let invalidateRequired = false;
142
+
143
+ const refinerList = [
144
+ {package: 'SequenceTranslator', name: 'refineNotationProviderForHarmonizedSequence'},
145
+ ];
146
+
147
+ for (const refineFuncFind of refinerList) {
148
+ try {
149
+ const funcList = DG.Func.find(refineFuncFind);
150
+ if (funcList.length === 0) continue;
151
+
152
+ const funcFc = funcList[0].prepare({col: this.column, stats: stats, separator: this.separator});
153
+ const refineRes = (await funcFc.call()).getOutputParamValue();
154
+ invalidateRequired ||= refineRes;
155
+ } catch (err) {
156
+ console.error(err);
157
+ }
158
+ }
159
+
160
+ if (invalidateRequired) {
161
+ // Applying custom notation provider MUST invalidate SeqHandler
162
+ delete this.column.temp[SeqTemps.seqHandler];
163
+
164
+ this.column.fireValuesChanged();
165
+ }
100
166
  }
101
167
 
102
168
  /** From detectMacromolecule */
@@ -0,0 +1,4 @@
1
+
2
+ export function numbersWithinMaxDiff(a: number, b: number, maxDiff: number): boolean {
3
+ return Math.abs(a - b) <= maxDiff;
4
+ }
@@ -33,6 +33,7 @@ import {AggFunc, getAgg} from '../utils/agg';
33
33
  import {buildCompositionTable} from '../widgets/composition-analysis-widget';
34
34
 
35
35
  import {_package, getMonomerLibHelper} from '../package';
36
+ import {numbersWithinMaxDiff} from './utils';
36
37
 
37
38
  declare global {
38
39
  interface HTMLCanvasElement {
@@ -207,11 +208,11 @@ export class PositionInfo {
207
208
 
208
209
  render(g: CanvasRenderingContext2D,
209
210
  fontStyle: string, uppercaseLetterAscent: number, uppercaseLetterHeight: number,
210
- biotype: HelmType, monomerLib: IMonomerLibBase | null
211
+ biotype: HelmType, monomerLib: IMonomerLibBase | null, maxMonomerLetters: number
211
212
  ) {
212
213
  for (const [monomer, pmInfo] of Object.entries(this._freqs)) {
213
214
  if (monomer !== GAP_SYMBOL) {
214
- const monomerTxt = monomerToShort(monomer, 5);
215
+ const monomerTxt = monomerToShort(monomer, maxMonomerLetters);
215
216
  const b = pmInfo.bounds!;
216
217
  const left = b.left;
217
218
 
@@ -285,6 +286,7 @@ export enum PROPS {
285
286
  fitArea = 'fitArea',
286
287
  minHeight = 'minHeight',
287
288
  maxHeight = 'maxHeight',
289
+ maxMonomerLetters = 'maxMonomerLetters',
288
290
  showPositionLabels = 'showPositionLabels',
289
291
  positionMarginState = 'positionMarginState',
290
292
  positionMargin = 'positionMargin',
@@ -347,7 +349,8 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
347
349
 
348
350
  public minHeight: number;
349
351
  public backgroundColor: number = 0xFFFFFFFF;
350
- public maxHeight: number;
352
+ public maxHeight: number | null;
353
+ public maxMonomerLetters: number;
351
354
  public showPositionLabels: boolean;
352
355
  public positionMarginState: PositionMarginStates;
353
356
  /** Gets value from properties or setOptions */ public positionMargin: number = 0;
@@ -399,32 +402,32 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
399
402
 
400
403
  // -- Data --
401
404
  this.sequenceColumnName = this.string(PROPS.sequenceColumnName, defaults.sequenceColumnName,
402
- {category: PROPS_CATS.DATA, semType: DG.SEMTYPE.MACROMOLECULE});
405
+ {category: PROPS_CATS.DATA, semType: DG.SEMTYPE.MACROMOLECULE, description: 'Column with sequences'});
403
406
  const aggExcludeList = [DG.AGG.KEY, DG.AGG.PIVOT, DG.AGG.MISSING_VALUE_COUNT, DG.AGG.SKEW, DG.AGG.KURT,
404
407
  DG.AGG.SELECTED_ROWS_COUNT];
405
408
  const aggChoices = Object.values(DG.AGG).filter((agg) => !aggExcludeList.includes(agg));
406
- this.valueAggrType = this.string(PROPS.valueAggrType, defaults.valueAggrType,
407
- {category: PROPS_CATS.DATA, choices: aggChoices}) as DG.AggregationType;
408
409
  this.valueColumnName = this.string(PROPS.valueColumnName, defaults.valueColumnName,
409
- {category: PROPS_CATS.DATA, columnTypeFilter: 'numerical'});
410
+ {category: PROPS_CATS.DATA, columnTypeFilter: 'numerical', description: 'Column with values used in aggregation for position heights'});
411
+ this.valueAggrType = this.string(PROPS.valueAggrType, defaults.valueAggrType,
412
+ {category: PROPS_CATS.DATA, choices: aggChoices, description: 'Aggregation method for value column'}) as DG.AggregationType;
410
413
  this.startPositionName = this.string(PROPS.startPositionName, defaults.startPositionName,
411
- {category: PROPS_CATS.DATA});
414
+ {category: PROPS_CATS.DATA, description: 'Position or column name for start position. If column with given name is found, its values will be used as start position. If number is supplied, it will be used as start position of WebLogo.'});
412
415
  this.endPositionName = this.string(PROPS.endPositionName, defaults.endPositionName,
413
- {category: PROPS_CATS.DATA});
416
+ {category: PROPS_CATS.DATA, description: 'Position or column name for end position. If column with given name is found, its values will be used as end position. If number is supplied, it will be used as end position of WebLogo.'});
414
417
  this.skipEmptySequences = this.bool(PROPS.skipEmptySequences, defaults.skipEmptySequences,
415
- {category: PROPS_CATS.DATA});
418
+ {category: PROPS_CATS.DATA, description: 'Skip sequences which are empty in all positions'});
416
419
  this.skipEmptyPositions = this.bool(PROPS.skipEmptyPositions, defaults.skipEmptyPositions,
417
- {category: PROPS_CATS.DATA});
420
+ {category: PROPS_CATS.DATA, description: 'Skip positions which are empty in all sequences'});
418
421
  this.shrinkEmptyTail = this.bool(PROPS.shrinkEmptyTail, defaults.shrinkEmptyTail,
419
- {category: PROPS_CATS.DATA});
422
+ {category: PROPS_CATS.DATA, description: 'Skip empty tail (if found for all sequences within a subset) in WebLogo'});
420
423
 
421
424
  // -- Style --
422
425
  this.backgroundColor = this.int(PROPS.backgroundColor, defaults.backgroundColor,
423
- {category: PROPS_CATS.STYLE});
426
+ {category: PROPS_CATS.STYLE, description: 'Background color of WebLogo canvas'});
424
427
  this.positionHeight = this.string(PROPS.positionHeight, defaults.positionHeight,
425
- {category: PROPS_CATS.STYLE, choices: Object.values(PositionHeight)}) as PositionHeight;
428
+ {category: PROPS_CATS.STYLE, choices: Object.values(PositionHeight), description: 'Monomer-Position height mode. Entropy of 100%(full height)'}) as PositionHeight;
426
429
  this._positionWidth = this.positionWidth = this.float(PROPS.positionWidth, defaults.positionWidth,
427
- {category: PROPS_CATS.STYLE/* editor: 'slider', min: 4, max: 64, postfix: 'px' */});
430
+ {category: PROPS_CATS.LAYOUT, editor: 'slider', min: 4, max: 100, description: 'Width of position in WebLogo. If "Fit Area" is enabled, width will be calculated to fit horizontal space'});
428
431
 
429
432
  // -- Layout --
430
433
  this.verticalAlignment = this.string(PROPS.verticalAlignment, defaults.verticalAlignment,
@@ -434,23 +437,25 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
434
437
  this.fixWidth = this.bool(PROPS.fixWidth, defaults.fixWidth,
435
438
  {category: PROPS_CATS.LAYOUT, userEditable: false});
436
439
  this.fitArea = this.bool(PROPS.fitArea, defaults.fitArea,
437
- {category: PROPS_CATS.LAYOUT});
438
- this.minHeight = this.float(PROPS.minHeight, defaults.minHeight,
439
- {category: PROPS_CATS.LAYOUT/*, editor: 'slider', min: 25, max: 250, postfix: 'px'*/});
440
- this.maxHeight = this.float(PROPS.maxHeight, defaults.maxHeight,
441
- {category: PROPS_CATS.LAYOUT/*, editor: 'slider', min: 25, max: 500, postfix: 'px'*/});
440
+ {category: PROPS_CATS.LAYOUT, description: 'Fit WebLogo to the horizontal space. Calculates position width as maximum between provided width value and value needed to fit whole horizontal space.'});
441
+ this.minHeight = this.int(PROPS.minHeight, defaults.minHeight,
442
+ {category: PROPS_CATS.LAYOUT, editor: 'slider', min: 10, max: 250, description: 'Minimum height of WebLogo'});
443
+ this.maxHeight = this.int(PROPS.maxHeight, defaults.maxHeight,
444
+ {category: PROPS_CATS.LAYOUT, editor: 'slider', min: 25, max: Math.max(window.innerHeight ?? 0, 1000), nullable: true, description: 'Maximum height of WebLogo'});
445
+ this.maxMonomerLetters = this.int(PROPS.maxMonomerLetters, defaults.maxMonomerLetters,
446
+ {category: PROPS_CATS.LAYOUT, editor: 'slider', min: 1, max: 40, description: 'Maximum monomer letters to display before shortening'});
442
447
  this.showPositionLabels = this.bool(PROPS.showPositionLabels, defaults.showPositionLabels,
443
- {category: PROPS_CATS.LAYOUT});
448
+ {category: PROPS_CATS.LAYOUT, description: 'Show position labels on top of the weblogo'});
444
449
  this.positionMarginState = this.string(PROPS.positionMarginState, defaults.positionMarginState,
445
- {category: PROPS_CATS.LAYOUT, choices: Object.values(PositionMarginStates)}) as PositionMarginStates;
450
+ {category: PROPS_CATS.LAYOUT, choices: Object.values(PositionMarginStates), description: 'Calculate optimal margins between positions or turn it on/off'}) as PositionMarginStates;
446
451
  let defaultValueForPositionMargin = 0;
447
452
  if (this.positionMarginState === 'auto') defaultValueForPositionMargin = 4;
448
453
  this.positionMargin = this.int(PROPS.positionMargin, defaultValueForPositionMargin,
449
- {category: PROPS_CATS.LAYOUT, min: 0, max: 16});
454
+ {category: PROPS_CATS.LAYOUT, min: 0, max: 25, description: 'Margin between positions in WebLogo'});
450
455
 
451
456
  // -- Behavior --
452
457
  this.filterSource = this.string(PROPS.filterSource, defaults.filterSource,
453
- {category: PROPS_CATS.BEHAVIOR, choices: Object.values(FilterSources)}) as FilterSources;
458
+ {category: PROPS_CATS.BEHAVIOR, choices: Object.values(FilterSources), description: 'Data source for weblogo. Selected or filtered rows.'}) as FilterSources;
454
459
 
455
460
  const style: DG.SliderOptions = {style: 'barbell'};
456
461
  this.slider = ui.rangeSlider(0, 100, 0, 20, false, style);
@@ -673,15 +678,15 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
673
678
 
674
679
  if (this.fixWidth)
675
680
  this.calcLayoutFixWidth(dpr);
676
- else if (this.fitArea)
677
- this.calcLayoutFitArea(dpr);
681
+ // else if (this.fitArea)
682
+ // this.calcLayoutFitArea(dpr);
678
683
  else
679
684
  this.calcLayoutNoFitArea(dpr);
680
685
 
681
686
  this.slider.root.style.width = `${this.host.clientWidth}px`;
682
687
  }
683
688
 
684
- /** */
689
+ /** Only used from outside, useful for embedding weblogo into a viewer or smth else*/
685
690
  private calcLayoutFixWidth(dpr: number): void {
686
691
  if (!this.host || !this.canvas || !this.slider) return; // for es-lint
687
692
 
@@ -689,7 +694,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
689
694
  this.canvas.classList.add('bio-wl-fitArea');
690
695
 
691
696
  const areaWidth: number = this._positionWidthWithMargin * this.Length;
692
- const areaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight);
697
+ const areaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight ?? this.root.clientHeight);
693
698
 
694
699
  this.host.style.justifyContent = HorizontalAlignments.LEFT;
695
700
  this.host.style.removeProperty('margin-left');
@@ -712,15 +717,21 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
712
717
  private calcLayoutNoFitArea(dpr: number): void {
713
718
  if (!this.host || !this.canvas || !this.slider) return; // for es-lint
714
719
 
715
- const areaWidth: number = this._positionWidthWithMargin * this.Length;
716
- const areaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight);
720
+ let areaWidth: number = this._positionWidthWithMargin * this.Length;
721
+ let width = Math.min(this.root.clientWidth, areaWidth);
722
+ if (this.fitArea && areaWidth < this.root.clientWidth) { // if weblogo has some space to grow
723
+ this._positionWidth = Math.floor(this._positionWidth * this.root.clientWidth / areaWidth);
724
+ this._positionWidthWithMargin = this._positionWidth + this.positionMarginValue;
725
+ areaWidth = this._positionWidthWithMargin * this.Length;
726
+ width = Math.min(this.root.clientWidth, areaWidth);
727
+ }
728
+ const areaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight ?? this.root.clientHeight);
717
729
 
718
730
  const height = areaHeight;
719
- const width = Math.min(this.root.clientWidth, areaWidth);
720
731
 
721
732
  this.canvas.style.width = `${width}px`;
722
733
  this.canvas.style.height = `${height}px`;
723
- this.host.style.width = `${width}px`;
734
+ this.host.style.width = `${this.root.clientWidth}px`;
724
735
  this.host.style.height = `${this.root.clientHeight}px`;
725
736
 
726
737
  // host style flex-direction: row;
@@ -733,10 +744,10 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
733
744
 
734
745
  if (this.root.clientHeight < this.minHeight) {
735
746
  this.host.style.alignContent = 'start'; /* For vertical scroller to work properly */
736
- this.host.style.width = `${width + 6}px`; /* */
747
+ this.host.style.width = `${width + 8}px`; /* */
737
748
  }
738
749
 
739
- this.host.style.width = `${this.host}px`;
750
+ //this.host.style.width = `${this.host}px`;
740
751
 
741
752
  const sliderVisibility = areaWidth > width;
742
753
  this.setSliderVisibility(sliderVisibility);
@@ -744,30 +755,32 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
744
755
  this.slider.root.style.removeProperty('display');
745
756
  this.host.style.justifyContent = 'left'; /* For horizontal scroller to prevent */
746
757
  this.host.style.height = `${this.root.clientHeight - this.slider.root.offsetHeight}px`;
758
+ this.canvas.style.height = `${height - this.slider.root.offsetHeight}px`;
747
759
  this.slider.root.style.top = `${this.host.offsetHeight}px`;
748
760
 
749
761
  let newMin = Math.min(Math.max(0, this.slider.min), this.Length - 0.001);
750
762
  let newMax = Math.min(Math.max(0, this.slider.max), this.Length - 0.001);
751
763
 
752
- const visibleLength = this.root.clientWidth / this._positionWidthWithMargin;
764
+ const visibleLength = this.canvas.clientWidth / this._positionWidthWithMargin;
753
765
  newMax = Math.min(Math.max(newMin, 0) + visibleLength, this.Length - 0.001);
754
766
  newMin = Math.max(0, Math.min(newMax, this.Length - 0.001) - visibleLength);
755
767
 
756
- this.slider.setValues(0, Math.max(this.Length - 0.001), newMin, newMax);
768
+ this.safeUpdateSlider(0, Math.max(this.Length - 0.001), newMin, newMax);
757
769
  } else {
758
770
  //
759
- this.slider.setValues(0, Math.max(0, this.Length - 0.001), 0, Math.max(0, this.Length - 0.001));
771
+ this.safeUpdateSlider(0, Math.max(0, this.Length - 0.001), 0, Math.max(0, this.Length - 0.001));
760
772
  }
761
773
 
762
774
  this.canvas.width = width * dpr;
763
775
  this.canvas.height = height * dpr;
764
776
  }
765
777
 
778
+ /** Deprecated and currently not in use. */
766
779
  private calcLayoutFitArea(dpr: number): void {
767
780
  if (!this.host || !this.canvas || !this.slider) return; // for es-lint
768
781
 
769
782
  const originalAreaWidthWoMargins: number = this._positionWidth * this.Length;
770
- const originalAreaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight);
783
+ const originalAreaHeight: number = Math.min(Math.max(this.minHeight, this.root.clientHeight), this.maxHeight ?? this.root.clientHeight);
771
784
 
772
785
  // TODO: scale
773
786
  const xScale = originalAreaWidthWoMargins > 0 ?
@@ -819,16 +832,25 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
819
832
  newMax = Math.min(Math.max(newMin, 0) + visibleLength, this.Length - 0.001);
820
833
  newMin = Math.max(0, Math.min(newMax, this.Length - 0.001) - visibleLength);
821
834
 
822
- this.slider.setValues(0, Math.max(0, this.Length - 0.001), newMin, newMax);
835
+ this.safeUpdateSlider(0, Math.max(0, this.Length - 0.001), newMin, newMax);
823
836
  } else {
824
837
  //
825
- this.slider.setValues(0, Math.max(0, this.Length - 0.001), 0, Math.max(0, this.Length - 0.001));
838
+ this.safeUpdateSlider(0, Math.max(0, this.Length - 0.001), 0, Math.max(0, this.Length - 0.001));
826
839
  }
827
840
 
828
841
  this.canvas.width = width * dpr;
829
842
  this.canvas.height = height * dpr;
830
843
  }
831
844
 
845
+ /** makes sure that slider actually needs to be updated before updating it. if values are same, no update */
846
+ private safeUpdateSlider(minRange: number, maxRange: number, min: number, max: number): void {
847
+ if (!numbersWithinMaxDiff(minRange, this.slider.minRange, 0.1) ||
848
+ !numbersWithinMaxDiff(maxRange, this.slider.maxRange, 0.1) ||
849
+ !numbersWithinMaxDiff(min, this.slider.min, 0.1) ||
850
+ !numbersWithinMaxDiff(max, this.slider.max, 0.1))
851
+ this.slider.setValues(minRange, maxRange, min, max);
852
+ }
853
+
832
854
 
833
855
  /** Handler of property change events.
834
856
  * @param {DG.Property} property - property which was changed.
@@ -857,6 +879,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
857
879
  }
858
880
  case PROPS.minHeight:
859
881
  case PROPS.maxHeight:
882
+ case PROPS.maxMonomerLetters:
860
883
  case PROPS.positionWidth:
861
884
  case PROPS.showPositionLabels:
862
885
  case PROPS.fixWidth:
@@ -1147,7 +1170,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
1147
1170
  const uppercaseLetterHeight = 12.2;
1148
1171
  const biotype = this.seqHandler!.defaultBiotype;
1149
1172
  for (let jPos = firstPos; jPos <= lastPos; jPos++)
1150
- this.positions[jPos].render(g, fontStyle, uppercaseLetterAscent, uppercaseLetterHeight, biotype, this.monomerLib);
1173
+ this.positions[jPos].render(g, fontStyle, uppercaseLetterAscent, uppercaseLetterHeight, biotype, this.monomerLib, this.maxMonomerLetters);
1151
1174
  } finally {
1152
1175
  g.restore();
1153
1176
  }
@@ -1186,9 +1209,18 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
1186
1209
  min: this.slider.min, max: this.slider.max,
1187
1210
  maxRange: this.slider.maxRange
1188
1211
  };
1189
- _package.logger.debug(
1190
- `${this.toLog()}.sliderOnValuesChanged( ${JSON.stringify(val)} ), start`);
1191
- this.render(WlRenderLevel.Layout, 'sliderOnValuesChanged');
1212
+ // _package.logger.debug(
1213
+ // `${this.toLog()}.sliderOnValuesChanged( ${JSON.stringify(val)} ), start`);
1214
+ // this.render(WlRenderLevel.Layout, 'sliderOnValuesChanged');
1215
+ if (this.canvas && this.canvas.offsetWidth > 0 && (this._positionWidthWithMargin ?? 0) > 0) {
1216
+ const newRange = val.max - val.min;
1217
+ const newPositionWidth = this.canvas.offsetWidth / newRange - this.positionMarginValue;
1218
+ // if the range was changed on the slider
1219
+ if (!numbersWithinMaxDiff(newPositionWidth, this.positionWidth, 0.1))
1220
+ this.getProperty(PROPS.positionWidth)?.set(this, newPositionWidth);
1221
+ else // if range was not changed, but slider was moved
1222
+ this.render(WlRenderLevel.Layout, 'sliderOnValuesChanged');
1223
+ }
1192
1224
  } catch (err: any) {
1193
1225
  const errMsg = errorToConsole(err);
1194
1226
  _package.logger.error(`${this.toLog()}.sliderOnValuesChanged() error:\n` + errMsg);
@@ -1239,6 +1271,7 @@ export class WebLogoViewer extends DG.JsViewer implements IWebLogoViewer {
1239
1271
  tooltipRows.push(pi.buildCompositionTable(biotype, this.monomerLib));
1240
1272
  }
1241
1273
  const tooltipEl = ui.divV(tooltipRows);
1274
+ tooltipEl.style.maxHeight = '80vh';
1242
1275
  ui.tooltip.show(tooltipEl, args.x + 16, args.y + 16);
1243
1276
  } else if (pi !== null && monomer && this.dataFrame && this.seqCol && this.seqHandler) {
1244
1277
  // Monomer at position tooltip