@@ -11,7 +11,7 @@ const version_id = '7.5.x',
1111
1212/** @summary version date
1313 * @desc Release date in format day/month/year like '14/04/2022' */
14- version_date = '27 /10/2023',
14+ version_date = '30 /10/2023',
1515
1616/** @summary version id and date
1717 * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -69245,17 +69245,18 @@ class TPavePainter extends ObjectPainter {
6924569245 if ((brd > 1) && (pt.fShadowColor > 0) && !pt.fNpaves && (dx || dy) && !noborder) {
6924669246 const scol = this.getColor(pt.fShadowColor);
6924769247 let spath = '';
69248- if (this.fillatt.empty()) {
69249- if ((dx < 0) && (dy < 0))
69250- spath = `M0,0v${height-brd}h${-brd}v${-height}h${width}v${brd}`;
69251- else // ((dx < 0) && (dy > 0))
69252- spath = `M0,${height}v${brd-height}h${-brd}v${height}h${width}v${-brd}`;
69253- } else {
69254- // when main is filled, one also can use fill for shadow to avoid complexity
69255- spath = `M${dx*brd},${dy*brd}v${height}h${width}v${-height}`;
69256- }
69248+
69249+ if ((dx < 0) && (dy < 0))
69250+ spath = `M0,0v${height-brd}h${-brd}v${-height}h${width}v${brd}z`;
69251+ else if ((dx < 0) && (dy > 0))
69252+ spath = `M0,${height}v${brd-height}h${-brd}v${height}h${width}v${-brd}z`;
69253+ else if ((dx > 0) && (dy < 0))
69254+ spath = `M${brd},0v${-brd}h${width}v${height}h${-brd}v${brd-height}z`;
69255+ else
69256+ spath = `M${width},${brd}h${brd}v${height}h${-width}v${-brd}h${width-brd}z`;
69257+
6925769258 this.draw_g.append('svg:path')
69258- .attr('d', spath + 'z' )
69259+ .attr('d', spath)
6925969260 .style('fill', scol)
6926069261 .style('stroke', scol)
6926169262 .style('stroke-width', '1px');
@@ -105919,16 +105920,17 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
105919105920
105920105921 if (main_block) {
105921105922 const fp = this.getFramePainter(),
105922- fpcol = fp?.fillatt && !fp?.fillatt.empty() ? fp.fillatt.getFillColor() : -1;
105923+ fpcol = !fp?.fillatt?.empty() ? fp.fillatt.getFillColor() : -1;
105924+
105923105925 if (fpcol === fillatt.getFillColor())
105924105926 usefill = new TAttFillHandler({ color: fpcol === 'white' ? 1 : 0, pattern: 1001 });
105925105927 }
105926105928
105927105929 nodes.append('svg:path')
105928105930 .attr('d', d => {
105929105931 d.bar = true; // element drawn as bar
105930- const dx = Math.round(-d.width/2),
105931- dw = Math.round(d.width),
105932+ const dx = d.width > 1 ? Math.round(-d.width/2) : 0 ,
105933+ dw = d.width > 1 ? Math.round(d.width) : 1 ,
105932105934 dy = (options.Bar !== 1) ? 0 : ((d.gry1 > yy0) ? yy0-d.gry1 : 0),
105933105935 dh = (options.Bar !== 1) ? (h > d.gry1 ? h - d.gry1 : 0) : Math.abs(yy0 - d.gry1);
105934105936 return `M${dx},${dy}h${dw}v${dh}h${-dw}z`;
0 commit comments