@@ -79525,6 +79525,8 @@ class JSRootMenu {
7952579525 /** @summary Fill menu to edit settings properties
7952679526 * @private */
7952779527 addSettingsMenu(with_hierarchy, alone, handle_func) {
79528+ if (!isFunc(handle_func))
79529+ handle_func = () => {};
7952879530 if (alone)
7952979531 this.header('Settings');
7953079532 else
@@ -79535,12 +79537,12 @@ class JSRootMenu {
7953579537 if (with_hierarchy) {
7953679538 this.addchk(settings.OnlyLastCycle, 'Last cycle', flag => {
7953779539 settings.OnlyLastCycle = flag;
79538- if (handle_func) handle_func('refresh');
79540+ handle_func('refresh');
7953979541 });
7954079542
7954179543 this.addchk(!settings.SkipStreamerInfos, 'Streamer infos', flag => {
7954279544 settings.SkipStreamerInfos = !flag;
79543- if (handle_func) handle_func('refresh');
79545+ handle_func('refresh');
7954479546 });
7954579547 }
7954679548
@@ -79617,18 +79619,18 @@ class JSRootMenu {
7961779619 this.sub('Browser');
7961879620 this.add('Hierarchy limit: ' + settings.HierarchyLimit, () => this.input('Max number of items in hierarchy', settings.HierarchyLimit, 'int', 10, 100000).then(val => {
7961979621 settings.HierarchyLimit = val;
79620- if (handle_func) handle_func('refresh');
79622+ handle_func('refresh');
7962179623 }));
7962279624 this.add('Browser width: ' + settings.BrowserWidth, () => this.input('Browser width in px', settings.BrowserWidth, 'int', 50, 2000).then(val => {
7962379625 settings.BrowserWidth = val;
79624- if (handle_func) handle_func('width');
79626+ handle_func('width');
7962579627 }));
7962679628 this.endsub();
7962779629 }
7962879630
7962979631 this.add('Dark mode: ' + (settings.DarkMode ? 'On' : 'Off'), () => {
7963079632 settings.DarkMode = !settings.DarkMode;
79631- if (handle_func) handle_func('dark');
79633+ handle_func('dark');
7963279634 });
7963379635
7963479636 const setStyleField = arg => { gStyle[arg.slice(1)] = parseInt(arg[0]); },
@@ -80100,7 +80102,8 @@ class StandaloneMenu extends JSRootMenu {
8010080102
8010180103 const hovArea = doc.createElement('div');
8010280104 hovArea.style = 'width: 100%; height: 100%; display: flex; justify-content: space-between; cursor: pointer;';
80103- if (d.title) hovArea.setAttribute('title', d.title);
80105+ if (d.title)
80106+ hovArea.setAttribute('title', d.title);
8010480107
8010580108 item.appendChild(hovArea);
8010680109 if (!d.text)
@@ -84860,7 +84863,8 @@ class TFramePainter extends FrameInteractive {
8486084863 });
8486184864 menu.addchk(handle?.noexp ?? faxis.TestBit(EAxisBits.kNoExponent), 'No exponent', flag => {
8486284865 faxis.SetBit(EAxisBits.kNoExponent, flag);
84863- if (handle) handle.noexp_changed = true;
84866+ if (handle)
84867+ handle.noexp_changed = true;
8486484868 this[`${kind}_noexp_changed`] = true;
8486584869 if (hist_painter?.getSnapId() && (kind.length === 1))
8486684870 hist_painter.interactiveRedraw('pad', `exec:SetNoExponent(${flag})`, kind);
@@ -99462,21 +99466,16 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
9946299466 is_pol = true;
9946399467 } else {
9946499468 // search bins position
99465- if (fp.reverse_x()) {
99466- for (i = h.i1; i < h.i2; ++i)
99467- if ((pnt.x <= h.grx[i]) && (pnt.x >= h.grx[i + 1])) break;
99468- } else {
99469- for (i = h.i1; i < h.i2; ++i)
99470- if ((pnt.x >= h.grx[i]) && (pnt.x <= h.grx[i + 1])) break;
99471- }
99469+ if (fp.reverse_x())
99470+ for (i = h.i1; (i < h.i2) && ((pnt.x > h.grx[i]) || (pnt.x < h.grx[i + 1])); ++i);
99471+ else
99472+ for (i = h.i1; (i < h.i2) && ((pnt.x < h.grx[i]) || (pnt.x > h.grx[i + 1])); ++i);
9947299473
99473- if (fp.reverse_y()) {
99474- for (j = h.j1; j < h.j2; ++j)
99475- if ((pnt.y <= h.gry[j + 1]) && (pnt.y >= h.gry[j])) break;
99476- } else {
99477- for (j = h.j1; j < h.j2; ++j)
99478- if ((pnt.y >= h.gry[j + 1]) && (pnt.y <= h.gry[j])) break;
99479- }
99474+
99475+ if (fp.reverse_y())
99476+ for (j = h.j1; (j < h.j2) && ((pnt.y > h.gry[j + 1]) || (pnt.y < h.gry[j])); ++j);
99477+ else
99478+ for (j = h.j1; (j < h.j2) && ((pnt.y < h.gry[j + 1]) || (pnt.y > h.gry[j])); ++j);
9948099479 }
9948199480
9948299481 if ((i < h.i2) && (j < h.j2)) {
@@ -101992,7 +101991,8 @@ function drawBinsSurf3D(painter, is_v7 = false) {
101992101991 color = indx > 1 ? painter.getColor(indx) : 'white';
101993101992 }
101994101993
101995- if (!color) color = 'white';
101994+ if (!color)
101995+ color = 'white';
101996101996 if (painter.options.Surf === 14)
101997101997 material = new THREE.MeshLambertMaterial(getMaterialArgs(color, { side: THREE.DoubleSide, vertexColors: false }));
101998101998 else
@@ -105159,7 +105159,10 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
105159105159
105160105160 let d = new DrawOptions(opt), hopt = '';
105161105161
105162- PadDrawOptions.forEach(name => { if (d.check(name)) hopt += ';' + name; });
105162+ PadDrawOptions.forEach(name => {
105163+ if (d.check(name))
105164+ hopt += ';' + name;
105165+ });
105163105166 if (d.check('XAXIS_', true))
105164105167 hopt += ';XAXIS_' + d.part;
105165105168 if (d.check('YAXIS_', true))
@@ -105894,7 +105897,8 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
105894105897 gry = funcs.gry(pnt.y);
105895105898 if ((gry > -this.#marker_size) && (gry < h + this.#marker_size)) {
105896105899 path += this.markeratt.create(grx, gry);
105897- if (want_tooltip) hints_marker += `M${grx - hsz},${gry - hsz}h${2 * hsz}v${2 * hsz}h${ -2 * hsz}z`;
105900+ if (want_tooltip)
105901+ hints_marker += `M${grx - hsz},${gry - hsz}h${2 * hsz}v${2 * hsz}h${ -2 * hsz}z`;
105898105902 }
105899105903 }
105900105904 }
@@ -163791,7 +163795,8 @@ assignPadPainterDraw(TPadPainter);
163791163795import_geo = async function() {
163792163796 return Promise.resolve().then(function () { return TGeoPainter$1; }).then(geo => {
163793163797 const handle = getDrawHandle(getKindForType('TGeoVolumeAssembly'));
163794- if (handle) handle.icon = 'img_geoassembly';
163798+ if (handle)
163799+ handle.icon = 'img_geoassembly';
163795163800 return geo;
163796163801 });
163797163802};
@@ -166833,7 +166838,8 @@ class HierarchyPainter extends BasePainter {
166833166838 h1._isopen = true;
166834166839 if (!this.h) {
166835166840 this.h = h1;
166836- if (this.#topname) h1._name = this.#topname;
166841+ if (this.#topname)
166842+ h1._name = this.#topname;
166837166843 } else if (this.h._kind === kTopFolder)
166838166844 this.h._childs.push(h1);
166839166845 else {
@@ -168436,7 +168442,8 @@ async function buildGUI(gui_element, gui_kind = '') {
168436168442 }
168437168443
168438168444 const hpainter = new HierarchyPainter('root', null);
168439- if (online) hpainter.is_online = drawing ? 'draw' : 'online';
168445+ if (online)
168446+ hpainter.is_online = drawing ? 'draw' : 'online';
168440168447 if (drawing || isBatchMode())
168441168448 hpainter.exclude_browser = true;
168442168449 hpainter.start_without_browser = nobrowser;
0 commit comments