Skip to content

[gui] let use some classes in batch mode #21907

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

Open
linev wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −28
Open

[gui] let use some classes in batch mode #21907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dcb027
Let TGLabel::fHasOwnFont only if really allocate TGGC
linev Apr 14, 2026
08163c1
Always assign ref count in TGGC constructor
linev Apr 14, 2026
fb1d269
Let return dummy TGPicture in batch mode
linev Apr 14, 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
15 changes: 4 additions & 11 deletions gui/gui/src/TGGC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ TGGC::TGGC(GCValues_t *values, Bool_t)
}
} else {
fValues = {};
fContext = 0;
}
SetRefCount(1);
}
Expand All @@ -61,20 +60,14 @@ TGGC::TGGC(GCValues_t *values, Bool_t)
TGGC::TGGC(GCValues_t *values)
{
fContext = 0;
SetRefCount(1);
// case of default ctor at program startup before gClient exists
if (!values) {
if (!values)
fValues = {};
fContext = 0;
SetRefCount(1);
return;
}

if (gClient)
else if (gClient)
gClient->GetGC(values, kTRUE);
else {
fContext = 0;
else
Error("TGGC", "TGClient not yet initialized, should never happen");
}
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions gui/gui/src/TGLabel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ void TGLabel::SetTextFont(TGFont *font, Bool_t global)
if (!global) {
if (gc == &GetDefaultGC() ) { // create new GC
gc = pool->GetGC((GCValues_t*)gc->GetAttributes(), kTRUE); // copy ctor.
fHasOwnFont = kTRUE;
}
fHasOwnFont = kTRUE;
}
if (oldfont != fgDefaultFont) {
fClient->FreeFont(oldfont);
Expand All @@ -366,8 +366,8 @@ void TGLabel::SetTextColor(Pixel_t color, Bool_t global)
if (!global) {
if (gc == &GetDefaultGC() ) {
gc = pool->GetGC((GCValues_t*)gc->GetAttributes(), kTRUE); // copy
fHasOwnFont = kTRUE;
}
fHasOwnFont = kTRUE;
}
if (gc) {
gc->SetForeground(color);
Expand Down
24 changes: 9 additions & 15 deletions gui/gui/src/TGPicture.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,42 +94,36 @@ const TGPicture *TGPicturePool::GetPicture(const char *name)

TGPicture *pic = (TGPicture *)fPicList->FindObject(pname);
if (pic && !pic->IsScaled()) {
if (pic->fPic == kNone)
return 0;
// in batch mode allow to return dummy image
if ((pic->fPic == kNone) && !gROOT->IsBatch())
return nullptr;
pic->AddReference();
return pic;
}

char *picnam = gSystem->Which(fPath, pname, kReadPermission);
if (!picnam) {
pic = new TGPicture(pname);
pic->fAttributes.fColormap = fClient->GetDefaultColormap();
pic->fAttributes.fCloseness = 40000; // Allow for "similar" colors
pic->fAttributes.fMask = kPASize | kPAColormap | kPACloseness;
fPicList->Add(pic);
return 0;
}

TImage *img = TImage::Open(picnam);
TImage *img = picnam ? TImage::Open(picnam) : nullptr;

delete [] picnam;

if (!img) {
pic = new TGPicture(pname);
pic->fAttributes.fColormap = fClient->GetDefaultColormap();
pic->fAttributes.fCloseness = 40000; // Allow for "similar" colors
pic->fAttributes.fMask = kPASize | kPAColormap | kPACloseness;
fPicList->Add(pic);
delete [] picnam;
return 0;
return nullptr;
}

pic = new TGPicture(pname, img->GetPixmap(), img->GetMask());
delete [] picnam;
delete img;
fPicList->Add(pic);
return pic;
}

////////////////////////////////////////////////////////////////////////////////
/// Like TGPicturePool::GetPicture() but, instead of returning null when the
/// Like TGPicturePool::GetPicture() but, instead of returning null when the
/// picture is not found, it returns a valid empty picture.

const TGPicture *TGPicturePool::GetPictureOrEmpty(const char *name)
Expand Down
Loading