Skip to content

Commit f43e86e

Browse files
linevlinev
committed
Build with new title positioning
1 parent 14ac142 commit f43e86e

File tree

4 files changed

+96
-46
lines changed

4 files changed

+96
-46
lines changed

‎build/jsroot.js

+87-37
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const version_id = 'dev',
1212

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

1717
/** @summary version id and date
1818
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -60695,8 +60695,8 @@ async function saveFile(filename, content) {
6069560695

6069660696
if ((content.length > 1e6) && (contentType === 'application/pdf')) {
6069760697
// large PDF files do not work in the browser with plain base64 coding
60698-
const bindata = getBinFileContent(content);
60699-
const blob = new Blob([bindata], { type: contentType });
60698+
const bindata = getBinFileContent(content),
60699+
blob = new Blob([bindata], { type: contentType });
6070060700
fileURL = URL.createObjectURL(blob);
6070160701
a.href = fileURL;
6070260702
} else
@@ -72782,6 +72782,7 @@ class TPavePainter extends ObjectPainter {
7278272782
arr = pt.fLines?.arr || [],
7278372783
nlines = arr.length,
7278472784
pp = this.getPadPainter(),
72785+
pad_width = pp.getPadWidth(),
7278572786
pad_height = pp.getPadHeight(),
7278672787
draw_header = (pt.fLabel.length > 0),
7278772788
promises = [],
@@ -72808,7 +72809,7 @@ class TPavePainter extends ObjectPainter {
7280872809
num_custom++;
7280972810
});
7281072811

72811-
const pr = (num_txt > num_custom) ? this.startTextDrawingAsync(this.textatt.font, 0.85*height/nlines, text_g, max_font_size) : Promise.resolve();
72812+
const pr = (num_txt > num_custom) ? this.startTextDrawingAsync(this.textatt.font, this.$postitle ? this.textatt.getSize(pad_width, pad_height, 1, 0.05) : 0.85*height/nlines, text_g, max_font_size) : Promise.resolve();
7281272813

7281372814
return pr.then(() => {
7281472815
for (let nline = 0; nline < nlines; ++nline) {
@@ -72821,12 +72822,13 @@ class TPavePainter extends ObjectPainter {
7282172822

7282272823
let color = entry.fTextColor ? this.getColor(entry.fTextColor) : '';
7282372824
if (!color) color = this.textatt.color;
72825+
const align = entry.fTextAlign || this.textatt.align,
72826+
valign = align % 10,
72827+
halign = (align - valign) / 10;
72828+
7282472829
if (entry.fX || entry.fY || entry.fTextSize) {
7282572830
// individual positioning
72826-
const align = entry.fTextAlign || this.textatt.align,
72827-
halign = Math.floor(align/10),
72828-
valign = align % 10,
72829-
x = entry.fX ? entry.fX*width : (halign === 1 ? margin_x : (halign === 2 ? width / 2 : width - margin_x)),
72831+
const x = entry.fX ? entry.fX*width : (halign === 1 ? margin_x : (halign === 2 ? width / 2 : width - margin_x)),
7283072832
y = entry.fY ? (1 - entry.fY)*height : (texty + (valign === 2 ? stepy / 2 : (valign === 3 ? stepy : 0))),
7283172833
draw_g = text_g.append('svg:g');
7283272834

@@ -72835,10 +72837,29 @@ class TPavePainter extends ObjectPainter {
7283572837
latex: (entry._typename === clTText) ? 0 : 1, draw_g, fast }))
7283672838
.then(() => this.finishTextDrawing(draw_g)));
7283772839
} else {
72838-
this.drawText({ x: margin_x, y: texty, width: width - 2*margin_x, height: stepy,
72839-
align: entry.fTextAlign || this.textatt.align,
72840-
draw_g: text_g, latex: (entry._typename === clTText) ? 0 : 1,
72841-
text: entry.fTitle, color, fast });
72840+
const arg = { x: 0, y: texty, draw_g: text_g,
72841+
latex: (entry._typename === clTText) ? 0 : 1,
72842+
text: entry.fTitle, color, fast };
72843+
72844+
if (this.$postitle) {
72845+
// remember box produced by title text
72846+
arg.post_process = function(painter) {
72847+
painter.$titlebox = this.box;
72848+
};
72849+
} else {
72850+
arg.align = align;
72851+
arg.x = (halign === 1) ? margin_x : 0;
72852+
arg.width = (halign === 2) ? width : width - margin_x;
72853+
arg.y = texty + 0.05 * stepy;
72854+
arg.height = 0.9*stepy;
72855+
// prevent expand of normal title on full width
72856+
// if (this.isTitle() && (halign === 2) && (arg.width > 0.1*pad_width) && (arg.width < 0.7*pad_width)) {
72857+
// arg.width -= 0.02*pad_width;
72858+
// arg.x = 0.01*pad_width;
72859+
// }
72860+
}
72861+
72862+
this.drawText(arg);
7284272863
}
7284372864
break;
7284472865
}
@@ -73696,6 +73717,40 @@ class TPavePainter extends ObjectPainter {
7369673717
super.cleanup();
7369773718
}
7369873719

73720+
/** @summary Set position of title
73721+
* @private */
73722+
setTitlePosition(pave, text_width, text_height) {
73723+
const posx = gStyle.fTitleX, posy = gStyle.fTitleY,
73724+
valign = gStyle.fTitleAlign % 10, halign = (gStyle.fTitleAlign - valign) / 10;
73725+
let w = gStyle.fTitleW, h = gStyle.fTitleH, need_readjust = false;
73726+
73727+
if (h <= 0) {
73728+
if (text_height)
73729+
h = 1.1 * text_height / this.getPadPainter().getPadHeight();
73730+
else {
73731+
h = 0.05;
73732+
need_readjust = true;
73733+
}
73734+
}
73735+
73736+
if (w <= 0) {
73737+
if (text_width)
73738+
w = Math.min(0.7, 0.02 + text_width / this.getPadPainter().getPadWidth());
73739+
else {
73740+
w = 0.5;
73741+
need_readjust = true;
73742+
}
73743+
}
73744+
73745+
pave.fX1NDC = halign < 2 ? posx : (halign > 2 ? posx - w : posx - w/2);
73746+
pave.fY1NDC = valign < 2 ? posy : (valign > 2 ? posy - h : posy - h/2);
73747+
pave.fX2NDC = pave.fX1NDC + w;
73748+
pave.fY2NDC = pave.fY1NDC + h;
73749+
pave.fInit = 1;
73750+
73751+
return need_readjust;
73752+
}
73753+
7369973754
/** @summary Returns true if object is supported */
7370073755
static canDraw(obj) {
7370173756
const typ = obj?._typename;
@@ -73708,30 +73763,14 @@ class TPavePainter extends ObjectPainter {
7370873763
const painter = new TPavePainter(dom, pave);
7370973764

7371073765
return ensureTCanvas(painter, false).then(() => {
73711-
if ((pave.fName === kTitle) && (pave._typename === clTPaveText)) {
73712-
const tpainter = painter.getPadPainter().findPainterFor(null, kTitle, clTPaveText);
73713-
if (tpainter && (tpainter !== painter)) {
73714-
tpainter.removeFromPadPrimitives();
73715-
tpainter.cleanup();
73766+
if (painter.isTitle()) {
73767+
const prev_painter = painter.getPadPainter().findPainterFor(null, kTitle, clTPaveText);
73768+
if (prev_painter && (prev_painter !== painter)) {
73769+
prev_painter.removeFromPadPrimitives();
73770+
prev_painter.cleanup();
7371673771
} else if ((opt === 'postitle') || painter.isDummyPos(pave)) {
73717-
const st = gStyle, fp = painter.getFramePainter();
73718-
if (st && fp) {
73719-
const midx = st.fTitleX, y2 = st.fTitleY,
73720-
valign = st.fTitleAlign % 10, halign = (st.fTitleAlign - valign) / 10,
73721-
title = pave.fLines?.arr[0]?.fTitle;
73722-
let w = st.fTitleW, h = st.fTitleH, fsz = st.fTitleFontSize;
73723-
if (fsz > 1) fsz = fsz / fp.getFrameWidth();
73724-
if (!h) h = Math.max((y2 - fp.fY2NDC) * 0.7, 1.1 * fsz);
73725-
if (!w) w = (halign !== 2 && title) ? title.length * fsz * 0.2 : fp.fX2NDC - fp.fX1NDC;
73726-
if (!Number.isFinite(h) || (h <= 0)) h = 0.06;
73727-
if (!Number.isFinite(w) || (w <= 0)) w = 0.44;
73728-
73729-
pave.fX1NDC = halign < 2 ? midx : (halign > 2 ? midx - w : midx - w/2);
73730-
pave.fY1NDC = valign === 3 ? y2 - h : (valign === 2 ? y2 - h / 2 : y2);
73731-
pave.fX2NDC = pave.fX1NDC + w;
73732-
pave.fY2NDC = pave.fY1NDC + h;
73733-
pave.fInit = 1;
73734-
}
73772+
if (painter.setTitlePosition(pave))
73773+
painter.$postitle = true;
7373573774
}
7373673775
} else if (pave._typename === clTPaletteAxis) {
7373773776
pave.fBorderSize = 1;
@@ -73773,7 +73812,17 @@ class TPavePainter extends ObjectPainter {
7377373812
break;
7377473813
}
7377573814

73776-
return painter.drawPave(opt);
73815+
return painter.drawPave(opt).then(() => {
73816+
const adjust_title = painter.$postitle && painter.$titlebox;
73817+
73818+
if (adjust_title)
73819+
painter.setTitlePosition(pave, painter.$titlebox.width, painter.$titlebox.height);
73820+
73821+
delete painter.$postitle;
73822+
delete painter.$titlebox;
73823+
73824+
return adjust_title ? painter.drawPave(opt) : painter;
73825+
});
7377773826
});
7377873827
}
7377973828

@@ -75185,7 +75234,8 @@ class THistPainter extends ObjectPainter {
7518575234

7518675235
pt = create$1(clTPaveText);
7518775236
Object.assign(pt, { fName: kTitle, fFillColor: st.fTitleColor, fFillStyle: st.fTitleStyle, fBorderSize: st.fTitleBorderSize,
75188-
fTextFont: st.fTitleFont, fTextSize: st.fTitleFontSize, fTextColor: st.fTitleTextColor, fTextAlign: st.fTitleAlign });
75237+
fTextFont: st.fTitleFont, fTextSize: st.fTitleFontSize, fTextColor: st.fTitleTextColor, fTextAlign: 22 });
75238+
7518975239
if (draw_title) pt.AddText(histo.fTitle);
7519075240
return TPavePainter.draw(pp, pt, 'postitle').then(p => p?.setSecondaryId(this, kTitle));
7519175241
}

‎modules/core.mjs

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

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

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

‎modules/gui/utils.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ async function saveFile(filename, content) {
553553

554554
if ((content.length > 1e6) && (contentType === 'application/pdf')) {
555555
// large PDF files do not work in the browser with plain base64 coding
556-
const bindata = getBinFileContent(content);
557-
const blob = new Blob([bindata], { type: contentType });
556+
const bindata = getBinFileContent(content),
557+
blob = new Blob([bindata], { type: contentType });
558558
fileURL = URL.createObjectURL(blob);
559559
a.href = fileURL;
560560
} else

‎modules/hist/TPavePainter.mjs

+6-6
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class TPavePainter extends ObjectPainter {
547547
// remember box produced by title text
548548
arg.post_process = function(painter) {
549549
painter.$titlebox = this.box;
550-
}
550+
};
551551
} else {
552552
arg.align = align;
553553
arg.x = (halign === 1) ? margin_x : 0;
@@ -1427,18 +1427,18 @@ class TPavePainter extends ObjectPainter {
14271427
let w = gStyle.fTitleW, h = gStyle.fTitleH, need_readjust = false;
14281428

14291429
if (h <= 0) {
1430-
if (text_height) {
1430+
if (text_height)
14311431
h = 1.1 * text_height / this.getPadPainter().getPadHeight();
1432-
} else {
1432+
else {
14331433
h = 0.05;
14341434
need_readjust = true;
14351435
}
14361436
}
14371437

14381438
if (w <= 0) {
1439-
if (text_width) {
1440-
w = Math.min(0.7, 0.02 + text_width / this.getPadPainter().getPadWidth())
1441-
} else {
1439+
if (text_width)
1440+
w = Math.min(0.7, 0.02 + text_width / this.getPadPainter().getPadWidth());
1441+
else {
14421442
w = 0.5;
14431443
need_readjust = true;
14441444
}

0 commit comments

Comments
 (0)