Skip to content

Commit 9579e68

Browse files
committed
Support tickx2 and ticky2 options
1 parent 085b66b commit 9579e68

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

modules/gpad/RPadPainter.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,6 +1852,12 @@ class RPadPainter extends RObjectPainter {
18521852
pad.fGridy = 1;
18531853
if (d.check('GRID'))
18541854
pad.fGridx = pad.fGridy = 1;
1855+
if (d.check('TICKX2'))
1856+
pad.fTickx = 2;
1857+
if (d.check('TICKY2'))
1858+
pad.fTicky = 2;
1859+
if (d.check('TICK2'))
1860+
pad.fTickx = pad.fTicky = 2;
18551861
if (d.check('TICKX'))
18561862
pad.fTickx = 1;
18571863
if (d.check('TICKY'))

modules/gpad/TPadPainter.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,6 +2811,10 @@ class TPadPainter extends ObjectPainter {
28112811
padOpt('GRIDX', p => { p.fGridx = 1; });
28122812
padOpt('GRIDY', p => { p.fGridy = 1; });
28132813
padOpt('GRID', p => { p.fGridx = p.fGridy = 1; });
2814+
padOpt('TICKX2', p => { p.fTickx = 2; });
2815+
padOpt('TICKY2', p => { p.fTicky = 2; });
2816+
padOpt('TICKZ2', p => { p.fTickz = 2; });
2817+
padOpt('TICK2', p => { p.fTickx = p.fTicky = 2; });
28142818
padOpt('TICKX', p => { p.fTickx = 1; });
28152819
padOpt('TICKY', p => { p.fTicky = 1; });
28162820
padOpt('TICKZ', p => { p.fTickz = 1; });

modules/hist2d/TH1Painter.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { getTF1Value } from '../base/func.mjs';
66

77

88
const PadDrawOptions = ['LOGXY', 'LOGX', 'LOGY', 'LOGZ', 'LOGV', 'LOG', 'LOG2X', 'LOG2Y', 'LOG2',
9-
'LNX', 'LNY', 'LN', 'GRIDXY', 'GRIDX', 'GRIDY', 'TICKXY', 'TICKX', 'TICKY', 'TICKZ', 'FB', 'GRAYSCALE'];
9+
'LNX', 'LNY', 'LN', 'GRIDXY', 'GRIDX', 'GRIDY',
10+
'TICKXY2', 'TICKX2', 'TICKY2', 'TICKXY', 'TICKX', 'TICKY', 'TICKZ', 'FB', 'GRAYSCALE'];
1011

1112
/**
1213
* @summary Painter for TH1 classes

modules/hist2d/THistPainter.mjs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,14 @@ class THistDrawOptions {
269269
pad.fGridx = 1;
270270
if (d.check('GRIDY') && pad)
271271
pad.fGridy = 1;
272+
if (d.check('TICKXY2') && pad)
273+
pad.fTickx = pad.fTicky = 2;
274+
if (d.check('TICKX2') && pad)
275+
pad.fTickx = 2;
276+
if (d.check('TICKY2') && pad)
277+
pad.fTicky = 2;
278+
if (d.check('TICKZ2') && pad)
279+
pad.fTickz = 2;
272280
if (d.check('TICKXY') && pad)
273281
pad.fTickx = pad.fTicky = 1;
274282
if (d.check('TICKX') && pad)
@@ -847,11 +855,17 @@ class THistDrawOptions {
847855
res += '_GRIDX';
848856
if (pad.fGridy)
849857
res += '_GRIDY';
850-
if (pad.fTickx)
858+
if (pad.fTickx == 2)
859+
res += '_TICKX2';
860+
else if (pad.fTickx)
851861
res += '_TICKX';
852-
if (pad.fTicky)
862+
if (pad.fTicky === 2)
863+
res += '_TICKY2';
864+
else if (pad.fTicky)
853865
res += '_TICKY';
854-
if (pad.fTickz)
866+
if (pad.fTickz === 2)
867+
res += '_TICKZ2';
868+
else if (pad.fTickz)
855869
res += '_TICKZ';
856870
}
857871

0 commit comments

Comments
 (0)