Skip to content

[gui] reenable fit panel testing and fix nullptr access #21882

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
ferdymercury wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[gui] reenable fit panel testing and fix nullptr access #21882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c01da5
[gui] prevent nullptr access in TGButton batch mode
ferdymercury Apr 10, 2026
b2bf752
[gui] prevent GC nullptr access in batch mode
ferdymercury Apr 10, 2026
564a764
Update TGLabel.cxx
ferdymercury Apr 10, 2026
522f4c3
[gui] migrate fitpanel test from Makefile to CMake and reenable
ferdymercury Apr 13, 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
2 changes: 2 additions & 0 deletions gui/fitpanel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(FitPanel
Tree
TreePlayer
)

ROOT_ADD_TEST_SUBDIRECTORY(test)
12 changes: 12 additions & 0 deletions gui/fitpanel/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright (C) 1995-2026, Rene Brun and Fons Rademakers.
# All rights reserved.
#
# For the licensing terms see $ROOTSYS/LICENSE.
# For the list of contributors see $ROOTSYS/README/CREDITS.

# @author Danilo Piparo CERN

ROOT_EXECUTABLE(fitPanelUnitTesting UnitTesting.cxx LIBRARIES FitPanel Gui Tree Hist MathCore)
ROOT_ADD_TEST(test-fitpanel-UnitTesting COMMAND fitPanelUnitTesting)
# set_tests_properties(test-fitpanel-UnitTesting PROPERTIES WILL_FAIL true) # Problems with batch mode https://github.com/root-project/root/issues/21881
target_include_directories(fitPanelUnitTesting PRIVATE ../src/)
47 changes: 0 additions & 47 deletions gui/fitpanel/test/Makefile
View file
Open in desktop

This file was deleted.

80 changes: 69 additions & 11 deletions gui/fitpanel/test/UnitTesting.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,27 @@

#include "TGComboBox.h"

#include "TF2.h"
#include "TMath.h"
#include "TRandom2.h"
#include "TTree.h"

#include <iostream>
#include <exception>
#include <stdexcept>
#include <cmath>
#include <cstdio>

#include "CommonDefs.h"

#ifdef WIN32
#include "io.h"
#else
#include "unistd.h"
#endif

// Function that compares to doubles up to an error limit
int equals(Double_t n1, Double_t n2, double ERRORLIMIT = 1.E-10)
int equals(Double_t n1, Double_t n2, double ERRORLIMIT = 1.E-5)
{
return fabs( n1 - n2 ) > ERRORLIMIT * fabs(n1);
}
Expand All @@ -34,6 +46,35 @@ int SelectEntry(TGComboBox* cb, const char* name)
return findEntry->EntryId();
}

void createTree(int n = 100)
{
TTree *tree = new TTree("tree","2 var gaus tree");
double x, y, z, u, v, w;
tree->Branch("x", &x, "x/D");
tree->Branch("y", &y, "y/D");
tree->Branch("z", &z, "z/D");
tree->Branch("u", &u, "u/D");
tree->Branch("v", &v, "v/D");
tree->Branch("w", &w, "w/D");
TRandom2 rndm;
double origPars[13] = {1,2,3,0.5, 0.5, 0, 3, 0, 4, 0, 5, 1, 10 };
TF2 f2("f2", "bigaus", -10, 10,-10, 10);
f2.FixParameter(0, 1. / (2. * TMath::Pi() * origPars[1] * origPars[3] * TMath::Sqrt(origPars[4]))); // constant (max-value), irrelevant
f2.FixParameter(1, origPars[0]); // mu_x
f2.FixParameter(2, origPars[1]); // sigma_x
f2.FixParameter(3, origPars[2]); // mu_y
f2.FixParameter(4, origPars[3]); // sigma_y
f2.FixParameter(5, origPars[4]); // rho
for (Int_t i = 0 ; i < n; i++) {
f2.GetRandom2(x, y, &rndm);
z = rndm.Gaus(origPars[5],origPars[6]);
u = rndm.Gaus(origPars[7],origPars[8]);
v = rndm.Gaus(origPars[9],origPars[10]);
w = rndm.Gaus(origPars[11],origPars[12]);
tree->Fill();
}
}

// Class to make the Unit Testing. It is important than the test
// methods are inside the class as this in particular is defined as a
// friend of the TFitEditor. This way, we can access the private
Expand All @@ -58,22 +99,37 @@ class FitEditorUnitTesting
const char* _exp;
public:
InvalidPointer(const char* exp): _exp(exp) {};
const char* what() { return _exp; };
const char* what() const noexcept override { return _exp; };
};

// Constructor: Receives the instance of the TFitEditor
FitEditorUnitTesting() {
// Redirect the stdout to a file outputUnitTesting.txt
#ifdef WIN32
old_stdout = _dup (_fileno (stdout));
#else
old_stdout = dup (fileno (stdout));
(void) freopen ("outputUnitTesting.txt", "w", stdout);
#endif
auto res = freopen ("outputUnitTesting.txt", "w", stdout);
if (!res) {
throw InvalidPointer("In FitEditorUnitTesting constructor cannot freopen");
}
#ifdef WIN32
out = _fdopen (old_stdout, "w");
#else
out = fdopen (old_stdout, "w");
#endif

// Execute the initial script
gROOT->ProcessLine(".x $ROOTSYS/tutorials/fit/FittingDemo.C+");
TString scriptLine = TString(".x ") + TROOT::GetTutorialDir() + "/math/fit/FittingDemo.C+";
gROOT->ProcessLine(scriptLine.Data());

// Get an instance of the TFitEditor
TCanvas* c1 = static_cast<TCanvas*>( gROOT->FindObject("c1") );
TH1* h = static_cast<TH1*> ( gROOT->FindObject("histo") );
if (!c1 || !h) {
throw InvalidPointer("In c1 or h initialization");
}

f = TFitEditor::GetInstance(c1,h);

Expand Down Expand Up @@ -176,7 +232,9 @@ class FitEditorUnitTesting
for ( unsigned int i = 0; i < f->fFuncPars.size(); ++i ) {
for ( unsigned int j = 0; j < 3; ++j) {
int internalStatus = equals(pars[i][j], f->fFuncPars[i][j]);
//fprintf(out, "i: %d, j: %d, e: %d\n", i, j, internalStatus);
if (internalStatus != 0) {
fprintf(out, "i: %d, j: %d, e: %d, diff %g\n", i, j, internalStatus, TMath::Abs(pars[i][j] - f->fFuncPars[i][j]));
}
status += internalStatus;
}
}
Expand All @@ -186,7 +244,7 @@ class FitEditorUnitTesting

// From here, the implementation of the different tests. The names
// of the test should be enough to know what they are testing, as
// these tests are mean to be as simple as possible.
// these tests are meant to be as simple as possible.

int TestHistogramFit() {
f->fTypeFit->Select(kFP_UFUNC, kTRUE);
Expand Down Expand Up @@ -222,7 +280,8 @@ class FitEditorUnitTesting
}

int TestUpdate() {
gROOT->ProcessLine(".x $ROOTSYS/tutorials/fit/ConfidenceIntervals.C+");
TString scriptLine = TString(".x ") + TROOT::GetTutorialsDir() + "/math/fit/ConfidenceIntervals.C+";
gROOT->ProcessLine(scriptLine.Data());
f->DoUpdate();

return 0;
Expand Down Expand Up @@ -311,7 +370,7 @@ class FitEditorUnitTesting
}

int TestUpdateTree() {
gROOT->ProcessLine(".x ~/tmp/fitpanel/createTree.C++");
createTree();
f->DoUpdate();
return 0;
}
Expand All @@ -326,11 +385,10 @@ class FitEditorUnitTesting
f->ProcessTreeInput(objSelected, selected, "x", "y>1");
f->fTypeFit->Select(kFP_PRED1D, kTRUE);
SelectEntry(f->fFuncList, "gausn");

f->fFuncPars.resize(3);
f->fFuncPars[0][0] = f->fFuncPars[0][1] = f->fFuncPars[0][2] = 1;
f->fFuncPars[1][0] = 0;
f->fFuncPars[2][0] = 1;
f->fFuncPars[1][0] = 0; f->fFuncPars[1][1] = f->fFuncPars[1][2] = 0;
f->fFuncPars[2][0] = 1; f->fFuncPars[2][1] = f->fFuncPars[2][2] = 0;

f->DoFit();

Expand Down
6 changes: 3 additions & 3 deletions gui/gui/src/TGButton.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,8 +1229,8 @@ TGCheckButton::~TGCheckButton()

TGDimension TGCheckButton::GetDefaultSize() const
{
UInt_t w = !fTWidth ? fOff->GetWidth() : fTWidth + fOff->GetWidth() + 9;
UInt_t h = !fTHeight ? fOff->GetHeight() : fTHeight + 2;
UInt_t w = !fTWidth ? (fOff ? fOff->GetWidth() : 9) : fTWidth + (fOff ? fOff->GetWidth() : 9) + 9;
UInt_t h = !fTHeight ? (fOff ? fOff->GetHeight() : 2) : fTHeight + 2;

w = GetOptions() & kFixedWidth ? fWidth : w;
h = GetOptions() & kFixedHeight ? fHeight : h;
Expand Down Expand Up @@ -1593,7 +1593,7 @@ TGRadioButton::~TGRadioButton()

TGDimension TGRadioButton::GetDefaultSize() const
{
UInt_t w = !fTWidth ? ( fOff?fOff->GetWidth():10) : fTWidth + fOff->GetWidth() + 10;
UInt_t w = !fTWidth ? (fOff ? fOff->GetWidth() : 10) : fTWidth + (fOff ? fOff->GetWidth() : 10) + 10;
UInt_t h = !fTHeight ? ( fOff?fOff->GetHeight():2) : fTHeight + 2;

w = GetOptions() & kFixedWidth ? fWidth : w;
Expand Down
31 changes: 20 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 @@ -39,14 +39,15 @@ TGGC::TGGC(GCValues_t *values, Bool_t)
fContext = 0;
if (values) {
fValues = *values;
fContext = gVirtualX->CreateGC(gVirtualX->GetDefaultRootWindow(), values);
if (gVirtualX)
Copy link
Copy Markdown
Member

@linev linev Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking of gVirtualX does not make big sense - it always present, also in batch mode

Copy link
Copy Markdown
Collaborator Author

@ferdymercury ferdymercury Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was null when i checked with the debugger. Note that TVirtualX::Instance can still return nullptr when on batch

Copy link
Copy Markdown
Member

@linev linev Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For changes in GUI classes we need ok from Bertrand @bellenot.
Can we combine this PR with enabling of gui test: #21891
Then we directly can see if our changes works/fails?

And finally we will be able to decide if such extra checks in GUI classes allows to use them in batch GUI tests.

fContext = gVirtualX->CreateGC(gVirtualX->GetDefaultRootWindow(), values);
if (values->fMask & kGCDashList) {
if (values->fDashLen > (Int_t)sizeof(fValues.fDashes))
Warning("TGGC", "dash list can have only up to %ld elements",
(Long_t)sizeof(fValues.fDashes));
fValues.fDashLen = std::min(values->fDashLen, (Int_t)sizeof(fValues.fDashes));
gVirtualX->SetDashes(fContext, fValues.fDashOffset, fValues.fDashes,
fValues.fDashLen);
if (gVirtualX)
gVirtualX->SetDashes(fContext, fValues.fDashOffset, fValues.fDashes, fValues.fDashLen);
}
} else {
fValues = {};
Expand Down Expand Up @@ -83,7 +84,7 @@ TGGC::TGGC(GCValues_t *values)
TGGC::TGGC(const TGGC &g) : TObject(g), TRefCnt()
{
fValues = g.fValues;
if (g.fContext) {
if (g.fContext && gVirtualX) {
fContext = gVirtualX->CreateGC(gVirtualX->GetDefaultRootWindow(), &fValues);
if (fValues.fMask & kGCDashList)
gVirtualX->SetDashes(fContext, fValues.fDashOffset, fValues.fDashes,
Expand All @@ -105,7 +106,8 @@ TGGC::~TGGC()
gClient->GetGCPool()->ForceFreeGC(this);

if (fContext)
gVirtualX->DeleteGC(fContext);
if (gVirtualX)
gVirtualX->DeleteGC(fContext);
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -119,14 +121,17 @@ TGGC &TGGC::operator=(const TGGC &rhs)
if (!gc)
gClient->GetGCPool()->fList->Add(this);
}
if (fContext)
if (fContext && gVirtualX)
gVirtualX->DeleteGC(fContext);
TObject::operator=(rhs);
fValues = rhs.fValues;
fContext = gVirtualX->CreateGC(gVirtualX->GetDefaultRootWindow(), &fValues);
if (fValues.fMask & kGCDashList)
gVirtualX->SetDashes(fContext, fValues.fDashOffset, fValues.fDashes,
fValues.fDashLen);
if (gVirtualX) {
fContext = gVirtualX->CreateGC(gVirtualX->GetDefaultRootWindow(), &fValues);
if (fValues.fMask & kGCDashList)
gVirtualX->SetDashes(fContext, fValues.fDashOffset, fValues.fDashes, fValues.fDashLen);
} else {
fContext = 0;
}
}
return *this;
}
Expand Down Expand Up @@ -239,6 +244,9 @@ void TGGC::SetAttributes(GCValues_t *values)
gClient->GetGCPool()->fList->Add(this);
}

if (!gVirtualX)
return;

if (fContext)
gVirtualX->ChangeGC(fContext, values);
else
Expand Down Expand Up @@ -963,7 +971,8 @@ TGGC *TGGCPool::FindGC(GContext_t gct)
TGGC *TGGCPool::GetGC(GContext_t gct)
{
GCValues_t gval;
gVirtualX->GetGCValues(gct, gval);
if (gVirtualX)
gVirtualX->GetGCValues(gct, gval);
return GetGC(&gval, kTRUE);
}

Expand Down
11 changes: 7 additions & 4 deletions gui/gui/src/TGLabel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ TGLabel::TGLabel(const TGWindow *p, TGString *text, GContext_t norm,
wattr.fMask = kWAWinGravity | kWABitGravity;
wattr.fBitGravity = 5; // center
wattr.fWinGravity = 1;
gVirtualX->ChangeWindowAttributes(fId, &wattr);
if (gVirtualX)
gVirtualX->ChangeWindowAttributes(fId, &wattr);
Comment on lines +83 to +84
Copy link
Copy Markdown
Collaborator Author

@ferdymercury ferdymercury Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably these changes are no longer needed since I was trying out different things and you already found the culprit in TGGC


Resize();
SetWindowName();
Expand Down Expand Up @@ -121,7 +122,8 @@ TGLabel::TGLabel(const TGWindow *p, const char *text, GContext_t norm,
wattr.fMask = kWAWinGravity | kWABitGravity;
wattr.fBitGravity = 5; // center
wattr.fWinGravity = 1;
gVirtualX->ChangeWindowAttributes(fId, &wattr);
if (gVirtualX)
gVirtualX->ChangeWindowAttributes(fId, &wattr);

Resize();
SetWindowName();
Expand Down Expand Up @@ -257,7 +259,7 @@ void TGLabel::DoRedraw()
DrawText(fNormGC, x, y);
break;
}
} else { // disabled
} else if (gVirtualX) { // disabled
FontH_t fontH;

if (GetDefaultFontStruct() != fFont->GetFontStruct()) {
Expand Down Expand Up @@ -438,7 +440,8 @@ void TGLabel::SetTextJustify(Int_t mode)
break;
}

gVirtualX->ChangeWindowAttributes(fId, &wattr);
if (gVirtualX)
gVirtualX->ChangeWindowAttributes(fId, &wattr);

Layout();
}
Expand Down
Loading