Skip to content

Remove gVirtualX usage in TGaxis and TView3D #22737

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

Merged
linev merged 2 commits into from
Jul 2, 2026
Merged

Remove gVirtualX usage in TGaxis and TView3D #22737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d56d8d9
[tgaxis] completely remove gVirtualX usage
linev Jul 1, 2026
979e03d
[tview3d] remove gVirtualX usage
linev Jul 1, 2026
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
17 changes: 0 additions & 17 deletions graf2d/graf/src/TGaxis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "TGaxis.h"
#include "TAxisModLab.h"
#include "TVirtualPad.h"
#include "TVirtualX.h"
#include "TLine.h"
#include "TArrow.h"
#include "TLatex.h"
Expand Down Expand Up @@ -1039,7 +1038,6 @@ void TGaxis::PaintAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t yma
Double_t ww, af, rne;
Double_t xx, yy;
Double_t xmnlog, x00, x11, h2, h2sav, axmul, y;
Float_t chupxvsav, chupyvsav;
Double_t rtxw, rtyw;
Int_t nlabels, nticks, nticks0 = 0, nticks1 = 0;
Int_t i, j, k, l, decade;
Expand Down Expand Up @@ -1370,11 +1368,6 @@ void TGaxis::PaintAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t yma
Int_t TitleColor = GetTextColor();
Int_t TitleFont = GetTextFont();

if (!gPad->IsBatch()) {
gVirtualX->GetCharacterUp(chupxvsav, chupyvsav);
gVirtualX->SetClipOFF(gPad->GetCanvasID());
}

// Compute length of axis
axis_length = TMath::Sqrt((x1-x0)*(x1-x0)+(y1-y0)*(y1-y0));
if (axis_length == 0) {
Expand Down Expand Up @@ -1580,16 +1573,6 @@ void TGaxis::PaintAxis(Double_t xmin, Double_t ymin, Double_t xmax, Double_t yma
}
}

// Now determine orientation of labels on axis
if (!gPad->IsBatch()) {
if (cosphi > 0) gVirtualX->SetCharacterUp(-sinphi,cosphi);
else gVirtualX->SetCharacterUp(sinphi,-cosphi);
if (x0 == x1) gVirtualX->SetCharacterUp(0,1);
if (optionVert) gVirtualX->SetCharacterUp(0,1);
if (optionPara) gVirtualX->SetCharacterUp(-sinphi,cosphi);
if (optionDown) gVirtualX->SetCharacterUp(cosphi,sinphi);
}

// Now determine text alignment
xalign = 2;
yalign = 1;
Expand Down
9 changes: 4 additions & 5 deletions graf3d/g3d/src/TView3D.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include "RConfigure.h"

#include "TVirtualPad.h"
#include "TVirtualPadPainter.h"
#include "TView3D.h"
#include "TAxis3D.h"
#include "TPolyLine3D.h"
#include "TVirtualX.h"
#include "TROOT.h"
#include "TBuffer.h"
#include "TClass.h"
Expand Down Expand Up @@ -760,10 +760,9 @@ void TView3D::ExecuteRotateView(Int_t event, Int_t px, Int_t py)
gPad->SetTheta(90-newlatitude);
gPad->Modified(kTRUE);

// Set line color, style and width
gVirtualX->SetLineColor(-1);
gVirtualX->SetLineStyle(-1);
gVirtualX->SetLineWidth(-1);
// reset line color, style and width
if (auto pp = gPad->GetPainter())
pp->SetAttLine({-1, -1, -1});
break;
}

Expand Down
Loading