Skip to content

Commit ac900ae

Browse files
committed
Take into account zaxis properties when drawing color palette (#171)
1 parent 416ac6e commit ac900ae

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

scripts/JSRootPainter.hist.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3086,9 +3086,11 @@
30863086
JSROOT.extend(pal, { _typename: "TPaletteAxis", fName: "TPave", fH: null, fAxis: JSROOT.Create('TGaxis'),
30873087
fX1NDC: 0.91, fX2NDC: 0.95, fY1NDC: 0.1, fY2NDC: 0.9, fInit: 1 } );
30883088

3089-
JSROOT.extend(pal.fAxis, { fTitle: this.GetObject().fZaxis.fTitle, fChopt: "+",
3090-
fLineColor: 1, fLineSyle: 1, fLineWidth: 1,
3091-
fTextAngle: 0, fTextSize: 0.04, fTextAlign: 11, fTextColor: 1, fTextFont: 42 });
3089+
var zaxis = this.GetHisto().fZaxis;
3090+
3091+
JSROOT.extend(pal.fAxis, { fTitle: zaxis.fTitle, fTitleSize: zaxis.fTitleSize, fTextColor: zaxis.fTitleColor, fChopt: "+",
3092+
fLineColor: zaxis.fAxisColor, fLineSyle: 1, fLineWidth: 1,
3093+
fTextAngle: 0, fTextSize: zaxis.fLabelSize, fTextAlign: 11, fTextColor: zaxis.fLabelColor, fTextFont: zaxis.fLabelFont });
30923094

30933095
// place colz in the beginning, that stat box is always drawn on the top
30943096
this.AddFunction(pal, true);

scripts/JSRootPainter.v6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
title_offest_k = 1.6*(axis.fTitleSize<1 ? axis.fTitleSize : axis.fTitleSize/(this.pad_height("") || 10)),
701701
center = axis.TestBit(JSROOT.EAxisBits.kCenterTitle),
702702
rotate = axis.TestBit(JSROOT.EAxisBits.kRotateTitle) ? -1 : 1,
703-
title_color = this.get_color(axis.fTitleColor),
703+
title_color = this.get_color(is_gaxis ? axis.fTextColor : axis.fTitleColor),
704704
shift_x = 0, shift_y = 0;
705705

706706
this.StartTextDrawing(axis.fTitleFont, title_fontsize, title_g);

0 commit comments

Comments
 (0)