@datagrok/helm 2.4.6 → 2.5.2

package/src/tests/helm-helper-tests.ts

@@ -0,0 +1,94 @@
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+import {after, before, category, delay, expect, expectArray, test, testEvent} from '@datagrok-libraries/utils/src/test';
+import {HelmNotSupportedError, IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+
+import {_package} from '../package-test';
+
+type TestSrcType = { helm: string };
+type TestTgtType = { helm: string | null, map: [number, number][] };
+
+category('HelmHelper: removeGaps', () => {
+  let helmHelper: IHelmHelper;
+
+  before(async () => {
+    helmHelper = await getHelmHelper();
+  });
+
+  const tests: { [testName: string]: { src: TestSrcType, tgt: TestTgtType } } = {
+    'single-linear-start': {
+      src: {helm: 'PEPTIDE1{*.[meY].A.G.T}$$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].A.G.T}$$$$V2.0',
+        map: [[1, 0], [2, 1], [3, 2], [4, 3]],
+      }
+    },
+    'single-linear-end': {
+      src: {helm: 'PEPTIDE1{[meY].A.G.T.*}$$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].A.G.T}$$$$V2.0',
+        map: [[0, 0], [1, 1], [2, 2], [3, 3]],
+      }
+    },
+    'single-linear-middle': {
+      src: {helm: 'PEPTIDE1{[meY].A.*.G.T}$$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].A.G.T}$$$$V2.0',
+        map: [[0, 0], [1, 1], [3, 2], [4, 3]],
+      }
+    },
+    'single-cycle-start': {
+      src: {helm: 'PEPTIDE1{*.[meY].C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,3:R3-7:R3$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-6:R3$$$V2.0',
+        map: [[1, 0], [2, 1], [3, 2], [4, 3], [5, 4], [6, 5], [7, 6]],
+      }
+    },
+    'single-cycle-end': {
+      src: {helm: 'PEPTIDE1{[meY].C.R.N.P.C.T.*}$PEPTIDE1,PEPTIDE1,2:R3-6:R3$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-6:R3$$$V2.0',
+        map: [[0, 0], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [6, 6]],
+      }
+    },
+    'single-cycle-middle': {
+      src: {helm: 'PEPTIDE1{[meY].C.R.N.*.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-7:R3$$$V2.0'},
+      tgt: {
+        helm: 'PEPTIDE1{[meY].C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-6:R3$$$V2.0',
+        map: [[0, 0], [1, 1], [2, 2], [3, 3], [5, 4], [6, 5], [7, 6]],
+      }
+    },
+    'single-cycle-gap-at-connection': {
+      src: {helm: 'PEPTIDE1{[meY].*.C.R.N.P.C.T}$PEPTIDE1,PEPTIDE1,2:R3-7:R3$$$V2.0'},
+      tgt: {helm: null, map: []}
+    }
+  };
+
+  for (const [testName, testData] of Object.entries(tests)) {
+    test(`${testName}`, async () => {
+      let resErr: any = null;
+      try {
+        const res = helmHelper.removeGaps(testData.src.helm);
+        expect(res.resHelm, testData.tgt.helm);
+        expectArray(Array.from(res.monomerMap!.entries()), testData.tgt.map);
+      } catch (err: any) {
+        resErr = err;
+      }
+
+      if (testData.tgt.helm === null) { // err expected, for debug on GitHub CI
+        expect(resErr != null, true, 'Error expected');
+        const isErrorInstance = resErr instanceof HelmNotSupportedError;
+        const errCtorName = resErr.constructor.name;
+        const isErrorCtor = errCtorName === 'HelmNotSupportedError';
+        _package.logger.debug(`Check error object. ` +
+          `isErrorInstance: ${isErrorInstance}, isErrorCtor: ${isErrorCtor}, errCtorName: ${errCtorName}`);
+      }
+
+      expect((resErr instanceof HelmNotSupportedError) || resErr?.constructor.name === 'HelmNotSupportedError',
+        testData.tgt.helm === null, 'HelmNotSupportedError thrown expected');
+    }, testData.tgt.helm == null ? {skipReason: 'GitHub CI does not support testing exceptions'} : undefined);
+  }
+});

package/src/tests/parse-helm-tests.ts

@@ -28,7 +28,7 @@ category('parseHelm', () => {
         helm: 'PEPTIDE1{[L-hArg(Et,Et)].E.F.G}|PEPTIDE2{C.E}$PEPTIDE1,PEPTIDE2,2:R3-1:R1$$$V2.0'
       }
     },
-    'PT-cycic': {
+    'PT-cyclic': {
       src: 'PEPTIDE1{[meI].C.[Aca].[Cys_SEt].T.C.[Thr_PO3H2].[Aca]}$PEPTIDE1,PEPTIDE1,8:R2-1:R1$$$V2.0',
       tgt: {
         atomCount: 8, bondCount: 8,
@@ -55,8 +55,7 @@ category('parseHelm', () => {
 
     // parseHelm is dependent on monomers RGroups available, test requires default monomer library
     await setUserLibSettingsForTests();
-    await timeout(async () => { await libHelper.awaitLoaded(); }, 5000,
-      'await monomerLib to be loaded');
+    await libHelper.awaitLoaded();
     await libHelper.loadMonomerLib(true);
   });
 
@@ -74,7 +73,7 @@ category('parseHelm', () => {
   for (const [testName, {src, tgt}] of Object.entries(testData)) {
     test(`woDOM-${testName}`, async () => {
       _testParseHelmWithoutDOM(src, tgt);
-    });
+    }, testName == 'RNA' ? {skipReason: 'GROK-16721'} : undefined);
   }
 });
 
@@ -103,7 +102,6 @@ function _testParseHelmWithoutDOM(src: string, tgt: TestTgtType): void {
   io.parseHelm(plugin, src, origin, undefined);
 
   const m: Mol<HelmType> = plugin.jsd.m;
-  debugger;
   const resHelm = io.getHelm(m);
   expect(m.atoms.length, tgt.atomCount);
   expect(m.bonds.length, tgt.bondCount);

package/src/utils/get-hovered.ts

@@ -6,6 +6,9 @@ import {HelmType, PolymerType, Atom, Mol, ISeqMonomer, HelmMol, HelmAtom} from '
 
 import {helmTypeToPolymerType} from '@datagrok-libraries/bio/src/monomer-works/monomer-works';
 
+import {HelmTypes} from '@datagrok-libraries/bio/src/helm/consts';
+import {GAP_SYMBOL, GapOriginals, NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule/consts';
+
 import {HelmMonomerPlacer} from '../helm-monomer-placer';
 
 export function getHoveredMonomerFromEditorMol(
@@ -77,23 +80,33 @@ export function getHoveredMonomerFallback(
   }
   left = (argsX >= sumLengths[left]) ? left : left - 1; // correct left to between sumLengths
   if (left >= 0)
-    hoveredSeqMonomer = getSeqMonomerFromHelm(allParts[0], allParts[left]);
+    hoveredSeqMonomer = getSeqMonomerFromHelm(left, allParts[left], allParts[0]);
   return hoveredSeqMonomer;
 }
 
 export function getSeqMonomerFromHelmAtom(atom: HelmAtom): ISeqMonomer {
   const polymerType = helmTypeToPolymerType(atom.bio!.type);
-  return {symbol: atom.elem, polymerType: polymerType};
+  const canonicalSymbol = atom.elem === GapOriginals[NOTATION.HELM] ? GAP_SYMBOL : atom.elem;
+  return {position: parseInt(atom.bio!.continuousId as string) - 1, symbol: atom.elem, biotype: atom.bio!.type};
 }
 
-function getSeqMonomerFromHelm(
-  helmPrefix: string, symbol: string
-): ISeqMonomer {
+/** Linear
+ * @deprecated
+ */
+function getSeqMonomerFromHelm(pos: number, symbol: string, helmPrefix: string): ISeqMonomer {
   let resSeqMonomer: ISeqMonomer | undefined = undefined;
   const polymerTypeList: PolymerType[] = ['RNA', 'PEPTIDE', 'CHEM', 'BLOB', 'G'];
   for (const polymerType of polymerTypeList) {
-    if (helmPrefix.startsWith(polymerType))
-      resSeqMonomer = {symbol: symbol, polymerType: polymerType};
+    if (helmPrefix.startsWith(polymerType)) {
+      let helmType: HelmType = HelmTypes.AA;
+      if (polymerType == 'RNA')
+        helmType = HelmTypes.NUCLEOTIDE;
+      else if (polymerType == 'PEPTIDE')
+        helmType = HelmTypes.AA;
+      else if (polymerType == 'CHEM')
+        helmType = HelmTypes.CHEM;
+      resSeqMonomer = {position: pos, symbol: symbol, biotype: helmType};
+    }
   }
   if (!resSeqMonomer)
     throw new Error(`Monomer not found for symbol = '${symbol}' and helmPrefix = '${helmPrefix}'.`);

package/src/utils/get-monomer.ts

@@ -5,14 +5,7 @@ import * as DG from 'datagrok-api/dg';
 import {ILogger} from '@datagrok-libraries/bio/src/utils/logger';
 import {IMonomerLib, Monomer} from '@datagrok-libraries/bio/src/types';
 import {Atom, HelmType, IWebEditorMonomer, GetMonomerResType} from '@datagrok-libraries/bio/src/helm/types';
-import {helmTypeToPolymerType} from '@datagrok-libraries/bio/src/monomer-works/monomer-works';
-import {
-  HELM_REQUIRED_FIELD as REQ
-} from '@datagrok-libraries/bio/src/utils/const';
-import {HelmTypes} from '@datagrok-libraries/bio/src/helm/consts';
 
-import {AmbiguousWebEditorMonomer, GapWebEditorMonomer, getRS, MissingWebEditorMonomer} from './get-monomer-dummy';
-import {LibraryWebEditorMonomer} from './get-monomer-of-library';
 import {OrgHelmModule, ScilModule} from '../types';
 import {RGROUP_CAP_GROUP_NAME, RGROUP_LABEL, SMILES} from '../constants';
 
@@ -21,10 +14,6 @@ import {_package} from '../package';
 declare const org: OrgHelmModule;
 declare const scil: ScilModule;
 
-const monomerRe = /[\w()]+/;
-//** Do not mess with monomer symbol with parenthesis enclosed in square brackets */
-const ambMonomerRe = RegExp(String.raw`\(${monomerRe}(,${monomerRe})+\)`);
-
 type GetMonomerOverridingFunc = (
   a: Atom<HelmType> | HelmType, name: string | undefined, monomerLib: IMonomerLib,
   originalGetMonomer: (a: Atom<HelmType> | HelmType, name: string) => GetMonomerResType) => GetMonomerResType;
@@ -52,69 +41,6 @@ export function getMonomerOverrideAndLogAlert(
   }
 }
 
-/** Inputs logic */
-export function getMonomerHandleArgs(
-  a: Atom<HelmType> | HelmType, name?: string
-): [/** biotype */ HelmType, /** elem */ string] {
-  if (!a)
-    throw new Error(`Argument 'a' of type Atom or HelmType is mandatory.`);
-  let biotype: HelmType;
-  let elem: string;
-  if ((a as Atom<HelmType>).T === 'ATOM') {
-    biotype = (a as Atom<HelmType>).biotype()!;
-    elem = (a as Atom<HelmType>).elem;
-  } else {
-    biotype = a as HelmType;
-    elem = org.helm.webeditor.IO.trimBracket(name!);
-  }
-  return [biotype, elem];
-}
-
-
-/** Substitutes {@link org.helm.webeditor.Monomers.getMonomer()} */
-export function getWebEditorMonomer(
-  monomerLib: IMonomerLib,
-  a: Atom<HelmType> | HelmType, argName?: string,
-): IWebEditorMonomer | null {
-  const [biotype, elem] = getMonomerHandleArgs(a, argName);
-  const pt = helmTypeToPolymerType(biotype);
-
-  /** Get or create {@link Monomer} object (in case it is missing in monomer library current config) */
-  let m: Monomer | null = monomerLib.getMonomer(pt, elem);
-  if (m && biotype == HelmTypes.LINKER && m[REQ.RGROUPS].length != 2) {
-    // Web Editor expects null
-    return null;
-  }
-  if (m && biotype == HelmTypes.SUGAR && m[REQ.RGROUPS].length != 3) {
-    // Web Editor expects null
-    return null;
-  }
-  if (!m /* && biotype != HelmTypes.LINKER*/)
-    m = monomerLib.addMissingMonomer(pt, elem);
-
-  /** Get or create {@link org,helm.WebEditorMonomer} */
-  let resWem: IWebEditorMonomer | null = m.wem ?? null;
-  if (!resWem) {
-    if (elem === '*')
-      resWem = m.wem = new GapWebEditorMonomer(biotype, elem);
-    else if (
-      (biotype === 'HELM_NUCLETIDE' && elem === 'N') ||
-      (biotype === 'HELM_AA' && elem === 'X') ||
-      (biotype === 'HELM_CHEM' && false) || // TODO: Ambiguous monomer for CHEM
-      ambMonomerRe.test(elem) // e.g. (A,R,_)
-    )
-      resWem = m.wem = new AmbiguousWebEditorMonomer(biotype, elem);
-    else if (!m.lib)
-      resWem = m.wem = new MissingWebEditorMonomer(biotype, elem);
-
-
-    if (!resWem)
-      resWem = m.wem = LibraryWebEditorMonomer.fromMonomer(biotype, m);
-  }
-
-  return resWem;
-}
-
 /** Fills org.helm.webeditor.Monomers dictionary for WebEditor */
 export function rewriteLibraries(monomerLib: IMonomerLib): void {
   org.helm.webeditor.Monomers.clear();
@@ -145,7 +71,7 @@ export function rewriteLibraries(monomerLib: IMonomerLib): void {
       } else if (monomer[SMILES] != null) {
         // @ts-ignore
         webEditorMonomer.rs = Object.keys(getRS(monomer[SMILES].toString())).length;
-        webEditorMonomer.at = getRS(monomer[SMILES].toString());
+        webEditorMonomer.at = monomerLib.getRS(monomer[SMILES].toString());
       } else
         isBroken = true;
 

package/src/utils/helm-grid-cell-renderer.ts

@@ -12,8 +12,9 @@ import {HelmAux, HelmProps} from '@datagrok-libraries/bio/src/viewers/helm-servi
 import {_getHelmService} from '../package-utils';
 import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
 import {ILogger} from '@datagrok-libraries/bio/src/utils/logger';
-import {getGridCellRendererBack} from '@datagrok-libraries/bio/src/utils/cell-renderer-back-base';
+import {getGridCellColTemp} from '@datagrok-libraries/bio/src/utils/cell-renderer-back-base';
 import {IMonomerLib} from '@datagrok-libraries/bio/src/types/index';
+import {execMonomerHoverLinks} from '@datagrok-libraries/bio/src/monomer-works/monomer-hover';
 
 import {getHoveredMonomerFromEditorMol, getSeqMonomerFromHelmAtom} from './get-hovered';
 
@@ -129,16 +130,23 @@ export class HelmGridCellRendererBack extends CellRendererBackAsyncBase<HelmProp
     }
     const hoveredAtom = getHoveredMonomerFromEditorMol(argsX, argsY, editorMol, gridCell.bounds.height);
 
+    let seqMonomer: ISeqMonomer | null = null;
     if (hoveredAtom) {
-      const seqMonomer = getSeqMonomerFromHelmAtom(hoveredAtom);
+      seqMonomer = getSeqMonomerFromHelmAtom(hoveredAtom);
       const monomerLib = _package.monomerLib;
-      const tooltipEl = monomerLib ? monomerLib.getTooltip(seqMonomer.polymerType, seqMonomer.symbol) :
+      const tooltipEl = monomerLib ? monomerLib.getTooltip(seqMonomer.biotype, seqMonomer.symbol) :
         ui.divText('Monomer library is not available');
       ui.tooltip.show(tooltipEl, e.x + 16, e.y + 16);
     } else {
       // Tooltip for missing monomers
       ui.tooltip.hide();
     }
+
+    execMonomerHoverLinks(gridCell, seqMonomer);
+  }
+
+  onMouseLeave(gridCell: DG.GridCell, e: MouseEvent): void {
+    execMonomerHoverLinks(gridCell, null);
   }
 
   public override render(g: CanvasRenderingContext2D,
@@ -161,10 +169,10 @@ export class HelmGridCellRendererBack extends CellRendererBackAsyncBase<HelmProp
 
   static getOrCreate(gridCell: DG.GridCell): HelmGridCellRendererBack {
     const [gridCol, tableCol, temp] =
-      getGridCellRendererBack<string, HelmGridCellRendererBack>(gridCell);
+      getGridCellColTemp<string, HelmGridCellRendererBack>(gridCell);
 
-    let res: HelmGridCellRendererBack = temp['rendererBack'];
-    if (!res) res = temp['rendererBack'] = new HelmGridCellRendererBack(gridCol, tableCol);
+    let res: HelmGridCellRendererBack = temp.rendererBack;
+    if (!res) res = temp.rendererBack = new HelmGridCellRendererBack(gridCol, tableCol);
     return res;
   }
 }
@@ -191,6 +199,19 @@ export class HelmGridCellRenderer extends DG.GridCellRenderer {
     }
   }
 
+  override onMouseLeave(gridCell: DG.GridCell, e: MouseEvent) {
+    const logPrefix = `Helm: HelmGridCellRenderer.onMouseLeave()`;
+    try {
+      HelmGridCellRendererBack.getOrCreate(gridCell).onMouseLeave(gridCell, e);
+    } catch (err: any) {
+      const [errMsg, errStack] = errInfo(err);
+      _package.logger.error(errMsg, undefined, errStack);
+    } finally {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }
+
   override render(
     g: CanvasRenderingContext2D, x: number, y: number, w: number, h: number,
     gridCell: DG.GridCell, cellStyle: DG.GridCellStyle

package/src/widgets/helm-input.ts

@@ -5,7 +5,7 @@ import * as DG from 'datagrok-api/dg';
 import $ from 'cash-dom';
 import {fromEvent, Observable, Unsubscribable} from 'rxjs';
 
-import {IMonomerLib} from '@datagrok-libraries/bio/src/types/index';
+import {IMonomerLibBase} from '@datagrok-libraries/bio/src/types/index';
 import {HelmInputBase, IHelmHelper, IHelmInputInitOptions} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {HelmAtom, HelmMol, HelmString, IHelmWebEditor} from '@datagrok-libraries/bio/src/helm/types';
 
@@ -72,7 +72,7 @@ export class HelmInput extends HelmInputBase {
 
   protected constructor(
     private readonly helmHelper: IHelmHelper,
-    private readonly monomerLib: IMonomerLib,
+    private readonly monomerLib: IMonomerLibBase,
     name?: string,
     public readonly options?: IHelmInputInitOptions,
     private readonly logger = _package.logger,
@@ -135,7 +135,7 @@ export class HelmInput extends HelmInputBase {
   }
 
   /** Inspired by {@link DG.MarkdownInput}, {@link ui._create} */
-  static create(helmHelper: IHelmHelper, monomerLib: IMonomerLib,
+  static create(helmHelper: IHelmHelper, monomerLib: IMonomerLibBase,
     name?: string, options?: IHelmInputInitOptions
   ): HelmInput {
     const input = new HelmInput(helmHelper, monomerLib, name, options);
@@ -183,7 +183,7 @@ export class HelmInput extends HelmInputBase {
     if (hoveredAtom) {
       const seqMonomer = getSeqMonomerFromHelmAtom(hoveredAtom);
       const monomerLib = _package.monomerLib;
-      const tooltipEl = monomerLib ? monomerLib.getTooltip(seqMonomer.polymerType, seqMonomer.symbol) :
+      const tooltipEl = monomerLib ? monomerLib.getTooltip(seqMonomer.biotype, seqMonomer.symbol) :
         ui.divText('Monomer library is not available');
       this.showTooltip(tooltipEl, hoveredAtom);
       event.preventDefault();

package/vendor/dojo-1.10.10/dijit/_base.js.uncompressed.js

@@ -0,0 +1,27 @@
+define("dijit/_base", [
+	"./main",
+	"./a11y",	// used to be in dijit/_base/manager
+	"./WidgetSet",	// used to be in dijit/_base/manager
+	"./_base/focus",
+	"./_base/manager",
+	"./_base/place",
+	"./_base/popup",
+	"./_base/scroll",
+	"./_base/sniff",
+	"./_base/typematic",
+	"./_base/wai",
+	"./_base/window"
+], function(dijit){
+
+	// module:
+	//		dijit/_base
+
+	/*=====
+	return {
+		// summary:
+		//		Includes all the modules in dijit/_base
+	};
+	=====*/
+
+	return dijit._base;
+});

package/vendor/dojo-1.10.10/dojox/gfx/_base.js

@@ -0,0 +1,253 @@
+//>>built
+define("dojox/gfx/_base",["dojo/_base/kernel","dojo/_base/lang","dojo/_base/Color","dojo/_base/sniff","dojo/_base/window","dojo/_base/array","dojo/dom","dojo/dom-construct","dojo/dom-geometry"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9){
+var g=_2.getObject("dojox.gfx",true),b=g._base={};
+g._hasClass=function(_a,_b){
+var _c=_a.getAttribute("className");
+return _c&&(" "+_c+" ").indexOf(" "+_b+" ")>=0;
+};
+g._addClass=function(_d,_e){
+var _f=_d.getAttribute("className")||"";
+if(!_f||(" "+_f+" ").indexOf(" "+_e+" ")<0){
+_d.setAttribute("className",_f+(_f?" ":"")+_e);
+}
+};
+g._removeClass=function(_10,_11){
+var cls=_10.getAttribute("className");
+if(cls){
+_10.setAttribute("className",cls.replace(new RegExp("(^|\\s+)"+_11+"(\\s+|$)"),"$1$2"));
+}
+};
+b._getFontMeasurements=function(){
+var _12={"1em":0,"1ex":0,"100%":0,"12pt":0,"16px":0,"xx-small":0,"x-small":0,"small":0,"medium":0,"large":0,"x-large":0,"xx-large":0};
+var p,_13;
+if(_4("ie")){
+_13=_5.doc.documentElement.style.fontSize||"";
+if(!_13){
+_5.doc.documentElement.style.fontSize="100%";
+}
+}
+var div=_8.create("div",{style:{position:"absolute",left:"0",top:"-100px",width:"30px",height:"1000em",borderWidth:"0",margin:"0",padding:"0",outline:"none",lineHeight:"1",overflow:"hidden"}},_5.body());
+for(p in _12){
+div.style.fontSize=p;
+_12[p]=Math.round(div.offsetHeight*12/16)*16/12/1000;
+}
+if(_4("ie")){
+_5.doc.documentElement.style.fontSize=_13;
+}
+_5.body().removeChild(div);
+return _12;
+};
+var _14=null;
+b._getCachedFontMeasurements=function(_15){
+if(_15||!_14){
+_14=b._getFontMeasurements();
+}
+return _14;
+};
+var _16=null,_17={};
+b._getTextBox=function(_18,_19,_1a){
+var m,s,al=arguments.length;
+var i,box;
+if(!_16){
+_16=_8.create("div",{style:{position:"absolute",top:"-10000px",left:"0",visibility:"hidden"}},_5.body());
+}
+m=_16;
+m.className="";
+s=m.style;
+s.borderWidth="0";
+s.margin="0";
+s.padding="0";
+s.outline="0";
+if(al>1&&_19){
+for(i in _19){
+if(i in _17){
+continue;
+}
+s[i]=_19[i];
+}
+}
+if(al>2&&_1a){
+m.className=_1a;
+}
+m.innerHTML=_18;
+if(m.getBoundingClientRect){
+var bcr=m.getBoundingClientRect();
+box={l:bcr.left,t:bcr.top,w:bcr.width||(bcr.right-bcr.left),h:bcr.height||(bcr.bottom-bcr.top)};
+}else{
+box=_9.getMarginBox(m);
+}
+m.innerHTML="";
+return box;
+};
+b._computeTextLocation=function(_1b,_1c,_1d,_1e){
+var loc={},_1f=_1b.align;
+switch(_1f){
+case "end":
+loc.x=_1b.x-_1c;
+break;
+case "middle":
+loc.x=_1b.x-_1c/2;
+break;
+default:
+loc.x=_1b.x;
+break;
+}
+var c=_1e?0.75:1;
+loc.y=_1b.y-_1d*c;
+return loc;
+};
+b._computeTextBoundingBox=function(s){
+if(!g._base._isRendered(s)){
+return {x:0,y:0,width:0,height:0};
+}
+var loc,_20=s.getShape(),_21=s.getFont()||g.defaultFont,w=s.getTextWidth(),h=g.normalizedLength(_21.size);
+loc=b._computeTextLocation(_20,w,h,true);
+return {x:loc.x,y:loc.y,width:w,height:h};
+};
+b._isRendered=function(s){
+var p=s.parent;
+while(p&&p.getParent){
+p=p.parent;
+}
+return p!==null;
+};
+var _22=0;
+b._getUniqueId=function(){
+var id;
+do{
+id=_1._scopeName+"xUnique"+(++_22);
+}while(_7.byId(id));
+return id;
+};
+var _23=_4("pointer-events")?"touchAction":_4("MSPointer")?"msTouchAction":null;
+b._fixMsTouchAction=_23?function(_24){
+_24.rawNode.style[_23]="none";
+}:function(){
+};
+_2.mixin(g,{defaultPath:{type:"path",path:""},defaultPolyline:{type:"polyline",points:[]},defaultRect:{type:"rect",x:0,y:0,width:100,height:100,r:0},defaultEllipse:{type:"ellipse",cx:0,cy:0,rx:200,ry:100},defaultCircle:{type:"circle",cx:0,cy:0,r:100},defaultLine:{type:"line",x1:0,y1:0,x2:100,y2:100},defaultImage:{type:"image",x:0,y:0,width:0,height:0,src:""},defaultText:{type:"text",x:0,y:0,text:"",align:"start",decoration:"none",rotated:false,kerning:true},defaultTextPath:{type:"textpath",text:"",align:"start",decoration:"none",rotated:false,kerning:true},defaultStroke:{type:"stroke",color:"black",style:"solid",width:1,cap:"butt",join:4},defaultLinearGradient:{type:"linear",x1:0,y1:0,x2:100,y2:100,colors:[{offset:0,color:"black"},{offset:1,color:"white"}]},defaultRadialGradient:{type:"radial",cx:0,cy:0,r:100,colors:[{offset:0,color:"black"},{offset:1,color:"white"}]},defaultPattern:{type:"pattern",x:0,y:0,width:0,height:0,src:""},defaultFont:{type:"font",style:"normal",variant:"normal",weight:"normal",size:"10pt",family:"serif"},getDefault:(function(){
+var _25={};
+return function(_26){
+var t=_25[_26];
+if(t){
+return new t();
+}
+t=_25[_26]=new Function();
+t.prototype=g["default"+_26];
+return new t();
+};
+})(),normalizeColor:function(_27){
+return (_27 instanceof _3)?_27:new _3(_27);
+},normalizeParameters:function(_28,_29){
+var x;
+if(_29){
+var _2a={};
+for(x in _28){
+if(x in _29&&!(x in _2a)){
+_28[x]=_29[x];
+}
+}
+}
+return _28;
+},makeParameters:function(_2b,_2c){
+var i=null;
+if(!_2c){
+return _2.delegate(_2b);
+}
+var _2d={};
+for(i in _2b){
+if(!(i in _2d)){
+_2d[i]=_2.clone((i in _2c)?_2c[i]:_2b[i]);
+}
+}
+return _2d;
+},formatNumber:function(x,_2e){
+var val=x.toString();
+if(val.indexOf("e")>=0){
+val=x.toFixed(4);
+}else{
+var _2f=val.indexOf(".");
+if(_2f>=0&&val.length-_2f>5){
+val=x.toFixed(4);
+}
+}
+if(x<0){
+return val;
+}
+return _2e?" "+val:val;
+},makeFontString:function(_30){
+return _30.style+" "+_30.variant+" "+_30.weight+" "+_30.size+" "+_30.family;
+},splitFontString:function(str){
+var _31=g.getDefault("Font");
+var t=str.split(/\s+/);
+do{
+if(t.length<5){
+break;
+}
+_31.style=t[0];
+_31.variant=t[1];
+_31.weight=t[2];
+var i=t[3].indexOf("/");
+_31.size=i<0?t[3]:t[3].substring(0,i);
+var j=4;
+if(i<0){
+if(t[4]=="/"){
+j=6;
+}else{
+if(t[4].charAt(0)=="/"){
+j=5;
+}
+}
+}
+if(j<t.length){
+_31.family=t.slice(j).join(" ");
+}
+}while(false);
+return _31;
+},cm_in_pt:72/2.54,mm_in_pt:7.2/2.54,px_in_pt:function(){
+return g._base._getCachedFontMeasurements()["12pt"]/12;
+},pt2px:function(len){
+return len*g.px_in_pt();
+},px2pt:function(len){
+return len/g.px_in_pt();
+},normalizedLength:function(len){
+if(len.length===0){
+return 0;
+}
+if(len.length>2){
+var _32=g.px_in_pt();
+var val=parseFloat(len);
+switch(len.slice(-2)){
+case "px":
+return val;
+case "pt":
+return val*_32;
+case "in":
+return val*72*_32;
+case "pc":
+return val*12*_32;
+case "mm":
+return val*g.mm_in_pt*_32;
+case "cm":
+return val*g.cm_in_pt*_32;
+}
+}
+return parseFloat(len);
+},pathVmlRegExp:/([A-Za-z]+)|(\d+(\.\d+)?)|(\.\d+)|(-\d+(\.\d+)?)|(-\.\d+)/g,pathSvgRegExp:/([A-DF-Za-df-z])|([-+]?\d*[.]?\d+(?:[eE][-+]?\d+)?)/g,equalSources:function(a,b){
+return a&&b&&a===b;
+},switchTo:function(_33){
+var ns=typeof _33=="string"?g[_33]:_33;
+if(ns){
+_6.forEach(["Group","Rect","Ellipse","Circle","Line","Polyline","Image","Text","Path","TextPath","Surface","createSurface","fixTarget"],function(_34){
+g[_34]=ns[_34];
+});
+if(typeof _33=="string"){
+g.renderer=_33;
+}else{
+_6.some(["svg","vml","canvas","canvasWithEvents","silverlight"],function(r){
+return (g.renderer=g[r]&&g[r].Surface===g.Surface?r:null);
+});
+}
+}
+}});
+return g;
+});