Skip to content

Commit e8802ab

Browse files
committed
Prepare for 7.0.1 release
1 parent be82aa1 commit e8802ab

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

build/jsroot.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// https://root.cern/js/ v7.0.0
1+
// https://root.cern/js/ v7.0.1
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -7,11 +7,11 @@ typeof define === 'function' && define.amd ? define(['exports'], factory) :
77

88
/** @summary version id
99
* @desc For the JSROOT release the string in format "major.minor.patch" like "6.3.0" */
10-
let version_id = "7.0.x";
10+
let version_id = "7.0.1";
1111

1212
/** @summary version date
1313
* @desc Release date in format day/month/year like "19/11/2021" */
14-
let version_date = "19/04/2022";
14+
let version_date = "21/04/2022";
1515

1616
/** @summary version id and date
1717
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -11255,7 +11255,7 @@ class ObjectPainter extends BasePainter {
1125511255
font_size = font.size, any_text = false, only_text = true;
1125611256

1125711257
if ((f > 0) && ((f < 0.9) || (f > 1)))
11258-
font.size = Math.floor(font.size / f);
11258+
font.size = Math.max(1, Math.floor(font.size / f));
1125911259

1126011260
if (max_sz && (font.size > max_sz))
1126111261
font.size = max_sz;
@@ -45121,8 +45121,9 @@ class TAxisPainter extends ObjectPainter {
4512145121
formatLabels(d) {
4512245122
let indx = parseFloat(d), a = this.getObject();
4512345123
if (!this.regular_labels)
45124-
indx = (indx - a.fXmin)/(a.fXmax - a.fXmin) * a.fNbins;
45125-
indx = Math.floor(indx);
45124+
indx = Math.round((indx - a.fXmin)/(a.fXmax - a.fXmin) * a.fNbins);
45125+
else
45126+
indx = Math.floor(indx);
4512645127
if ((indx < 0) || (indx >= a.fNbins)) return null;
4512745128
for (let i = 0; i < a.fLabels.arr.length; ++i) {
4512845129
let tstr = a.fLabels.arr[i];
@@ -45488,12 +45489,12 @@ class TAxisPainter extends ObjectPainter {
4548845489
textscale = Math.min(textscale, (max_text_width - labeloffset) / textwidth);
4548945490
}
4549045491

45491-
if ((textscale > 0.01) && (textscale < 0.7) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (label_g.length == 1))
45492+
if ((textscale > 0.0001) && (textscale < 0.7) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (label_g.length == 1))
4549245493
lbl_tilt = true;
4549345494

4549445495
let scale = textscale * (lbl_tilt ? 3 : 1);
4549545496

45496-
if ((scale > 0.01) && (scale < 1)) {
45497+
if ((scale > 0.0001) && (scale < 1)) {
4549745498
applied_scale = 1/scale;
4549845499
painter.scaleTextDrawing(applied_scale, label_g[0]);
4549945500
}
@@ -45698,7 +45699,7 @@ class TAxisPainter extends ObjectPainter {
4569845699
labelMaxWidth = arr[1];
4569945700

4570045701
if (settings.Zooming && !this.disable_zooming && !isBatchMode()) {
45701-
let labelSize = arr[0],
45702+
let labelSize = Math.max(arr[0], 5),
4570245703
r = axis_g.append("svg:rect")
4570345704
.attr("class", "axis_zoom")
4570445705
.style("opacity", "0")
@@ -96230,11 +96231,11 @@ class RAxisPainter extends RObjectPainter {
9623096231
textscale = Math.min(textscale, maxwidth / textwidth);
9623196232
}
9623296233

96233-
if ((textscale > 0.01) && (textscale < 0.8) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (side > 0))
96234+
if ((textscale > 0.0001) && (textscale < 0.8) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (side > 0))
9623496235
lbls_tilt = true;
9623596236

9623696237
let scale = textscale * (lbls_tilt ? 3 : 1);
96237-
if ((scale > 0.01) && (scale < 1))
96238+
if ((scale > 0.0001) && (scale < 1))
9623896239
painter.scaleTextDrawing(1/scale, label_g);
9623996240
}
9624096241

modules/core.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
/** @summary version id
33
* @desc For the JSROOT release the string in format "major.minor.patch" like "6.3.0" */
4-
let version_id = "7.0.x";
4+
let version_id = "7.0.1";
55

66
/** @summary version date
77
* @desc Release date in format day/month/year like "19/11/2021" */
8-
let version_date = "19/04/2022";
8+
let version_date = "21/04/2022";
99

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsroot",
3-
"version": "7.0.0",
3+
"version": "7.0.1",
44
"engines": {
55
"node": ">=0.14.8"
66
},

0 commit comments

Comments
 (0)