Skip to content

Commit 5bc02fe

Browse files
linevlinev
committedNov 22, 2024·
Build with TPaveText border drawing
1 parent f23d642 commit 5bc02fe

File tree

2 files changed

+76
-79
lines changed

2 files changed

+76
-79
lines changed
 

‎build/jsroot.js

+75-78
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 = '21/11/2024',
15+
version_date = '22/11/2024',
1616

1717
/** @summary version id and date
1818
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -63129,11 +63129,11 @@ class TAxisPainter extends ObjectPainter {
6312963129
const gr_range = Math.abs(this.func.range()[1] - this.func.range()[0]);
6313063130

6313163131
// avoid black filling by middle-size
63132-
if ((handle.middle.length <= handle.major.length) || (handle.middle.length > gr_range/3.5))
63132+
if ((handle.middle.length <= handle.major.length) || (handle.middle.length > gr_range))
6313363133
handle.minor = handle.middle = handle.major;
6313463134
else if ((this.nticks3 > 1) && !this.log) {
6313563135
handle.minor = this.produceTicks(handle.middle.length, this.nticks3);
63136-
if ((handle.minor.length <= handle.middle.length) || (handle.minor.length > gr_range/1.7))
63136+
if ((handle.minor.length <= handle.middle.length) || (handle.minor.length > gr_range))
6313763137
handle.minor = handle.middle;
6313863138
}
6313963139
}
@@ -70619,7 +70619,7 @@ class TPadPainter extends ObjectPainter {
7061970619

7062070620
const mainid = this.selectDom().attr('id');
7062170621

70622-
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid)) {
70622+
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid) && !getHPainter()) {
7062370623
this.brlayout = new BrowserLayout(mainid, null, this);
7062470624
this.brlayout.create(mainid, true);
7062570625
this.setDom(this.brlayout.drawing_divid()); // need to create canvas
@@ -72588,13 +72588,8 @@ class TPavePainter extends ObjectPainter {
7258872588
const h2 = Math.round(height/2), w2 = Math.round(width/2),
7258972589
dpath = `l${w2},${-h2}l${w2},${h2}l${-w2},${h2}z`;
7259072590

72591-
if ((brd > 1) && (pt.fShadowColor > 0) && (dx || dy) && !this.fillatt.empty() && !noborder) {
72592-
this.draw_g.append('svg:path')
72593-
.attr('d', 'M0,'+(h2+brd) + dpath)
72594-
.style('fill', this.getColor(pt.fShadowColor))
72595-
.style('stroke', this.getColor(pt.fShadowColor))
72596-
.style('stroke-width', '1px');
72597-
}
72591+
if (!this.fillatt.empty())
72592+
this.drawBorder(this.draw_g, width, height, dpath);
7259872593

7259972594
interactive_element = this.draw_g.append('svg:path')
7260072595
.attr('d', 'M0,'+h2 +dpath)
@@ -72606,26 +72601,8 @@ class TPavePainter extends ObjectPainter {
7260672601

7260772602
return this.drawPaveText(w2, h2, arg, text_g);
7260872603
} else {
72609-
// add shadow decoration before main rect
72610-
if ((brd > 1) && (pt.fShadowColor > 0) && !pt.fNpaves && (dx || dy) && !noborder) {
72611-
const scol = this.getColor(pt.fShadowColor);
72612-
let spath = '';
72613-
72614-
if ((dx < 0) && (dy < 0))
72615-
spath = `M0,0v${height-brd}h${-brd}v${-height}h${width}v${brd}z`;
72616-
else if ((dx < 0) && (dy > 0))
72617-
spath = `M0,${height}v${brd-height}h${-brd}v${height}h${width}v${-brd}z`;
72618-
else if ((dx > 0) && (dy < 0))
72619-
spath = `M${brd},0v${-brd}h${width}v${height}h${-brd}v${brd-height}z`;
72620-
else
72621-
spath = `M${width},${brd}h${brd}v${height}h${-width}v${-brd}h${width-brd}z`;
72622-
72623-
this.draw_g.append('svg:path')
72624-
.attr('d', spath)
72625-
.style('fill', scol)
72626-
.style('stroke', scol)
72627-
.style('stroke-width', '1px');
72628-
}
72604+
if (!pt.fNpaves)
72605+
this.drawBorder(this.draw_g, width, height);
7262972606

7263072607
if (pt.fNpaves) {
7263172608
for (let n = pt.fNpaves-1; n > 0; --n) {
@@ -72669,6 +72646,45 @@ class TPavePainter extends ObjectPainter {
7266972646
});
7267072647
}
7267172648

72649+
drawBorder(draw_g, width, height, diamond) {
72650+
const pt = this.getObject(),
72651+
opt = pt.fOption.toUpperCase(),
72652+
noborder = opt.indexOf('NB') >= 0,
72653+
dx = (opt.indexOf('L') >= 0) ? -1 : ((opt.indexOf('R') >= 0) ? 1 : 0),
72654+
dy = (opt.indexOf('T') >= 0) ? -1 : ((opt.indexOf('B') >= 0) ? 1 : 0);
72655+
72656+
if ((pt.fBorderSize < 2) || (pt.fShadowColor === 0) || (!dx && !dy) || noborder)
72657+
return;
72658+
72659+
const scol = this.getColor(pt.fShadowColor),
72660+
brd = pt.fBorderSize;
72661+
72662+
if (diamond) {
72663+
draw_g.append('svg:path')
72664+
.attr('d', `M0,${Math.round(height/2)+brd}${diamond}`)
72665+
.style('fill', scol)
72666+
.style('stroke', scol)
72667+
.style('stroke-width', '1px');
72668+
} else {
72669+
let spath = '';
72670+
72671+
if ((dx < 0) && (dy < 0))
72672+
spath = `M0,0v${height-brd-1}h${-brd+1}v${-height+2}h${width-2}v${brd-1}z`;
72673+
else if ((dx < 0) && (dy > 0))
72674+
spath = `M0,${height}v${brd+1-height}h${-brd+1}v${height-2}h${width-2}v${-brd+1}z`;
72675+
else if ((dx > 0) && (dy < 0))
72676+
spath = `M${brd+1},0v${-brd+1}h${width-2}v${height-2}h${-brd+1}v${brd+1-height}z`;
72677+
else
72678+
spath = `M${width},${brd+1}h${brd-1}v${height-2}h${-width+2}v${-brd+1}h${width-brd-2}z`;
72679+
72680+
draw_g.append('svg:path')
72681+
.attr('d', spath)
72682+
.style('fill', scol)
72683+
.style('stroke', scol)
72684+
.style('stroke-width', '1px');
72685+
}
72686+
}
72687+
7267272688
/** @summary Fill option object used in TWebCanvas */
7267372689
fillWebObjectOptions(res) {
7267472690
const pave = this.getObject();
@@ -72918,25 +72934,31 @@ class TPavePainter extends ObjectPainter {
7291872934
if (this.isTitle())
7291972935
this.draw_g.style('display', !num_txt ? 'none' : null);
7292072936

72921-
if (draw_header) {
72922-
const x = Math.round(width*0.25),
72923-
y = Math.round(-height*0.02),
72937+
72938+
return Promise.all(promises).then(() => this);
72939+
}).then(() => {
72940+
72941+
if (!draw_header)
72942+
return;
72943+
72944+
const x = Math.round(width*0.25),
72945+
y = Math.round(-pad_height*0.02),
7292472946
w = Math.round(width*0.5),
72925-
h = Math.round(height*0.04),
72926-
lbl_g = text_g.append('svg:g');
72947+
h = Math.round(pad_height*0.04),
72948+
lbl_g = text_g.append('svg:g').attr('transform', makeTranslate(x,y));
7292772949

72928-
lbl_g.append('svg:path')
72929-
.attr('d', `M${x},${y}h${w}v${h}h${-w}z`)
72930-
.call(this.fillatt.func)
72931-
.call(this.lineatt.func);
72950+
this.drawBorder(lbl_g, w, h);
7293272951

72933-
promises.push(this.startTextDrawingAsync(this.textatt.font, h/1.5, lbl_g)
72934-
.then(() => this.drawText({ align: 22, x, y, width: w, height: h, text: pt.fLabel, color: this.textatt.color, draw_g: lbl_g }))
72935-
.then(() => promises.push(this.finishTextDrawing(lbl_g))));
72936-
}
72952+
lbl_g.append('svg:path')
72953+
.attr('d', `M${0},${0}h${w}v${h}h${-w}z`)
72954+
.call(this.fillatt.func)
72955+
.call(this.lineatt.func);
7293772956

72938-
return Promise.all(promises).then(() => this);
72939-
});
72957+
return this.startTextDrawingAsync(this.textatt.font, 0.9*h, lbl_g)
72958+
.then(() => this.drawText({ align: 22, x: 0, y: 0, width: w, height: h, text: pt.fLabel, color: this.textatt.color, draw_g: lbl_g }))
72959+
.then(() => promises.push(this.finishTextDrawing(lbl_g)));
72960+
72961+
}).then(() => { return this; })
7294072962
}
7294172963

7294272964
/** @summary Method used to convert value to string according specified format
@@ -72954,14 +72976,9 @@ class TPavePainter extends ObjectPainter {
7295472976
return value.toFixed(0);
7295572977
fmt = '14.7g';
7295672978
break;
72957-
case 'last': fmt = this.lastformat; break;
7295872979
}
7295972980

72960-
const res = floatToString(value, fmt || '6.4g', true);
72961-
72962-
this.lastformat = res[1];
72963-
72964-
return res[0];
72981+
return floatToString(value, fmt || '6.4g');
7296572982
}
7296672983

7296772984
/** @summary Draw TLegend object */
@@ -73607,7 +73624,6 @@ class TPavePainter extends ObjectPainter {
7360773624
return `.${tv.length-id-1}f`;
7360873625
}
7360973626

73610-
7361173627
/** @summary Fill function parameters */
7361273628
fillFunctionStat(f1, dofit, ndim = 1) {
7361373629
this._has_fit = false;
@@ -147427,7 +147443,6 @@ async function drawText$1() {
147427147443

147428147444
if ((text._typename === clTLatex) || annot) {
147429147445
arg.latex = 1;
147430-
fact = 0.9;
147431147446
} else if (text._typename === clTMathText) {
147432147447
arg.latex = 2;
147433147448
fact = 0.8;
@@ -155987,8 +156002,8 @@ class TGaxisPainter extends TAxisPainter {
155987156002
});
155988156003
}
155989156004

155990-
/** @summary Fill TGaxis context */
155991-
fillContextMenu(menu) {
156005+
/** @summary Fill TGaxis context menu items */
156006+
fillContextMenuItems(menu) {
155992156007
menu.addTAxisMenu(EAxisBits, this, this.getObject(), '');
155993156008
}
155994156009

@@ -157232,11 +157247,12 @@ class RAxisPainter extends RObjectPainter {
157232157247
const gr_range = Math.abs(this.func.range()[1] - this.func.range()[0]);
157233157248

157234157249
// avoid black filling by middle-size
157235-
if ((handle.middle.length <= handle.major.length) || (handle.middle.length > gr_range/3.5))
157250+
if ((handle.middle.length <= handle.major.length) || (handle.middle.length > gr_range))
157236157251
handle.minor = handle.middle = handle.major;
157237157252
else if ((this.nticks3 > 1) && !this.log) {
157238157253
handle.minor = this.produceTicks(handle.middle.length, this.nticks3);
157239-
if ((handle.minor.length <= handle.middle.length) || (handle.minor.length > gr_range/1.7)) handle.minor = handle.middle;
157254+
if ((handle.minor.length <= handle.middle.length) || (handle.minor.length > gr_range))
157255+
handle.minor = handle.middle;
157240157256
}
157241157257
}
157242157258

@@ -160455,7 +160471,7 @@ class RPadPainter extends RObjectPainter {
160455160471

160456160472
const mainid = this.selectDom().attr('id');
160457160473

160458-
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid)) {
160474+
if (!this.isBatchMode() && !this.use_openui && !this.brlayout && mainid && isStr(mainid) && !getHPainter()) {
160459160475
this.brlayout = new BrowserLayout(mainid, null, this);
160460160476
this.brlayout.create(mainid, true);
160461160477
this.setDom(this.brlayout.drawing_divid()); // need to create canvas
@@ -162602,25 +162618,6 @@ class RHistStatsPainter extends RPavePainter {
162602162618
return (this.stats_lines !== undefined);
162603162619
}
162604162620

162605-
/** @summary format float value as string
162606-
* @private */
162607-
format(value, fmt) {
162608-
if (!fmt) fmt = 'stat';
162609-
162610-
switch (fmt) {
162611-
case 'stat' : fmt = gStyle.fStatFormat; break;
162612-
case 'fit': fmt = gStyle.fFitFormat; break;
162613-
case 'entries': if ((Math.abs(value) < 1e9) && (Math.round(value) === value)) return value.toFixed(0); fmt = '14.7g'; break;
162614-
case 'last': fmt = this.lastformat; break;
162615-
}
162616-
162617-
const res = floatToString(value, fmt || '6.4g', true);
162618-
162619-
this.lastformat = res[1];
162620-
162621-
return res[0];
162622-
}
162623-
162624162621
/** @summary Draw content */
162625162622
async drawContent() {
162626162623
if (this.fillStatistic())

‎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 = '21/11/2024',
7+
version_date = '22/11/2024',
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)
Please sign in to comment.