Skip to content

Commit 3507580

Browse files
committed
Build with new exception handling
1 parent cb0ea6c commit 3507580

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

build/jsroot.js

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const version_id = 'dev',
1111

1212
/** @summary version date
1313
* @desc Release date in format day/month/year like '14/04/2022' */
14-
version_date = '12/09/2024',
14+
version_date = '13/09/2024',
1515

1616
/** @summary version id and date
1717
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -76701,8 +76701,7 @@ async function makeSVG(args) {
7670176701
internals.addDrawFunc = addDrawFunc;
7670276702

7670376703
function assignPadPainterDraw(PadPainterClass) {
76704-
PadPainterClass.prototype.drawObject = (...args) =>
76705-
draw(...args).catch(err => { console.log(`Error ${err?.message ?? err} at ${err?.stack ?? 'uncknown place'}`); return null; });
76704+
PadPainterClass.prototype.drawObject = draw;
7670676705
PadPainterClass.prototype.getObjectDrawSettings = getDrawSettings;
7670776706
}
7670876707

@@ -78688,6 +78687,11 @@ class TCanvasPainter extends TPadPainter {
7868878687
if (ranges) ranges = ':' + ranges;
7868978688
handle.send(`READY6:${version}${ranges}`); // send ready message back when drawing completed
7869078689
this.confirmDraw();
78690+
}).catch(err => {
78691+
if (isFunc(this.showConsoleError))
78692+
this.showConsoleError(err);
78693+
else
78694+
console.log(err);
7869178695
});
7869278696
} else if (msg.slice(0, 5) === 'MENU:') {
7869378697
// this is menu with exact identifier for object
@@ -83330,7 +83334,7 @@ function buildHist2dContour(histo, handle, levels, palette, contour_func) {
8333083334
for (k = 0; k < 4; k++)
8333183335
ir[k] = LevelSearch(zc[k]);
8333283336

83333-
if ((ir[0] !== ir[1]) || (ir[1] !== ir[2]) || (ir[2] !== ir[3]) || (ir[3] !== ir[0])) { // deepscan-disable-line
83337+
if ((ir[0] !== ir[1]) || (ir[1] !== ir[2]) || (ir[2] !== ir[3]) || (ir[3] !== ir[0])) {
8333483338
x[3] = x[0] = (arrx[i] + arrx[i+1])/2;
8333583339
x[2] = x[1] = (arrx[i+1] + arrx[i+2])/2;
8333683340

@@ -83622,7 +83626,7 @@ class Triangles3DHandler {
8362283626

8362383627
// check if any(contours for given level exists
8362483628
if (((side1 > 0) || (side2 > 0) || (side3 > 0)) &&
83625-
((side1 !== side2) || (side2 !== side3) || (side3 !== side1))) // deepscan-disable-line
83629+
((side1 !== side2) || (side2 !== side3) || (side3 !== side1)))
8362683630
++ngridsegments;
8362783631

8362883632
continue;
@@ -94641,7 +94645,7 @@ class ClonedNodes {
9464194645
issimple = (clone.matrix[k] === ((k === 5) || (k === 10) || (k === 15) ? 1 : 0));
9464294646
if (issimple) delete clone.matrix;
9464394647
}
94644-
if (clone.matrix && (kind === kindEve)) // deepscan-disable-line INSUFFICIENT_NULL_CHECK
94648+
if (clone.matrix && (kind === kindEve))
9464594649
clone.abs_matrix = true;
9464694650
}
9464794651
if (shape) {
@@ -98820,7 +98824,7 @@ function expandGeoObject(parent, obj) {
9882098824
}
9882198825

9882298826
if (!subnodes && (shape?._typename === clTGeoCompositeShape) && shape?.fNode) {
98823-
if (!parent._childs) { // deepscan-disable-line
98827+
if (!parent._childs) {
9882498828
createItem(parent, shape.fNode.fLeft, 'Left');
9882598829
createItem(parent, shape.fNode.fRight, 'Right');
9882698830
}
@@ -107038,7 +107042,7 @@ class HierarchyPainter extends BasePainter {
107038107042
hitem = d.last;
107039107043
}
107040107044

107041-
if (hitem) { // deepscan-disable-line
107045+
if (hitem) {
107042107046
// check that item is visible (opened), otherwise should enable parent
107043107047

107044107048
let prnt = hitem._parent;
@@ -112834,7 +112838,7 @@ class TGraphDelaunay {
112834112838
continue; // goto L50;
112835112839
}
112836112840

112837-
if (skip_this_triangle) break; // deepscan-disable-line
112841+
if (skip_this_triangle) break;
112838112842

112839112843
/* Error("Interpolate", "Should not get to here"); */
112840112844
// may as well soldier on
@@ -112872,7 +112876,7 @@ class TGraphDelaunay {
112872112876
// vector (dx3,dy3) is expressible as a sum of the other two vectors
112873112877
// with positive coefficients -> i.e. it lies between the other two vectors
112874112878
if (l === 1) {
112875-
f = m; o1 = p; o2 = n; // deepscan-disable-line
112879+
f = m; o1 = p; o2 = n;
112876112880
} else if (l === 2) {
112877112881
f = p; o1 = n; o2 = m;
112878112882
} else {
@@ -112991,7 +112995,7 @@ class TGraphDelaunay {
112991112995
}
112992112996
}
112993112997
}
112994-
if (shouldbein) // deepscan-disable-line
112998+
if (shouldbein)
112995112999
console.error(`Interpolate Point outside hull when expected inside: this point could be dodgy ${xx} ${yy} ${ntris_tried}`);
112996113000
return thevalue;
112997113001
}
@@ -122250,7 +122254,12 @@ class RCanvasPainter extends RPadPainter {
122250122254
this.addPadInteractive();
122251122255
handle.send(`SNAPDONE:${snapid}`); // send ready message back when drawing completed
122252122256
this.confirmDraw();
122253-
});
122257+
}).catch(err => {
122258+
if (isFunc(this.showConsoleError))
122259+
this.showConsoleError(err);
122260+
else
122261+
console.log(err);
122262+
});
122254122263
} else if (msg.slice(0, 4) === 'JSON') {
122255122264
const obj = parse(msg.slice(4));
122256122265
// console.log('get JSON ', msg.length-4, obj._typename);

modules/core.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const version_id = 'dev',
44

55
/** @summary version date
66
* @desc Release date in format day/month/year like '14/04/2022' */
7-
version_date = '12/09/2024',
7+
version_date = '13/09/2024',
88

99
/** @summary version id and date
1010
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

0 commit comments

Comments
 (0)