Skip to content

Commit

Permalink
Prepare for 7.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
linev committed Apr 21, 2022
1 parent be82aa1 commit e8802ab
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
23 changes: 12 additions & 11 deletions build/jsroot.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://root.cern/js/ v7.0.0
// https://root.cern/js/ v7.0.1
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
Expand All @@ -7,11 +7,11 @@ typeof define === 'function' && define.amd ? define(['exports'], factory) :

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

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

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

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

if (max_sz && (font.size > max_sz))
font.size = max_sz;
Expand Down Expand Up @@ -45121,8 +45121,9 @@ class TAxisPainter extends ObjectPainter {
formatLabels(d) {
let indx = parseFloat(d), a = this.getObject();
if (!this.regular_labels)
indx = (indx - a.fXmin)/(a.fXmax - a.fXmin) * a.fNbins;
indx = Math.floor(indx);
indx = Math.round((indx - a.fXmin)/(a.fXmax - a.fXmin) * a.fNbins);
else
indx = Math.floor(indx);
if ((indx < 0) || (indx >= a.fNbins)) return null;
for (let i = 0; i < a.fLabels.arr.length; ++i) {
let tstr = a.fLabels.arr[i];
Expand Down Expand Up @@ -45488,12 +45489,12 @@ class TAxisPainter extends ObjectPainter {
textscale = Math.min(textscale, (max_text_width - labeloffset) / textwidth);
}

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

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

if ((scale > 0.01) && (scale < 1)) {
if ((scale > 0.0001) && (scale < 1)) {
applied_scale = 1/scale;
painter.scaleTextDrawing(applied_scale, label_g[0]);
}
Expand Down Expand Up @@ -45698,7 +45699,7 @@ class TAxisPainter extends ObjectPainter {
labelMaxWidth = arr[1];

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

if ((textscale > 0.01) && (textscale < 0.8) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (side > 0))
if ((textscale > 0.0001) && (textscale < 0.8) && !painter.vertical && !rotate_lbls && (maxtextlen > 5) && (side > 0))
lbls_tilt = true;

let scale = textscale * (lbls_tilt ? 3 : 1);
if ((scale > 0.01) && (scale < 1))
if ((scale > 0.0001) && (scale < 1))
painter.scaleTextDrawing(1/scale, label_g);
}

Expand Down
4 changes: 2 additions & 2 deletions modules/core.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

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

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

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsroot",
"version": "7.0.0",
"version": "7.0.1",
"engines": {
"node": ">=0.14.8"
},
Expand Down

0 comments on commit e8802ab

Please sign in to comment.