Skip to content

[graphics] fix different SavePrimitve problems #20295

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 10 commits into from
Nov 6, 2025
Merged

[graphics] fix different SavePrimitve problems #20295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c974b0a
Adjust fill pattern saving in gpad classes
linev Nov 3, 2025
abf66a3
Adjust fill pattern saving in graf classes
linev Nov 3, 2025
bb5476e
Adjust fill pattern saving in hist classes
linev Nov 3, 2025
7dac51d
Save line attributes if gStyle defaults are changed
linev Nov 3, 2025
07f3acd
Correctly save frame border mode
linev Nov 3, 2025
3c57749
Introduce TMultiGraph::SetHistogram method
linev Nov 3, 2025
255a367
Save histogram in TMultiGraph::SavePrimitive
linev Nov 3, 2025
5d791ad
[jsroot] dev 5/11/2025
linev Nov 5, 2025
b21b198
Update stressGraphics_web.ref file
linev Nov 5, 2025
25d764e
adjust hist tests after SavePrimitive update
linev Nov 5, 2025
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
10 changes: 7 additions & 3 deletions core/base/src/TAttLine.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,15 @@ void TAttLine::ResetAttLine(Option_t *)

void TAttLine::SaveLineAttributes(std::ostream &out, const char *name, Int_t coldef, Int_t stydef, Int_t widdef)
{
if (fLineColor != coldef)
// save line settings if gStyle configured differently - so 1,1,1 is not default
Bool_t force_saving = (coldef == 1) && (stydef == 1) && (widdef == 1) && gStyle &&
((gStyle->GetLineColor() != 1) || (gStyle->GetLineWidth() != 1) || (gStyle->GetLineStyle() != 1));

if ((fLineColor != coldef) || force_saving)
out << " " << name << "->SetLineColor(" << TColor::SavePrimitiveColor(fLineColor) << ");\n";
if (fLineStyle != stydef)
if ((fLineStyle != stydef) || force_saving)
out << " " << name << "->SetLineStyle(" << fLineStyle << ");\n";
if (fLineWidth != widdef)
if ((fLineWidth != widdef) || force_saving)
out << " " << name << "->SetLineWidth(" << fLineWidth << ");\n";
}

Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpad/src/TButton.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void TButton::SavePrimitive(std::ostream &out, Option_t * /*= ""*/)
TString(GetMethod()).ReplaceSpecialCppChars().Data(), fXlowNDC, fYlowNDC,
fXlowNDC + fWNDC, fYlowNDC + fHNDC));

SaveFillAttributes(out, "button", 0, 1001);
SaveFillAttributes(out, "button", -1, -1);
SaveLineAttributes(out, "button", 1, 1, 1);
SaveTextAttributes(out, "button", 22, 0, 1, 61, .65);

Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpad/src/TGroupButton.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ void TGroupButton::SavePrimitive(std::ostream &out, Option_t * /*= ""*/)
TString(GetMethod()).ReplaceSpecialCppChars().Data(), fXlowNDC, fYlowNDC,
fXlowNDC + fWNDC, fYlowNDC + fHNDC));

SaveFillAttributes(out, "grbutton", 0, 1001);
SaveFillAttributes(out, "grbutton", -1, -1);
SaveLineAttributes(out, "grbutton", 1, 1, 1);
SaveTextAttributes(out, "grbutton", 22, 0, 1, 62, .75);

Expand Down
6 changes: 3 additions & 3 deletions graf2d/gpad/src/TPad.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6066,7 +6066,7 @@ void TPad::SavePrimitive(std::ostream &out, Option_t * option /*= ""*/)
<< ", " << rmax[1] << ", " << rmax[2] << ");\n";
}

SaveFillAttributes(out, cname, 19, 1001);
SaveFillAttributes(out, cname, -1, -1);

if (GetBorderMode() != 1)
out << " " << cname << "->SetBorderMode(" << GetBorderMode() << ");\n";
Expand Down Expand Up @@ -6109,7 +6109,7 @@ void TPad::SavePrimitive(std::ostream &out, Option_t * option /*= ""*/)
out << " " << cname << "->SetFrameLineColor(" << TColor::SavePrimitiveColor(GetFrameLineColor()) << ");\n";
if (GetFrameLineWidth() != 1)
out << " " << cname << "->SetFrameLineWidth(" << GetFrameLineWidth() << ");\n";
if (GetFrameBorderMode() != 1)
if (GetFrameBorderMode() != 0)
out << " " << cname << "->SetFrameBorderMode(" << GetFrameBorderMode() << ");\n";
if (GetFrameBorderSize() != 1)
out << " " << cname << "->SetFrameBorderSize(" << GetFrameBorderSize() << ");\n";
Expand All @@ -6128,7 +6128,7 @@ void TPad::SavePrimitive(std::ostream &out, Option_t * option /*= ""*/)
out << " " << cname << "->SetFrameLineColor(" << TColor::SavePrimitiveColor(frame->GetLineColor()) << ");\n";
if (frame->GetLineWidth() != 1)
out << " " << cname << "->SetFrameLineWidth(" << frame->GetLineWidth() << ");\n";
if (frame->GetBorderMode() != 1)
if (frame->GetBorderMode() != 0)
out << " " << cname << "->SetFrameBorderMode(" << frame->GetBorderMode() << ");\n";
if (frame->GetBorderSize() != 1)
out << " " << cname << "->SetFrameBorderSize(" << frame->GetBorderSize() << ");\n";
Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpad/src/TPaveClass.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void TPaveClass::SavePrimitive(std::ostream &out, Option_t * /*= ""*/)
TString(fLabel).ReplaceSpecialCppChars().Data(),
TString(fOption).ReplaceSpecialCppChars().Data()));

SaveFillAttributes(out, "pclass", 0, 1001);
SaveFillAttributes(out, "pclass", -1, -1);
SaveLineAttributes(out, "pclass", 1, 1, 1);
SaveTextAttributes(out, "pclass", 22, 0, 1, 62, 0);

Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpad/src/TSlider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void TSlider::SavePrimitive(std::ostream &out, Option_t * /*= ""*/)
gPad->GetY1() + (gPad->GetY2() - gPad->GetY1()) * (GetYlowNDC() + GetHNDC()),
sbox ? sbox->GetFillColor() : GetFillColor(), GetBorderSize(), GetBorderMode()));

SaveFillAttributes(out, "slider", 16, 1001);
SaveFillAttributes(out, "slider", -1, -1);
SaveLineAttributes(out, "slider", 1, 1, 1);

out << " slider->SetRange(" << fMinimum << ", " << fMaximum << ");\n";
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TArrow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ void TArrow::SavePrimitive(std::ostream &out, Option_t *option)
TString::Format("%g, %g, %g, %g, %g, \"%s\"", fX1, fY1, fX2, fY2, fArrowSize,
TString(GetOption()).ReplaceSpecialCppChars().Data()));

SaveFillAttributes(out, "arrow", 0, 1);
SaveFillAttributes(out, "arrow", 0, 1001);
SaveLineAttributes(out, "arrow", 1, 1, 1);

if (TestBit(kLineNDC))
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TBox.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ void TBox::SavePrimitive(std::ostream &out, Option_t *option)
{
SavePrimitiveConstructor(out, Class(), "box", TString::Format("%g, %g, %g, %g", fX1, fY1, fX2, fY2));

SaveFillAttributes(out, "box", 0, 1001);
SaveFillAttributes(out, "box", -1, -1);
SaveLineAttributes(out, "box", 1, 1, 1);

SavePrimitiveDraw(out, "box", option);
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TCutG.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ void TCutG::SavePrimitive(std::ostream &out, Option_t *option)
out << " cutg->SetVarY(\"" << GetVarY() << "\");\n";
out << " cutg->SetTitle(\"" << TString(GetTitle()).ReplaceSpecialCppChars() << "\");\n";

SaveFillAttributes(out, "cutg", 0, 1001);
SaveFillAttributes(out, "cutg", 0, 1000);
SaveLineAttributes(out, "cutg", 1, 1, 1);
SaveMarkerAttributes(out, "cutg", 1, 1, 1);

Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TDiamond.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ void TDiamond::SavePrimitive(std::ostream &out, Option_t *option)
{
SavePrimitiveConstructor(out, Class(), "diamond", TString::Format("%g, %g, %g, %g", fX1, fY1, fX2, fY2));

SaveFillAttributes(out, "diamond", 0, 1001);
SaveFillAttributes(out, "diamond", -1, -1);
SaveLineAttributes(out, "diamond", 1, 1, 1);
SaveTextAttributes(out, "diamond", 11, 0, 1, 62, 0.05);

Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TLegendEntry.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Storage class for one entry of a TLegend.
////////////////////////////////////////////////////////////////////////////////
/// TLegendEntry do-nothing default constructor

TLegendEntry::TLegendEntry(): TAttText(), TAttLine(), TAttFill(), TAttMarker()
TLegendEntry::TLegendEntry(): TAttText(0,0,0,0,0), TAttLine(1,1,1), TAttFill(0,0), TAttMarker(1,21,1)
{
fObject = nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TPave.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ TString TPave::GetSavePaveArgs(const char *extra_arg, Bool_t save_option)
void TPave::SavePrimitive(std::ostream &out, Option_t *option)
{
SavePrimitiveConstructor(out, Class(), "pave", GetSavePaveArgs(TString::Format("%d", fBorderSize)));
SaveFillAttributes(out, "pave", 19, 1001);
SaveFillAttributes(out, "pave", -1, -1);
SaveLineAttributes(out, "pave", 1, 1, 1);
if (strcmp(GetName(), "TPave"))
out << " pave->SetName(\"" << GetName() << "\");\n";
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TPaveLabel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void TPaveLabel::SavePrimitive(std::ostream &out, Option_t *option)
if (fBorderSize != 3)
out << " pavelabel->SetBorderSize(" << fBorderSize << ");\n";

SaveFillAttributes(out, "pavelabel", 19, 1001);
SaveFillAttributes(out, "pavelabel", -1, -1);
SaveLineAttributes(out, "pavelabel", 1, 1, 1);
SaveTextAttributes(out, "pavelabel", 22, 0, 1, 62, 0);

Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TPaveStats.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ void TPaveStats::SavePrimitive(std::ostream &out, Option_t *option)
if (fBorderSize != 4)
out << " ptstats->SetBorderSize(" << fBorderSize << ");\n";

SaveFillAttributes(out, "ptstats", 19, 1001);
SaveFillAttributes(out, "ptstats", -1, -1);
SaveLineAttributes(out, "ptstats", 1, 1, 1);
SaveTextAttributes(out, "ptstats", 22, 0, 1, 62, 0);
SaveLines(out, "ptstats", kTRUE);
Expand Down
4 changes: 2 additions & 2 deletions graf2d/graf/src/TPaveText.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ void TPaveText::SaveLines(std::ostream &out, const char *name, Bool_t)
auto box_name = TString::Format("%s_box%d", name, linecnt++);
out << " TBox *" << box_name << " = " << name << "->AddBox(" << lineb->GetX1() << "," << lineb->GetY1()
<< "," << lineb->GetX2() << "," << lineb->GetY2() << ");" << std::endl;
lineb->SaveFillAttributes(out, box_name.Data(), 18, 1001);
lineb->SaveFillAttributes(out, box_name.Data(), -1, -1);
lineb->SaveLineAttributes(out, box_name.Data(), 1, 1, 1);
} else if (line->IsA() == TText::Class() || line->IsA() == TLatex::Class()) {
// Next primitive is a text
Expand Down Expand Up @@ -740,7 +740,7 @@ void TPaveText::SavePrimitive(std::ostream &out, Option_t *option)
out << " pt->SetLabel(\"" << TString(fLabel).ReplaceSpecialCppChars() << "\");\n";
if (fBorderSize != 4)
out << " pt->SetBorderSize(" << fBorderSize << ");\n";
SaveFillAttributes(out, "pt", 19, 1001);
SaveFillAttributes(out, "pt", -1, -1);
SaveLineAttributes(out, "pt", 1, 1, 1);
SaveTextAttributes(out, "pt", 22, 0, 1, 62, 0);
SaveLines(out, "pt", kTRUE);
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TPavesText.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void TPavesText::SavePrimitive(std::ostream &out, Option_t *option)
out << " pst->SetLabel(\"" << TString(fLabel).ReplaceSpecialCppChars() << "\");\n";
if (fBorderSize != 4)
out << " pst->SetBorderSize(" << fBorderSize << ");\n";
SaveFillAttributes(out, "pst", 0, 1001);
SaveFillAttributes(out, "pst", -1, -1);
SaveLineAttributes(out, "pst", 1, 1, 1);
SaveTextAttributes(out, "pst", 22, 0, 1, 62, 0);
SaveLines(out, "pst", kTRUE);
Expand Down
8 changes: 4 additions & 4 deletions graf2d/graf/src/TPieSlice.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ void TPieSlice::SavePrimitive(std::ostream &out, Option_t *opts)
if (!name || !*name || strncmp(name, "pie->", 5))
return;

out << " " << name << "->SetTitle(\"" << GetTitle() << "\");" << std::endl;
out << " " << name << "->SetValue(" << GetValue() << ");" << std::endl;
out << " " << name << "->SetRadiusOffset(" << GetRadiusOffset() << ");" << std::endl;
out << " " << name << "->SetTitle(\"" << GetTitle() << "\");\n";
out << " " << name << "->SetValue(" << GetValue() << ");\n";
out << " " << name << "->SetRadiusOffset(" << GetRadiusOffset() << ");\n";

SaveFillAttributes(out, name, 0, 1001);
SaveFillAttributes(out, name, -1, -1);
SaveLineAttributes(out, name, 1, 1, 1);
}

Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TPolyLine.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ void TPolyLine::SavePrimitive(std::ostream &out, Option_t *option)
args.Append(TString::Format("\"%s\"", TString(fOption).ReplaceSpecialCppChars().Data()));

SavePrimitiveConstructor(out, Class(), "polyline", args, Size() == 0);
SaveFillAttributes(out, "polyline", 0, 1001);
SaveFillAttributes(out, "polyline", -1, -1);
SaveLineAttributes(out, "polyline", 1, 1, 1);

if (!option || !strstr(option, "nodraw"))
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/src/TWbox.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void TWbox::SavePrimitive(std::ostream &out, Option_t *option)
{
SavePrimitiveConstructor(out, Class(), "wbox", TString::Format("%g, %g, %g, %g", fX1, fY1, fX2, fY2), kFALSE);

SaveFillAttributes(out, "wbox", 0, 1001);
SaveFillAttributes(out, "wbox", -1, -1);
SaveLineAttributes(out, "wbox", 1, 1, 1);

SavePrimitiveDraw(out, "wbox", option);
Expand Down
2 changes: 1 addition & 1 deletion graf2d/gviz/src/TGraphNode.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void TGraphNode::SavePrimitive(std::ostream &, Option_t *)

void TGraphNode::SaveAttributes(std::ostream &out)
{
SaveFillAttributes(out, GetName(), 0, 1001);
SaveFillAttributes(out, GetName(), -1, -1);
SaveLineAttributes(out, GetName(), 1, 1, 1);
SaveTextAttributes(out, GetName(), 0, 0, 0, 0, 0);
}
Expand Down
1 change: 1 addition & 0 deletions hist/hist/inc/TMultiGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class TMultiGraph : public TNamed {
void Print(Option_t *chopt="") const override;
void RecursiveRemove(TObject *obj) override;
void SavePrimitive(std::ostream &out, Option_t *option = "") override;
void SetHistogram(TH1F *hist);
virtual void SetMaximum(Double_t maximum=-1111);
virtual void SetMinimum(Double_t minimum=-1111);

Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3266,7 +3266,7 @@ void TEfficiency::SavePrimitive(std::ostream& out,Option_t* option)
TH1::SavePrimitiveFunctions(out, name, fFunctions);

//set style
SaveFillAttributes(out, name);
SaveFillAttributes(out, name, -1, -1);
SaveLineAttributes(out, name);
SaveMarkerAttributes(out, name);

Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TF3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ void TF3::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
out << f3Name << " = new TF3(\"" << GetName() << "\", " << GetTitle() << "," << fXmin << "," << fXmax << ","
<< fYmin << "," << fYmax << "," << fZmin << "," << fZmax << "," << GetNpar() << ");\n";

SaveFillAttributes(out, f3Name, 0, 1001);
SaveFillAttributes(out, f3Name, -1, 0);
SaveMarkerAttributes(out, f3Name, 1, 1, 1);
SaveLineAttributes(out, f3Name, 1, 1, 4);

Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TGraph.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ you can either start canvas in web mode, or keep in classic mode but predefine t
\code{.cpp}
TGraph gr;
for(auto i = 0; i < 100; ++i) gr.AddPoint(i,i);
gr.AddPoint(10000, 0);
gr.AddPoint(10000, 0);
// If one draws here, one can not zoom between x = 0 and x = 50, since first bin goes from x = 0 to 100.
auto h1 = new TH1F("hist", "hist", 10000, -10., 11000.); // Define underlying hist with 10000 instead of 101 bins
h1->SetMaximum(120);
Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TH1.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7466,7 +7466,7 @@ void TH1::SavePrimitiveHelp(std::ostream &out, const char *hname, Option_t *opti
SavePrimitiveFunctions(out, hname, fFunctions);

// save attributes
SaveFillAttributes(out, hname, 0, 1001);
SaveFillAttributes(out, hname, -1, -1);
SaveLineAttributes(out, hname, 1, 1, 1);
SaveMarkerAttributes(out, hname, 1, 1, 1);
fXaxis.SaveAttributes(out, hname, "->GetXaxis()");
Expand Down
31 changes: 22 additions & 9 deletions hist/hist/src/TMultiGraph.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,6 +1594,8 @@ void TMultiGraph::RecursiveRemove(TObject *obj)

void TMultiGraph::SavePrimitive(std::ostream &out, Option_t *option)
{
thread_local Int_t frameNumber = 0;

SavePrimitiveConstructor(out, Class(), "multigraph");
SavePrimitiveNameTitle(out, "multigraph");

Expand All @@ -1602,21 +1604,22 @@ void TMultiGraph::SavePrimitive(std::ostream &out, Option_t *option)
while (auto g = iter())
g->SavePrimitive(out, TString::Format("multigraph%s", iter.GetOption()).Data());

if (fHistogram) {
TString hname = fHistogram->GetName();
fHistogram->SetName(TString::Format("MGraph_histogram%d", ++frameNumber).Data());
fHistogram->SavePrimitive(out, "nodraw");
out << " " << fHistogram->GetName() << "->GetXaxis()->SetLimits(" << fHistogram->GetXaxis()->GetXmin() << ", " << fHistogram->GetXaxis()->GetXmax() << ");\n";
out << " multigraph->SetHistogram(" << fHistogram->GetName() << ");\n";
out << " \n";
fHistogram->SetName(hname.Data());
}

const char *l = strstr(option, "th2poly");
if (l)
out << " " << l + 7 << "->AddBin(multigraph);\n";
else
SavePrimitiveDraw(out, "multigraph", option);

TAxis *xaxis = GetXaxis();
TAxis *yaxis = GetYaxis();

if (xaxis) {
out << " multigraph->GetXaxis()->SetLimits(" << xaxis->GetXmin() << ", " << xaxis->GetXmax() << ");\n";
xaxis->SaveAttributes(out, "multigraph", "->GetXaxis()");
}
if (yaxis)
yaxis->SaveAttributes(out, "multigraph", "->GetYaxis()");
if (fMinimum != -1111)
out << " multigraph->SetMinimum(" << fMinimum << ");\n";
if (fMaximum != -1111)
Expand All @@ -1643,6 +1646,16 @@ void TMultiGraph::SetMinimum(Double_t minimum)
}


////////////////////////////////////////////////////////////////////////////////
/// Set histogram which will be used for axes painting

void TMultiGraph::SetHistogram(TH1F *hist)
{
delete fHistogram;
fHistogram = hist;
}


////////////////////////////////////////////////////////////////////////////////
/// Get iterator over internal graphs list.

Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TScatter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void TScatter::SavePrimitive(std::ostream &out, Option_t *option)
kFALSE);

SavePrimitiveNameTitle(out, "scat");
SaveFillAttributes(out, "scat", 0, 1001);
SaveFillAttributes(out, "scat", -1, -1);
SaveLineAttributes(out, "scat", 1, 1, 1);
SaveMarkerAttributes(out, "scat", 1, 1, 1);

Expand Down
2 changes: 1 addition & 1 deletion hist/hist/src/TScatter2D.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ void TScatter2D::SavePrimitive(std::ostream &out, Option_t *option /*= ""*/)
kFALSE);

SavePrimitiveNameTitle(out, "scat");
SaveFillAttributes(out, "scat", 0, 1001);
SaveFillAttributes(out, "scat", -1, -1);
SaveLineAttributes(out, "scat", 1, 1, 1);
SaveMarkerAttributes(out, "scat", 1, 1, 1);

Expand Down
4 changes: 2 additions & 2 deletions hist/hist/src/TSpline.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ void TSpline3::SavePrimitive(std::ostream &out, Option_t *option)

out << " spline3->SetName(\"" << TString(GetName()).ReplaceSpecialCppChars() << "\");\n";

SaveFillAttributes(out, "spline3", 0, 1001);
SaveFillAttributes(out, "spline3", 0, 1);
SaveLineAttributes(out, "spline3", 1, 1, 1);
SaveMarkerAttributes(out, "spline3", 1, 1, 1);
if (fNpx != 100)
Expand Down Expand Up @@ -1776,7 +1776,7 @@ void TSpline5::SavePrimitive(std::ostream &out, Option_t *option)

out << " spline5->SetName(\"" << TString(GetName()).ReplaceSpecialCppChars() << "\");\n";

SaveFillAttributes(out, "spline5", 0, 1001);
SaveFillAttributes(out, "spline5", 0, 1);
SaveLineAttributes(out, "spline5", 1, 1, 1);
SaveMarkerAttributes(out, "spline5", 1, 1, 1);
if (fNpx != 100)
Expand Down
2 changes: 1 addition & 1 deletion hist/hist/test/test_MapCppName.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ TEST(TH1, MapCppNameTest)
if (!gSystem->GetPathInfo(CFile.Data(), fs))
FileSize = (Int_t)fs.fSize;

EXPECT_NEAR(FileSize, 5867, 200);
EXPECT_NEAR(FileSize, 6350, 200);

gSystem->Unlink(CFile.Data());
}
4 changes: 3 additions & 1 deletion hist/hist/test/test_TH1_SaveAs.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ struct TestSaveAs {
if (!infile) {
return false;
}
constexpr Int_t NC = 29; // lines in C file (excl. empty and commented out lines)
constexpr Int_t NC = 31; // lines in C file (excl. empty and commented out lines)
Int_t idx = 0;
TString ref[NC] = {"{",
" TH1D *h__1 = new TH1D(\"h\", \"h_title\", 5, 0, 5);",
Expand All @@ -143,6 +143,8 @@ struct TestSaveAs {
" h__1->SetBinError(5,2.7);",
" h__1->SetBinError(6,4.7);",
" h__1->SetEntries(7);",
" h__1->SetFillColor(0);",
" h__1->SetFillStyle(1001);",
" h__1->SetLineColor(TColor::GetColor(\"#000099\"));",
" h__1->GetXaxis()->SetLabelFont(42);",
" h__1->GetXaxis()->SetTitleOffset(1);",
Expand Down
Loading
Loading