Skip to content

Commit 7c53fba

Browse files
committed
Fix - correctly set lin/log settings back top TPad object
1 parent 619c76e commit 7c53fba

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

scripts/JSRootPainter.hist.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,25 +3139,16 @@
31393139

31403140
if (is3d) {
31413141
// this is fake values, algorithm should be copied from TView3D class of ROOT
3142-
pad.fLogx = pad.fLogy = 0;
3142+
// pad.fLogx = pad.fLogy = 0;
31433143
pad.fUxmin = pad.fUymin = -0.9;
31443144
pad.fUxmax = pad.fUymax = 0.9;
31453145
} else {
31463146
pad.fLogx = (this.swap_xy ? this.logy : this.logx) ? 1 : 0;
3147-
pad.fUxmin = this.scale_xmin;
3148-
pad.fUxmax = this.scale_xmax;
3147+
pad.fUxmin = pad.fLogx ? JSROOT.log10(this.scale_xmin) : this.scale_xmin;
3148+
pad.fUxmax = pad.fLogx ? JSROOT.log10(this.scale_xmax) : this.scale_xmax;
31493149
pad.fLogy = (this.swap_xy ? this.logx : this.logy) ? 1 : 0;
3150-
pad.fUymin = this.scale_ymin;
3151-
pad.fUymax = this.scale_ymax;
3152-
}
3153-
3154-
if (pad.fLogx) {
3155-
pad.fUxmin = JSROOT.log10(pad.fUxmin);
3156-
pad.fUxmax = JSROOT.log10(pad.fUxmax);
3157-
}
3158-
if (pad.fLogy) {
3159-
pad.fUymin = JSROOT.log10(pad.fUymin);
3160-
pad.fUymax = JSROOT.log10(pad.fUymax);
3150+
pad.fUymin = pad.fLogy ? JSROOT.log10(this.scale_ymin) : this.scale_ymin;
3151+
pad.fUymax = pad.fLogy ? JSROOT.log10(this.scale_ymax) : this.scale_ymax;
31613152
}
31623153

31633154
var rx = pad.fUxmax - pad.fUxmin,

0 commit comments

Comments
 (0)