Skip to content

Allow SetLabelAttributes to take negative label num #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paulgessinger wants to merge 1 commit into from
Closed

Allow SetLabelAttributes to take negative label num #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graf2d/graf/inc/TGaxis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class TGaxis : public TLine, public TAttText {
,Double_t &BinLow, Double_t &BinHigh, Int_t &nbins, Double_t &BinWidth);
virtual void CenterLabels(Bool_t center=kTRUE);
virtual void CenterTitle(Bool_t center=kTRUE);
void ChangeLabelAttributes(Int_t i, TLatex* t, char* c);
void ChangeLabelAttributes(Int_t i, Int_t nlabels, TLatex* t, char* c);
virtual void DrawAxis(Double_t xmin,Double_t ymin,Double_t xmax,Double_t ymax,
Double_t wmin,Double_t wmax,Int_t ndiv=510, Option_t *chopt="",
Double_t gridlength = 0);
Expand Down
19 changes: 15 additions & 4 deletions graf2d/graf/src/TGaxis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,7 +1755,7 @@ void TGaxis::PaintAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t yma
if (!optionText) {
if (first > last) strncpy(chtemp, " ", 256);
else strncpy(chtemp, &label[first], 256);
if (fNModLabs) ChangeLabelAttributes(k+1, textaxis, chtemp);
if (fNModLabs) ChangeLabelAttributes(k+1, nlabels, textaxis, chtemp);
typolabel = chtemp;
if (!optionTime) typolabel.ReplaceAll("-", "#minus");
textaxis->PaintLatex(gPad->GetX1() + xx*(gPad->GetX2() - gPad->GetX1()),
Expand Down Expand Up @@ -2242,7 +2242,7 @@ void TGaxis::SetFunction(const char *funcname)
/// fine tuning of the labels. All the attributes can be changed and even the
/// label text itself.
///
/// \param[in] labNum Number of the abel to be change
/// \param[in] labNum Number of the abel to be change, negative numbers start from the end
/// \param[in] labAngle New angle value
/// \param[in] labSize New size (0 erase the label)
/// \param[in] labAlign New alignment value
Expand All @@ -2266,6 +2266,7 @@ void TGaxis::SetFunction(const char *funcname)
/// axis1->SetLabelAttributes(3,-1,0.);
/// axis1->SetLabelAttributes(5,30.,-1,0);
/// axis1->SetLabelAttributes(6,-1,-1,-1,3,-1,"6th label");
/// axis1->SetLabelAttributes(-2,-1,-1,-1,3,-1,"2nd to last label");
/// axis1->Draw();
/// }
/// ~~~
Expand Down Expand Up @@ -2307,19 +2308,29 @@ static Int_t SavedTextAlign;
static Int_t SavedTextColor;
static Int_t SavedTextFont;;

void TGaxis::ChangeLabelAttributes(Int_t i, TLatex* t, char* c)
void TGaxis::ChangeLabelAttributes(Int_t i, Int_t nlabels, TLatex* t, char* c)
{
if (!fModLabs) return;

TIter next(fModLabs);
TGaxisModLab *ml;
Int_t labNum;
while ( (ml = (TGaxisModLab*)next()) ) {
SavedTextAngle = t->GetTextAngle();
SavedTextSize = t->GetTextSize();
SavedTextAlign = t->GetTextAlign();
SavedTextColor = t->GetTextColor();
SavedTextFont = t->GetTextFont();
if (i==ml->GetLabNum()) {

labNum = ml->GetLabNum();

if (labNum < 0) {
labNum = nlabels + labNum + 2;
}


if (i==labNum) {

if (ml->GetAngle()>=0.) t->SetTextAngle(ml->GetAngle());
if (ml->GetSize()>=0.) t->SetTextSize(ml->GetSize());
if (ml->GetAlign()>0) t->SetTextAlign(ml->GetAlign());
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TGaxisModLab.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ TGaxisModLab::TGaxisModLab() {
/// Set modified label number.

void TGaxisModLab::SetLabNum(Int_t l) {
if (l>0) fLabNum = l;
if (l!=0) fLabNum = l;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down