Skip to content

Commit 6e4f450

Browse files
committed
build
1 parent bf9fe53 commit 6e4f450

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

build/jsroot.js

+18-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const version_id = '7.8.x',
1212

1313
/** @summary version date
1414
* @desc Release date in format day/month/year like '14/04/2022' */
15-
version_date = '20/11/2024',
15+
version_date = '22/01/2025',
1616

1717
/** @summary version id and date
1818
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -70558,7 +70558,7 @@ class TPadPainter extends ObjectPainter {
7055870558

7055970559
const mainid = this.selectDom().attr('id');
7056070560

70561-
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid)) {
70561+
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid) && !getHPainter()) {
7056270562
this.brlayout = new BrowserLayout(mainid, null, this);
7056370563
this.brlayout.create(mainid, true);
7056470564
this.setDom(this.brlayout.drawing_divid()); // need to create canvas
@@ -73888,7 +73888,7 @@ class THistDrawOptions {
7388873888
if (d.check('OPTSTAT', true)) this.optstat = d.partAsInt();
7388973889
if (d.check('OPTFIT', true)) this.optfit = d.partAsInt();
7389073890

73891-
if ((this.optstat || this.optstat) && histo?.TestBit(kNoStats))
73891+
if ((this.optstat || this.optfit) && histo?.TestBit(kNoStats))
7389273892
histo?.InvertBit(kNoStats);
7389373893

7389473894
if (d.check('NOSTAT')) this.NoStat = true;
@@ -142114,18 +142114,20 @@ async function makePDF(svg, args) {
142114142114

142115142115
let doc;
142116142116

142117+
const orientation = (svg.width < svg.height) ? 'portrait' : 'landscape';
142118+
142117142119
if (args?.as_doc)
142118142120
doc = args?.doc;
142119142121

142120142122
if (doc) {
142121142123
doc.addPage({
142122-
orientation: 'landscape',
142124+
orientation,
142123142125
unit: 'px',
142124142126
format: [svg.width + 10, svg.height + 10]
142125142127
});
142126142128
} else {
142127142129
doc = new jsPDF({
142128-
orientation: 'landscape',
142130+
orientation,
142129142131
unit: 'px',
142130142132
format: [svg.width + 10, svg.height + 10]
142131142133
});
@@ -142170,7 +142172,13 @@ async function makePDF(svg, args) {
142170142172
node.removeAttribute('dy');
142171142173
});
142172142174

142173-
restore_text.forEach(node => { node.innerHTML = node.$originalHTML; node.setAttribute('font-family', node.$originalFont); });
142175+
restore_text.forEach(node => {
142176+
node.innerHTML = node.$originalHTML;
142177+
if (node.$originalFont)
142178+
node.setAttribute('font-family', node.$originalFont);
142179+
else
142180+
node.removeAttribute('font-family');
142181+
});
142174142182

142175142183
const res = args?.as_buffer ? doc.output('arraybuffer') : doc.output('dataurlstring');
142176142184
if (nodejs) {
@@ -142252,6 +142260,7 @@ drawFuncs = { lst: [
142252142260
{ name: clTCutG, sameas: clTGraph },
142253142261
{ name: /^RooHist/, sameas: clTGraph },
142254142262
{ name: /^RooCurve/, sameas: clTGraph },
142263+
{ name: /^RooEllipse/, sameas: clTGraph },
142255142264
{ name: 'TScatter', icon: 'img_graph', class: () => Promise.resolve().then(function () { return TScatterPainter$1; }).then(h => h.TScatterPainter), opt: ';A' },
142256142265
{ name: 'RooPlot', icon: 'img_canvas', func: drawRooPlot },
142257142266
{ name: 'TRatioPlot', icon: 'img_mgraph', class: () => Promise.resolve().then(function () { return TRatioPlotPainter$1; }).then(h => h.TRatioPlotPainter), opt: '' },
@@ -155447,8 +155456,8 @@ class TGaxisPainter extends TAxisPainter {
155447155456
});
155448155457
}
155449155458

155450-
/** @summary Fill TGaxis context */
155451-
fillContextMenu(menu) {
155459+
/** @summary Fill TGaxis context menu items */
155460+
fillContextMenuItems(menu) {
155452155461
menu.addTAxisMenu(EAxisBits, this, this.getObject(), '');
155453155462
}
155454155463

@@ -159915,7 +159924,7 @@ class RPadPainter extends RObjectPainter {
159915159924

159916159925
const mainid = this.selectDom().attr('id');
159917159926

159918-
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid)) {
159927+
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid) && !getHPainter()) {
159919159928
this.brlayout = new BrowserLayout(mainid, null, this);
159920159929
this.brlayout.create(mainid, true);
159921159930
this.setDom(this.brlayout.drawing_divid()); // need to create canvas

modules/core.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const version_id = '7.8.x',
44

55
/** @summary version date
66
* @desc Release date in format day/month/year like '14/04/2022' */
7-
version_date = '25/11/2024',
7+
version_date = '22/01/2025',
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)