Proper fix for https://root-forum.cern.ch/t/cannot-setmaxdigits-on-z-…

…axis
root-project · Dec 13, 2019 · a06f3b4 · a06f3b4
1 parent e559e4b
commit a06f3b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/graf2d/graf/src/TGaxis.cxx b/graf2d/graf/src/TGaxis.cxx
@@ -918,7 +918,6 @@ void TGaxis::ImportAxisAttributes(TAxis *axis)
    SetTitle(axis->GetTitle());
    SetTitleOffset(axis->GetTitleOffset());
    SetTitleSize(axis->GetTitleSize());
-///   SetMaxDigits(axis->GetMaxDigits());
    SetBit(TAxis::kCenterTitle,   axis->TestBit(TAxis::kCenterTitle));
    SetBit(TAxis::kCenterLabels,  axis->TestBit(TAxis::kCenterLabels));
    SetBit(TAxis::kRotateTitle,   axis->TestBit(TAxis::kRotateTitle));

diff --git a/hist/histpainter/src/TPaletteAxis.cxx b/hist/histpainter/src/TPaletteAxis.cxx
@@ -498,7 +498,15 @@ void TPaletteAxis::Paint(Option_t *)
          }
       }
    }
-   Int_t ndiv  = fH->GetZaxis()->GetNdivisions() % 100; //take primary divisions only
+
+   // Take primary divisions only
+   Int_t ndiv = fH->GetZaxis()->GetNdivisions();
+   Bool_t isOptimized = ndiv>0;
+   Int_t absDiv = abs(ndiv);
+   Int_t maxD = absDiv/1000000;
+   ndiv = absDiv%100 + maxD*1000000;
+   if (!isOptimized) ndiv  = -ndiv;
+
    char chopt[6] = "S   ";
    chopt[1] = 0;
    strncat(chopt, "+L", 3);