Skip to content

Commit 2f04ffe

Browse files
committed
7.5.3 version
1 parent e72940c commit 2f04ffe

File tree

4 files changed

+22
-16
lines changed

4 files changed

+22
-16
lines changed

build/jsroot.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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 '7.0.0' */
10-
const version_id = '7.5.x',
10+
const version_id = '7.5.3',
1111

1212
/** @summary version date
1313
* @desc Release date in format day/month/year like '14/04/2022' */
14-
version_date = '14/11/2023',
14+
version_date = '24/11/2023',
1515

1616
/** @summary version id and date
1717
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -1099,7 +1099,7 @@ function create$1(typename, target) {
10991099
create$1(clTBox, obj);
11001100
extend$1(obj, { fX1NDC: 0, fY1NDC: 0, fX2NDC: 1, fY2NDC: 1,
11011101
fBorderSize: 0, fInit: 1, fShadowColor: 1,
1102-
fCornerRadius: 0, fOption: 'brNDC', fName: 'title' });
1102+
fCornerRadius: 0, fOption: 'brNDC', fName: '' });
11031103
break;
11041104
case clTAttText:
11051105
extend$1(obj, { fTextAngle: 0, fTextSize: 0, fTextAlign: 22, fTextColor: 1, fTextFont: 42 });
@@ -1119,7 +1119,7 @@ function create$1(typename, target) {
11191119
case clTLegend:
11201120
create$1(clTPave, obj);
11211121
create$1(clTAttText, obj);
1122-
extend$1(obj, { fColumnSeparation: 0, fEntrySeparation: 0.1, fMargin: 0.25, fNColumns: 1, fPrimitives: create$1(clTList),
1122+
extend$1(obj, { fColumnSeparation: 0, fEntrySeparation: 0.1, fMargin: 0.25, fNColumns: 1, fPrimitives: create$1(clTList), fName: clTPave,
11231123
fBorderSize: gStyle.fLegendBorderSize, fTextFont: gStyle.fLegendFont, fTextSize: gStyle.fLegendTextSize, fFillColor: gStyle.fLegendFillColor });
11241124
break;
11251125
case clTPaletteAxis:
@@ -60823,7 +60823,7 @@ class TAxisPainter extends ObjectPainter {
6082360823
pp = this.getPadPainter(),
6082460824
pad_w = pp?.getPadWidth() || scalingSize || w/0.8, // use factor 0.8 as ratio between frame and pad size
6082560825
pad_h = pp?.getPadHeight() || scalingSize || h/0.8;
60826-
let tickSize = 0, tickScalingSize = 0, titleColor, offset;
60826+
let tickSize = 0, tickScalingSize = 0, titleColor, titleFontId, offset;
6082760827

6082860828
this.scalingSize = scalingSize || Math.max(Math.min(pad_w, pad_h), 10);
6082960829

@@ -60839,6 +60839,7 @@ class TAxisPainter extends ObjectPainter {
6083960839
tickScalingSize = scalingSize || (this.vertical ? 1.7*h : 0.6*w);
6084060840
tickSize = optionSize ? axis.fTickSize : 0.03;
6084160841
titleColor = this.getColor(axis.fTextColor);
60842+
titleFontId = axis.fTextFont;
6084260843
offset = axis.fLabelOffset;
6084360844
if ((this.vertical && axis.fY1 > axis.fY2 && !this.optionMinus) || (!this.vertical && axis.fX1 > axis.fX2))
6084460845
offset = -offset;
@@ -60853,6 +60854,7 @@ class TAxisPainter extends ObjectPainter {
6085360854
tickScalingSize = scalingSize || (this.vertical ? pad_w : pad_h);
6085460855
tickSize = axis.fTickLength;
6085560856
titleColor = this.getColor(axis.fTitleColor);
60857+
titleFontId = axis.fTitleFont;
6085660858
offset = axis.fLabelOffset;
6085760859
}
6085860860

@@ -60883,7 +60885,7 @@ class TAxisPainter extends ObjectPainter {
6088360885
this.fTitle = axis.fTitle;
6088460886
if (this.fTitle) {
6088560887
this.titleSize = (axis.fTitleSize >= 1) ? axis.fTitleSize : Math.round(axis.fTitleSize * this.scalingSize);
60886-
this.titleFont = new FontHandler(axis.fTitleFont, this.titleSize, scalingSize);
60888+
this.titleFont = new FontHandler(titleFontId, this.titleSize, scalingSize);
6088760889
this.titleFont.setColor(titleColor);
6088860890
this.offsetScaling = (axis.fTitleSize >= 1) ? 1 : (this.vertical ? pad_w : pad_h) / this.scalingSize;
6088960891
this.titleOffset = axis.fTitleOffset;
@@ -61022,7 +61024,7 @@ class TAxisPainter extends ObjectPainter {
6102261024
if ((this.name === 'zaxis') && this.is_gaxis && ('getBoundingClientRect' in axis_g.node())) {
6102361025
// special handling for color palette labels - draw them always on right side
6102461026
const rect = axis_g.node().getBoundingClientRect();
61025-
if (title_shift_x < rect.waddMoveHandleridth - this.ticksSize)
61027+
if (title_shift_x < rect.width - this.ticksSize)
6102661028
title_shift_x = Math.round(rect.width - this.ticksSize);
6102761029
}
6102861030

@@ -103169,7 +103171,8 @@ class HierarchyPainter extends BasePainter {
103169103171
if (!isFunc(_item._expand)) {
103170103172
let handle = getDrawHandle(_item._kind, '::expand');
103171103173

103172-
if (handle?.expand_item) {
103174+
// in inspector show all memebers
103175+
if (handle?.expand_item && !hpainter._inspector) {
103173103176
_obj = _obj[handle.expand_item];
103174103177
_item.expand_item = handle.expand_item; // remember that was exapnd item
103175103178
handle = _obj?._typename ? getDrawHandle(prROOT + _obj._typename, '::expand') : null;
@@ -107791,8 +107794,10 @@ class THStackPainter extends ObjectPainter {
107791107794
} else {
107792107795
for (let indx = 0; indx < nhists; ++indx) {
107793107796
const rindx = this.options.horder ? indx : nhists - indx - 1,
107794-
hist = hlst.arr[rindx],
107795-
hopt = hlst.opt[rindx];
107797+
hist = hlst.arr[rindx], hopt = hlst.opt[rindx], hist0 = this.painters[indx].getHisto();
107798+
if (this.options._pfc) hist.fFillColor = hist0.fFillColor;
107799+
if (this.options._plc) hist.fLineColor = hist0.fLineColor;
107800+
if (this.options._pmc) hist.fMarkerColor = hist0.fMarkerColor;
107796107801
this.painters[indx].updateObject(hist, hopt || hist.fOption || this.options.hopt);
107797107802
}
107798107803
}

changes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# JSROOT changelog
22

3-
## Changes in 7.5.x
3+
## Changes in 7.5.3
44
1. Fix - draw histograms with negative bins #276
55
2. Fix - correctly read TLeaf with fixed-size array
66
3. Fix - bug in options handling in startGUI
77
4. Fix - greyscale support in TLegend drawing
88
5. Fix - correctly use text font for TGaxis title
9-
6. Fix - correctly set pave name #278
9+
6. Fix - preserve auto colors in THStack #277
10+
7. Fix - correctly set pave name #278
1011

1112

1213
## Changes in 7.5.2

modules/core.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/** @summary version id
22
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
3-
const version_id = '7.5.x',
3+
const version_id = '7.5.3',
44

55
/** @summary version date
66
* @desc Release date in format day/month/year like '14/04/2022' */
7-
version_date = '21/11/2023',
7+
version_date = '24/11/2023',
88

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

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)