Skip to content

Commit 0230cfd

Browse files
committed
Changeslog and date
1 parent e10e5db commit 0230cfd

File tree

3 files changed

+47
-40
lines changed

3 files changed

+47
-40
lines changed

build/jsroot.js

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
1010

1111
/** @summary version id
1212
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
13-
const version_id = '7.10.1',
13+
const version_id = '7.10.x',
1414

1515
/** @summary version date
1616
* @desc Release date in format day/month/year like '14/04/2022' */
17-
version_date = '26/11/2025',
17+
version_date = '28/01/2026',
1818

1919
/** @summary version id and date
2020
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -105019,11 +105019,14 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
105019105019
return true;
105020105020

105021105021
let is_normal = false;
105022-
if (check_axis !== 'y')
105023-
is_normal ||= (histo.fXaxis.fXmin !== 0.0011) || (histo.fXaxis.fXmax !== 1.1);
105022+
if (check_axis !== 'y') {
105023+
is_normal ||= ((histo.fXaxis.fXmin !== 0.0011) && (histo.fXaxis.fXmin !== 0)) ||
105024+
((histo.fXaxis.fXmax !== 1.1) && (histo.fXaxis.fXmax !== 1));
105025+
}
105024105026

105025105027
if (check_axis !== 'x') {
105026-
is_normal ||= (histo.fYaxis.fXmin !== 0.0011) || (histo.fYaxis.fXmax !== 1.1) ||
105028+
is_normal ||= ((histo.fYaxis.fXmin !== 0.0011) && (histo.fYaxis.fXmin !== 0)) ||
105029+
((histo.fYaxis.fXmax !== 1.1) && (histo.fYaxis.fXmax !== 1)) ||
105027105030
(histo.fMinimum !== 0.0011) || (histo.fMaximum !== 1.1);
105028105031
}
105029105032

@@ -122099,7 +122102,7 @@ function readMapElement(buf) {
122099122102
/** @summary create member entry for streamer element
122100122103
* @desc used for reading of data
122101122104
* @private */
122102-
function createMemberStreamer(element, file) {
122105+
function createMemberStreamer(element, file, no_string) {
122103122106
const member = {
122104122107
name: element.fName, type: element.fType,
122105122108
fArrayLength: element.fArrayLength,
@@ -122165,6 +122168,7 @@ function createMemberStreamer(element, file) {
122165122168
case kOffsetL + kInt:
122166122169
case kOffsetL + kCounter:
122167122170
case kOffsetL + kDouble:
122171+
case kOffsetL + kChar:
122168122172
case kOffsetL + kUChar:
122169122173
case kOffsetL + kShort:
122170122174
case kOffsetL + kUShort:
@@ -122177,36 +122181,35 @@ function createMemberStreamer(element, file) {
122177122181
case kOffsetL + kFloat:
122178122182
if (element.fArrayDim < 2) {
122179122183
member.arrlength = element.fArrayLength;
122180-
member.func = function(buf, obj) {
122181-
obj[this.name] = buf.readFastArray(this.arrlength, this.type - kOffsetL);
122182-
};
122184+
if ((member.type !== kOffsetL + kChar) || no_string) {
122185+
member.func = function(buf, obj) {
122186+
obj[this.name] = buf.readFastArray(this.arrlength, this.type - kOffsetL);
122187+
};
122188+
} else {
122189+
member.func = function(buf, obj) {
122190+
obj[this.name] = buf.readFastString(this.arrlength);
122191+
};
122192+
}
122183122193
} else {
122184-
member.arrlength = element.fMaxIndex[element.fArrayDim - 1];
122185122194
member.minus1 = true;
122186-
member.func = function(buf, obj) {
122187-
obj[this.name] = buf.readNdimArray(this, (buf2, handle) =>
122188-
buf2.readFastArray(handle.arrlength, handle.type - kOffsetL));
122189-
};
122190-
}
122191-
break;
122192-
case kOffsetL + kChar:
122193-
if (element.fArrayDim < 2) {
122194-
member.arrlength = element.fArrayLength;
122195-
member.func = function(buf, obj) {
122196-
obj[this.name] = buf.readFastString(this.arrlength);
122197-
};
122198-
} else {
122199-
member.minus1 = true; // one dimension used for char*
122200122195
member.arrlength = element.fMaxIndex[element.fArrayDim - 1];
122201-
member.func = function(buf, obj) {
122202-
obj[this.name] = buf.readNdimArray(this, (buf2, handle) =>
122203-
buf2.readFastString(handle.arrlength));
122204-
};
122196+
if ((member.type !== kOffsetL + kChar) || no_string) {
122197+
member.func = function(buf, obj) {
122198+
obj[this.name] = buf.readNdimArray(this, (buf2, handle) =>
122199+
buf2.readFastArray(handle.arrlength, handle.type - kOffsetL));
122200+
};
122201+
} else {
122202+
member.func = function(buf, obj) {
122203+
obj[this.name] = buf.readNdimArray(this, (buf2, handle) =>
122204+
buf2.readFastString(handle.arrlength));
122205+
};
122206+
}
122205122207
}
122206122208
break;
122207122209
case kOffsetP + kBool:
122208122210
case kOffsetP + kInt:
122209122211
case kOffsetP + kDouble:
122212+
case kOffsetP + kChar:
122210122213
case kOffsetP + kUChar:
122211122214
case kOffsetP + kShort:
122212122215
case kOffsetP + kUShort:
@@ -122218,15 +122221,15 @@ function createMemberStreamer(element, file) {
122218122221
case kOffsetP + kLong64:
122219122222
case kOffsetP + kFloat:
122220122223
member.cntname = element.fCountName;
122221-
member.func = function(buf, obj) {
122222-
obj[this.name] = (buf.ntou1() === 1) ? buf.readFastArray(obj[this.cntname], this.type - kOffsetP) : [];
122223-
};
122224-
break;
122225-
case kOffsetP + kChar:
122226-
member.cntname = element.fCountName;
122227-
member.func = function(buf, obj) {
122228-
obj[this.name] = (buf.ntou1() === 1) ? buf.readFastString(obj[this.cntname]) : null;
122229-
};
122224+
if ((member.type !== kOffsetP + kChar) || no_string) {
122225+
member.func = function(buf, obj) {
122226+
obj[this.name] = (buf.ntou1() === 1) ? buf.readFastArray(obj[this.cntname], this.type - kOffsetP) : [];
122227+
};
122228+
} else {
122229+
member.func = function(buf, obj) {
122230+
obj[this.name] = (buf.ntou1() === 1) ? buf.readFastString(obj[this.cntname]) : null;
122231+
};
122232+
}
122230122233
break;
122231122234
case kDouble32:
122232122235
case kOffsetL + kDouble32:
@@ -127760,7 +127763,7 @@ async function treeProcess(tree, selector, args) {
127760127763
elem.fArrayDim = 1;
127761127764
elem.fMaxIndex[0] = 10; // 10 if artificial number, will be replaced during reading
127762127765

127763-
item.arrmember = createMemberStreamer(elem, handle.file);
127766+
item.arrmember = createMemberStreamer(elem, handle.file, true);
127764127767
}
127765127768
}
127766127769
} else

changes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# JSROOT changelog
22

3+
## Changes in 7.10.x
4+
1. Fix - correctly process `TLeafB` arrays in tree draw #384
5+
6+
37
## Changes in 7.10.1
48
1. Fix - proper paint axis labels on both sides when pad.fTickx/y = 2
59
2. Fix - recover io after bad http response

modules/core.mjs

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

33
/** @summary version id
44
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
5-
const version_id = '7.10.1',
5+
const version_id = '7.10.x',
66

77
/** @summary version date
88
* @desc Release date in format day/month/year like '14/04/2022' */
9-
version_date = '26/11/2025',
9+
version_date = '28/01/2026',
1010

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

0 commit comments

Comments
 (0)