Introduce getKindForType in core.mjs

Used it when type should be transformed into kind

Author: linev

modules/base/ObjectPainter.mjs

@@ -1,6 +1,6 @@
 import { pointer as d3_pointer } from '../d3.mjs';
 import { settings, constants, internals, isNodeJs, isBatchMode, getPromise, BIT,
-         prROOT, clTObjString, clTAxis, isObject, isFunc, isStr, getDocument, urlClassPrefix } from '../core.mjs';
+         getKindForType, clTObjString, clTAxis, isObject, isFunc, isStr, getDocument, urlClassPrefix } from '../core.mjs';
 import { isPlainText, producePlainText, produceLatex, produceMathjax, typesetMathjax, approximateLabelWidth } from './latex.mjs';
 import { getElementRect, BasePainter, makeTranslate } from './BasePainter.mjs';
 import { TAttMarkerHandler } from './TAttMarkerHandler.mjs';
@@ -257,7 +257,7 @@ class ObjectPainter extends BasePainter {
       if (!cl || !isFunc(pp?.getObjectDrawSettings))
          return [];
 
-      return pp.getObjectDrawSettings(prROOT + cl, 'nosame')?.opts;
+      return pp.getObjectDrawSettings(getKindForType(cl), 'nosame')?.opts;
    }
 
    /** @summary Central place to update objects drawing

modules/core.mjs

@@ -2021,6 +2021,25 @@ function isRootCollection(lst, typename) {
           (typename === clTObjArray) || (typename === clTClonesArray);
 }
 
+/** @summary Return kind string for type
+  * @desc Used when internal objects without clear ROOT type are used
+  * For such objects abstract 'kind' is defined. Used in hpainter and draw handles
+  * @private */
+function getKindForType(typ) {
+   return (!isStr(typ) || (typ.indexOf(nsROOT) !== 0)) ? prROOT + typ : typ;
+}
+
+/** @summary Return type name from kind string
+  * @private */
+function getTypeForKind(kind) {
+   if (!isStr(kind))
+      return null;
+   if (kind.indexOf(prROOT) === 0)
+      return kind.slice(prROOT.length);
+   if (kind.indexOf(nsROOT) === 0)
+      return kind;
+   return null;
+}
 
 /** @summary Internal collection of functions potentially used by batch scripts
   * @private */
@@ -2044,4 +2063,5 @@ export { version_id, version_date, version, source_dir, isNodeJs, isBatchMode, s
          isArrayProto, getDocument, BIT, clone, addMethods, parse, parseMulti, toJSON,
          decodeUrl, findFunction, createHttpRequest, httpRequest, loadModules, loadScript, injectCode,
          create, createHistogram, setHistogramTitle, createTPolyLine, createTGraph, createTHStack, createTMultiGraph,
-         getMethods, registerMethods, isRootCollection, isObject, isFunc, isStr, isPromise, getPromise, postponePromise, _ensureJSROOT };
+         getMethods, registerMethods, isRootCollection, isObject, isFunc, isStr, isPromise, getPromise, postponePromise,
+         getKindForType, getTypeForKind, _ensureJSROOT };

modules/draw.mjs

@@ -1,6 +1,6 @@
 import { select as d3_select } from './d3.mjs';
 import { loadScript, loadModules, findFunction, internals, settings, getPromise, isNodeJs, isObject, isFunc, isStr,
-         _ensureJSROOT, prROOT,
+         _ensureJSROOT, getKindForType, getTypeForKind,
          clTObject, clTNamed, clTString, clTAttLine, clTAttFill, clTAttMarker, clTAttText,
          clTObjString, clTFile, clTList, clTHashList, clTMap, clTObjArray, clTClonesArray,
          clTPave, clTPaveText, clTPavesText, clTPaveStats, clTPaveLabel, clTPaveClass, clTDiamond, clTLegend, clTPaletteAxis,
@@ -196,7 +196,7 @@ function getDrawHandle(kind, selector) {
    if ((selector === null) && (kind in drawFuncs.cache))
       return drawFuncs.cache[kind];
 
-   const search = (kind.indexOf(prROOT) === 0) ? kind.slice(5) : `kind:${kind}`;
+   const search = getTypeForKind(kind) || `kind:${kind}`;
    let counter = 0;
    for (let i = 0; i < drawFuncs.lst.length; ++i) {
       const h = drawFuncs.lst[i];
@@ -206,7 +206,7 @@ function getDrawHandle(kind, selector) {
          continue;
 
       if (h.sameas) {
-         const hs = getDrawHandle(prROOT + h.sameas, selector);
+         const hs = getDrawHandle(getKindForType(h.sameas), selector);
          if (hs) {
             for (const key in hs) {
                if (h[key] === undefined)
@@ -298,7 +298,7 @@ function getDrawSettings(kind, selector) {
       res.opts = [''];
 
    // if no any handle found, let inspect ROOT-based objects
-   if (!isany && (kind.indexOf(prROOT) === 0) && !noinspect)
+   if (!isany && getTypeForKind(kind) && !noinspect)
       res.opts = [];
 
    if (!noinspect && res.opts)
@@ -327,7 +327,7 @@ function setDefaultDrawOpt(classname, opt) {
             setDefaultDrawOpt(arr[0], arr[1] || '');
       });
    } else {
-      const handle = getDrawHandle(prROOT + classname, 0);
+      const handle = getDrawHandle(getKindForType(classname), 0);
       if (handle)
          handle.dflt = opt;
    }
@@ -356,7 +356,7 @@ async function draw(dom, obj, opt) {
    let handle, type_info;
    if ('_typename' in obj) {
       type_info = 'type ' + obj._typename;
-      handle = getDrawHandle(prROOT + obj._typename, opt);
+      handle = getDrawHandle(getKindForType(obj._typename), opt);
    } else if ('_kind' in obj) {
       type_info = 'kind ' + obj._kind;
       handle = getDrawHandle(obj._kind, opt);
@@ -495,7 +495,7 @@ async function redraw(dom, obj, opt) {
    const can_painter = getElementCanvPainter(dom);
    let handle, res_painter = null, redraw_res;
    if (obj._typename)
-      handle = getDrawHandle(prROOT + obj._typename);
+      handle = getDrawHandle(getKindForType(obj._typename));
    if (handle?.draw_field && obj[handle.draw_field])
       obj = obj[handle.draw_field];
 
@@ -549,7 +549,7 @@ function addStreamerInfosForPainter(lst) {
       if (basics.indexOf(element.fName) >= 0)
          return null;
 
-      let handle = getDrawHandle(prROOT + element.fName);
+      let handle = getDrawHandle(getKindForType(element.fName));
       if (handle && !handle.for_derived)
             handle = null;
 
@@ -567,7 +567,8 @@ function addStreamerInfosForPainter(lst) {
    }
 
    lst.arr.forEach(si => {
-      if (getDrawHandle(prROOT + si.fName) !== null) return;
+      if (getDrawHandle(getKindForType(si.fName)) !== null)
+         return;
 
       const handle = checkBaseClasses(si, 0);
       if (handle) {
@@ -714,7 +715,7 @@ assignPadPainterDraw(TPadPainter);
 
 import_geo = async function() {
    return import('./geom/TGeoPainter.mjs').then(geo => {
-      const handle = getDrawHandle(prROOT + 'TGeoVolumeAssembly');
+      const handle = getDrawHandle(getKindForType('TGeoVolumeAssembly'));
       if (handle) handle.icon = 'img_geoassembly';
       return geo;
    });

modules/draw/TTree.mjs

@@ -1,5 +1,5 @@
 import { internals, httpRequest, isBatchMode, isFunc, isStr, create, toJSON, getPromise,
-         prROOT, clTObjString, clTGraph, clTPolyMarker3D, clTH1, clTH2, clTH3 } from '../core.mjs';
+         getKindForType, clTObjString, clTGraph, clTPolyMarker3D, clTH1, clTH2, clTH3 } from '../core.mjs';
 import { select as d3_select } from '../d3.mjs';
 import { kTString, kObject, kAnyP } from '../io.mjs';
 import { kClonesNode, kSTLNode, clTBranchFunc, treeDraw, treeIOTest, TDrawSelector } from '../tree.mjs';
@@ -354,7 +354,7 @@ function drawTreePlayer(hpainter, itemname, askey, asleaf) {
    if (item._childs && !asleaf) {
       for (let n = 0; n < item._childs.length; ++n) {
          const leaf = item._childs[n];
-         if (leaf && leaf._kind && (leaf._kind.indexOf(prROOT + 'TLeaf') === 0) && (leaf_cnt < 2)) {
+         if (isStr(leaf?._kind) && (leaf._kind.indexOf(getKindForType('TLeaf')) === 0) && (leaf_cnt < 2)) {
             if (leaf_cnt++ > 0) expr += ':';
             expr += leaf._name;
          }

modules/geom/TGeoPainter.mjs

@@ -1,6 +1,6 @@
 import { httpRequest, browser, source_dir, settings, internals, constants, create, clone,
          findFunction, isBatchMode, isNodeJs, getDocument, isObject, isFunc, isStr, postponePromise, getPromise,
-         prROOT, clTNamed, clTList, clTAxis, clTObjArray, clTPolyMarker3D, clTPolyLine3D,
+         getKindForType, clTNamed, clTList, clTAxis, clTObjArray, clTPolyMarker3D, clTPolyLine3D,
          clTGeoVolume, clTGeoNode, clTGeoNodeMatrix, nsREX, nsSVG, kInspect } from '../core.mjs';
 import { showProgress, injectStyle, ToolbarIcons } from '../gui/utils.mjs';
 import { GUI } from '../gui/lil-gui.mjs';
@@ -5459,9 +5459,9 @@ let add_settings = false;
 function getBrowserIcon(hitem, hpainter) {
    let icon = '';
    switch (hitem._kind) {
-      case prROOT + clTEveTrack: icon = 'img_evetrack'; break;
-      case prROOT + clTEvePointSet: icon = 'img_evepoints'; break;
-      case prROOT + clTPolyMarker3D: icon = 'img_evepoints'; break;
+      case getKindForType(clTEveTrack): icon = 'img_evetrack'; break;
+      case getKindForType(clTEvePointSet): icon = 'img_evepoints'; break;
+      case getKindForType(clTPolyMarker3D): icon = 'img_evepoints'; break;
    }
    if (icon) {
       const drawitem = findItemWithGeoPainter(hitem);
@@ -5686,7 +5686,7 @@ function createList(parent, lst, name, title) {
 
    const list_item = {
       _name: name,
-      _kind: prROOT + clTList,
+      _kind: getKindForType(clTList),
       _title: title,
       _more: true,
       _geoobj: lst,
@@ -5789,7 +5789,7 @@ function expandGeoObject(parent, obj) {
   * @private */
 createItem = function(node, obj, name) {
    const sub = {
-      _kind: prROOT + obj._typename,
+      _kind: getKindForType(obj._typename),
       _name: name || getObjectName(obj),
       _title: obj.fTitle,
       _parent: node,

modules/gui/HierarchyPainter.mjs

@@ -1,7 +1,8 @@
 import { version, gStyle, httpRequest, create, createHttpRequest, loadScript, loadModules, decodeUrl,
          source_dir, settings, internals, browser, findFunction, toJSON,
          isArrayProto, isRootCollection, isBatchMode, isNodeJs, isObject, isFunc, isStr, _ensureJSROOT,
-         prROOT, clTList, clTMap, clTObjString, clTKey, clTFile, clTText, clTLatex, clTColor, clTStyle, nsROOT, kInspect, isPromise } from '../core.mjs';
+         prROOT, clTList, clTMap, clTObjString, clTKey, clTFile, clTText, clTLatex, clTColor, clTStyle,
+         getKindForType, getTypeForKind, kInspect, isPromise } from '../core.mjs';
 import { select as d3_select } from '../d3.mjs';
 import { openFile, kBaseClass, clTStreamerInfoList, clTDirectory, clTDirectoryFile, nameStreamerInfo, addUserStreamer } from '../io.mjs';
 import { getRGBfromTColor } from '../base/colors.mjs';
@@ -84,29 +85,6 @@ ${img('tf2', 16, 'png', 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAABGdBTUE
 `, node, 'jsroot_hstyle');
 }
 
-
-/** @summary Return kind string for type
-  * @private */
-function getKindForType(typ) {
-   return (!isStr(typ) || (typ.indexOf(nsROOT) !== 0)) ? prROOT + typ : typ;
-}
-
-/** @summary Return type name from kind string
-  * @private */
-function getTypeForKind(kind) {
-   if (!isStr(kind))
-      return null;
-   if (kind.indexOf(prROOT) === 0)
-      return kind.slice(prROOT.length);
-   if (kind.indexOf(nsROOT) === 0)
-      return kind;
-   return null;
-}
-
-/** @summary Return true if object kind belongs to ROOT
-  * @private */
-function isROOTKind(kind) { return Boolean(getTypeForKind(kind)); }
-
 /** @summary Return size as string with suffix like MB or KB
   * @private */
 function getSizeStr(sz) {

modules/tree.mjs

@@ -1,5 +1,5 @@
 import { BIT, settings, isArrayProto, isRootCollection, isObject, isFunc, isStr, getMethods,
-         create, createHistogram, createTGraph, prROOT,
+         create, createHistogram, createTGraph, getKindForType,
          clTObject, clTObjString, clTHashList, clTPolyMarker3D, clTH1, clTH2, clTH3, kNoStats } from './core.mjs';
 import { kChar, kShort, kInt, kFloat,
          kCharStar, kDouble, kDouble32,
@@ -2879,7 +2879,7 @@ function treeHierarchy(tree_node, obj) {
 
       const subitem = {
          _name: ClearName(branch.fName),
-         _kind: prROOT + branch._typename,
+         _kind: getKindForType(branch._typename),
          _title: branch.fTitle,
          _obj: branch
       };
@@ -2905,7 +2905,7 @@ function treeHierarchy(tree_node, obj) {
                  bnode._childs.push({
                     _name: '@size',
                     _title: 'container size',
-                    _kind: prROOT + 'TLeafElement',
+                    _kind: getKindForType('TLeafElement'),
                     _icon: 'img_leaf',
                     _obj: bobj.fLeaves.arr[0],
                     _more: false
@@ -2926,7 +2926,7 @@ function treeHierarchy(tree_node, obj) {
                      bnode._childs.push({
                         _name: key+'()',
                         _title: `function ${key} of class ${object_class}`,
-                        _kind: prROOT + clTBranchFunc, // fictional class, only for drawing
+                        _kind: getKindForType(clTBranchFunc), // fictional class, only for drawing
                         _obj: { _typename: clTBranchFunc, branch: bobj, func: key },
                         _more: false
                      });
@@ -2946,7 +2946,7 @@ function treeHierarchy(tree_node, obj) {
             branch.fLeaves.arr[j].$branch = branch; // keep branch pointer for drawing
             const leafitem = {
                _name: ClearName(branch.fLeaves.arr[j].fName),
-               _kind: prROOT + branch.fLeaves.arr[j]._typename,
+               _kind: getKindForType(branch.fLeaves.arr[j]._typename),
                _obj: branch.fLeaves.arr[j]
             };
             subitem._childs.push(leafitem);