From dcb9161ca77a7835ac52a99acdfef0e510fc4373 Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Tue, 11 Nov 2025 14:28:30 +0100 Subject: [PATCH 1/4] Improve the color palette usage when the palette is not defined --- documentation/doxygen/makeinput.sh | 122 ++++++++++++++--------------- graf2d/graf/src/TPie.cxx | 89 ++++++++++++++------- 2 files changed, 122 insertions(+), 89 deletions(-) diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index a980f6877b1eb..7072b0048d567 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -13,68 +13,68 @@ echo "INPUT = ./mainpage.md \\" > Doxyfile_INPUT ls $DOXYGEN_PYZDOC_PATH/*.pyzdoc | sed -e "s/$/ \\\\/" \ >> Doxyfile_INPUT -echo " ../../core/base/ \\" >> Doxyfile_INPUT -echo " ../../core/dictgen/ \\" >> Doxyfile_INPUT -echo " ../../core/cont/ \\" >> Doxyfile_INPUT -echo " ../../core/foundation/ \\" >> Doxyfile_INPUT -echo " ../../core/gui/ \\" >> Doxyfile_INPUT -echo " ../../core/macosx/ \\" >> Doxyfile_INPUT -echo " ../../core/meta/ \\" >> Doxyfile_INPUT -echo " ../../core/metacling/ \\" >> Doxyfile_INPUT -echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT -echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT -echo " ../../core/rint/ \\" >> Doxyfile_INPUT -echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT -echo " ../../core/thread/ \\" >> Doxyfile_INPUT -echo " ../../core/unix/ \\" >> Doxyfile_INPUT -echo " ../../core/winnt/ \\" >> Doxyfile_INPUT -echo " ../../core/imt/ \\" >> Doxyfile_INPUT -echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT -echo " ../../geom/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/cocoa/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/fitsio/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/gpad/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/gpadv7/ \\" >> Doxyfile_INPUT +# echo " ../../core/base/ \\" >> Doxyfile_INPUT +# echo " ../../core/dictgen/ \\" >> Doxyfile_INPUT +# echo " ../../core/cont/ \\" >> Doxyfile_INPUT +# echo " ../../core/foundation/ \\" >> Doxyfile_INPUT +# echo " ../../core/gui/ \\" >> Doxyfile_INPUT +# echo " ../../core/macosx/ \\" >> Doxyfile_INPUT +# echo " ../../core/meta/ \\" >> Doxyfile_INPUT +# echo " ../../core/metacling/ \\" >> Doxyfile_INPUT +# echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT +# echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT +# echo " ../../core/rint/ \\" >> Doxyfile_INPUT +# echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT +# echo " ../../core/thread/ \\" >> Doxyfile_INPUT +# echo " ../../core/unix/ \\" >> Doxyfile_INPUT +# echo " ../../core/winnt/ \\" >> Doxyfile_INPUT +# echo " ../../core/imt/ \\" >> Doxyfile_INPUT +# echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT +# echo " ../../geom/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/cocoa/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/fitsio/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/gpad/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/gpadv7/ \\" >> Doxyfile_INPUT echo " ../../graf2d/graf/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/gviz/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/postscript/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/quartz/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/win32gdk/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/x11/ \\" >> Doxyfile_INPUT -echo " ../../graf2d/x11ttf/ \\" >> Doxyfile_INPUT -echo " ../../graf3d/eve/ \\" >> Doxyfile_INPUT -echo " ../../graf3d/eve7/ \\" >> Doxyfile_INPUT -echo " ../../graf3d/g3d/ \\" >> Doxyfile_INPUT -echo " ../../graf3d/gl/ \\" >> Doxyfile_INPUT -echo " ../../graf3d/gviz3d/ \\" >> Doxyfile_INPUT -echo " ../../gui/ \\" >> Doxyfile_INPUT -echo " ../../hist/ \\" >> Doxyfile_INPUT -echo " ../../io/doc/TFile \\" >> Doxyfile_INPUT -echo " ../../io/dcache/ \\" >> Doxyfile_INPUT -echo " ../../io/io/ \\" >> Doxyfile_INPUT -echo " ../../io/sql/ \\" >> Doxyfile_INPUT -echo " ../../io/xml/ \\" >> Doxyfile_INPUT -echo " ../../io/xmlparser/ \\" >> Doxyfile_INPUT -echo " ../../main/src/hadd.cxx \\" >> Doxyfile_INPUT -echo " ../../math/ \\" >> Doxyfile_INPUT -echo " ../../montecarlo/ \\" >> Doxyfile_INPUT -echo " ../../net/doc/ \\" >> Doxyfile_INPUT -echo " ../../net/auth/ \\" >> Doxyfile_INPUT -echo " ../../net/davix/ \\" >> Doxyfile_INPUT -echo " ../../net/http/ \\" >> Doxyfile_INPUT -echo " ../../net/net/ \\" >> Doxyfile_INPUT -echo " ../../net/netxng/ \\" >> Doxyfile_INPUT -echo " ../../net/httpsniff/ \\" >> Doxyfile_INPUT -echo " ../../tmva/ \\" >> Doxyfile_INPUT -echo " ../../roofit/ \\" >> Doxyfile_INPUT -echo " ../../tree/ \\" >> Doxyfile_INPUT -echo " ../../sql/ \\" >> Doxyfile_INPUT -echo " ../../tutorials/ \\" >> Doxyfile_INPUT -echo " ../../bindings/tpython/ \\" >> Doxyfile_INPUT -echo " ../../bindings/pyroot/ \\" >> Doxyfile_INPUT -echo " ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__init__.py \\" >> Doxyfile_INPUT -echo " ../../bindings/r/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/gviz/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/postscript/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/quartz/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/win32gdk/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/x11/ \\" >> Doxyfile_INPUT +# echo " ../../graf2d/x11ttf/ \\" >> Doxyfile_INPUT +# echo " ../../graf3d/eve/ \\" >> Doxyfile_INPUT +# echo " ../../graf3d/eve7/ \\" >> Doxyfile_INPUT +# echo " ../../graf3d/g3d/ \\" >> Doxyfile_INPUT +# echo " ../../graf3d/gl/ \\" >> Doxyfile_INPUT +# echo " ../../graf3d/gviz3d/ \\" >> Doxyfile_INPUT +# echo " ../../gui/ \\" >> Doxyfile_INPUT +# echo " ../../hist/ \\" >> Doxyfile_INPUT +# echo " ../../io/doc/TFile \\" >> Doxyfile_INPUT +# echo " ../../io/dcache/ \\" >> Doxyfile_INPUT +# echo " ../../io/io/ \\" >> Doxyfile_INPUT +# echo " ../../io/sql/ \\" >> Doxyfile_INPUT +# echo " ../../io/xml/ \\" >> Doxyfile_INPUT +# echo " ../../io/xmlparser/ \\" >> Doxyfile_INPUT +# echo " ../../main/src/hadd.cxx \\" >> Doxyfile_INPUT +# echo " ../../math/ \\" >> Doxyfile_INPUT +# echo " ../../montecarlo/ \\" >> Doxyfile_INPUT +# echo " ../../net/doc/ \\" >> Doxyfile_INPUT +# echo " ../../net/auth/ \\" >> Doxyfile_INPUT +# echo " ../../net/davix/ \\" >> Doxyfile_INPUT +# echo " ../../net/http/ \\" >> Doxyfile_INPUT +# echo " ../../net/net/ \\" >> Doxyfile_INPUT +# echo " ../../net/netxng/ \\" >> Doxyfile_INPUT +# echo " ../../net/httpsniff/ \\" >> Doxyfile_INPUT +# echo " ../../tmva/ \\" >> Doxyfile_INPUT +# echo " ../../roofit/ \\" >> Doxyfile_INPUT +# echo " ../../tree/ \\" >> Doxyfile_INPUT +# echo " ../../sql/ \\" >> Doxyfile_INPUT +# echo " ../../tutorials/ \\" >> Doxyfile_INPUT +# echo " ../../bindings/tpython/ \\" >> Doxyfile_INPUT +# echo " ../../bindings/pyroot/ \\" >> Doxyfile_INPUT +# echo " ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__init__.py \\" >> Doxyfile_INPUT +# echo " ../../bindings/r/ \\" >> Doxyfile_INPUT # echo " ../../core/clib/ \\" >> Doxyfile_INPUT # echo " ../../core/lzma/ \\" >> Doxyfile_INPUT diff --git a/graf2d/graf/src/TPie.cxx b/graf2d/graf/src/TPie.cxx index 0abc96eb30c9c..59dc460c738eb 100644 --- a/graf2d/graf/src/TPie.cxx +++ b/graf2d/graf/src/TPie.cxx @@ -31,13 +31,66 @@ /** \class TPie \ingroup BasicGraphics -Draw a Pie Chart, +Define a Pie Chart + +\anchor PIE00 +#### The possible drawing options are: + +| Option | Description | +|--------|-------------------------------------------------------------------| +| "R" | Print the labels along the central "R"adius of slices. | +| "T" | Print the label in a direction "T"angent to circle that describes the TPie. | +| "SC" | Paint the labels with the "S"ame "C"olor as the slices. | +| "3D" | Draw the pie-chart with a pseudo 3D effect. | +| "NOL" | No OutLine: Don't draw the slices' outlines, any property over the slices' line is ignored. | +| ">" | Sort the slices in increasing order. | +| "<" | Sort the slices in decreasing order. | + +After the use of > or < options the internal order of the TPieSlices is changed. + +\anchor PIE01 +#### Labels format +The labels' format can be changed with TPie::SetLabelFormat(). + +The format string must contain one of these modifiers: + +| Modifier | Description | +|----------|-------------------------------------------------------------------| +| "%txt" | to print the text label associated with the slice | +| "%val" | to print the numeric value of the slice | +| "%frac" | to print the relative fraction of this slice | +| "%perc" | to print the % of this slice | Example: +``` +mypie->SetLabelFormat("%txt (%frac)"); +``` + +If the colors are not specified (`nullptr`) they are automatically +taken from the current color palette as shown in the following example. + +Begin_Macro(source) +{ + float vals[] = {10., 2., 5., 7.5}; + const char* labels[]={"Label 1","Label 2","Label 3","Label4"}; + + auto C = new TCanvas("C","TPie test",500,500); + auto pie = new TPie("pie", "Pie Title", 4, vals, nullptr, labels); + pie->SetTextFont(42); + pie->SetTextSize(0.04); + pie->SetLabelFormat("#splitline{%txt}{%perc}"); + pie->SetLabelsOffset(.02); + pie->SetRadius(.3); + pie->Draw(""); +} +End_Macro + +More complex example: Begin_Macro(source) ../../../tutorials/visualisation/graphics/piechart.C End_Macro + */ Double_t gX = 0; // Temporary pie X position. @@ -739,6 +792,8 @@ void TPie::Init(Int_t np, Double_t ao, Double_t x, Double_t y, Double_t r) fPieSlices = new TPieSlice*[fNvals]; + Int_t ic = 0, dc = gStyle->GetNumberOfColors()/fNvals; + for (Int_t i=0;iSetLineColor(1); fPieSlices[i]->SetLineStyle(1); fPieSlices[i]->SetLineWidth(1); - fPieSlices[i]->SetFillColor(gStyle->GetColorPalette(i)); + fPieSlices[i]->SetFillColor(gStyle->GetColorPalette(ic)); + ic = TMath::Min(gStyle->GetNumberOfColors(), ic+dc); fPieSlices[i]->SetFillStyle(1001); } @@ -782,23 +838,7 @@ TLegend* TPie::MakeLegend(Double_t x1, Double_t y1, Double_t x2, Double_t y2, co //////////////////////////////////////////////////////////////////////////////// /// Paint a Pie chart in a canvas. -/// The possible option are: -/// -/// - "R" Print the labels along the central "R"adius of slices. -/// - "T" Print the label in a direction "T"angent to circle that describes -/// the TPie. -/// - "SC" Paint the labels with the "S"ame "C"olor as the slices. -/// - "3D" Draw the pie-chart with a pseudo 3D effect. -/// - "NOL" No OutLine: Don't draw the slices' outlines, any property over the -/// slices' line is ignored. -/// - ">" Sort the slices in increasing order. -/// - "<" Sort the slices in decreasing order. -/// -/// After the use of > or < options the internal order of the TPieSlices -/// is changed. -/// -/// Other options changing the labels' format are described in -/// TPie::SetLabelFormat(). +/// [See the class description for the possible drawing options](\ref PIE00) void TPie::Paint(Option_t *option) { @@ -1268,15 +1308,8 @@ void TPie::SetHeight(Double_t val/*=20*/) } //////////////////////////////////////////////////////////////////////////////// -/// This method is used to customize the label format. The format string -/// must contain one of these modifiers: -/// -/// - %txt : to print the text label associated with the slice -/// - %val : to print the numeric value of the slice -/// - %frac : to print the relative fraction of this slice -/// - %perc : to print the % of this slice -/// -/// ex. : mypie->SetLabelFormat("%txt (%frac)"); +/// This method is used to customize the label format. +/// [See the class description for the possible labels format](\ref PIE01) void TPie::SetLabelFormat(const char *fmt) { From 3a11cb4536f018a9103ef2a8d89d58082e778d16 Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Tue, 11 Nov 2025 14:45:03 +0100 Subject: [PATCH 2/4] fix wrong comit --- documentation/doxygen/makeinput.sh | 122 ++++++++++++++--------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index 7072b0048d567..a980f6877b1eb 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -13,68 +13,68 @@ echo "INPUT = ./mainpage.md \\" > Doxyfile_INPUT ls $DOXYGEN_PYZDOC_PATH/*.pyzdoc | sed -e "s/$/ \\\\/" \ >> Doxyfile_INPUT -# echo " ../../core/base/ \\" >> Doxyfile_INPUT -# echo " ../../core/dictgen/ \\" >> Doxyfile_INPUT -# echo " ../../core/cont/ \\" >> Doxyfile_INPUT -# echo " ../../core/foundation/ \\" >> Doxyfile_INPUT -# echo " ../../core/gui/ \\" >> Doxyfile_INPUT -# echo " ../../core/macosx/ \\" >> Doxyfile_INPUT -# echo " ../../core/meta/ \\" >> Doxyfile_INPUT -# echo " ../../core/metacling/ \\" >> Doxyfile_INPUT -# echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT -# echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT -# echo " ../../core/rint/ \\" >> Doxyfile_INPUT -# echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT -# echo " ../../core/thread/ \\" >> Doxyfile_INPUT -# echo " ../../core/unix/ \\" >> Doxyfile_INPUT -# echo " ../../core/winnt/ \\" >> Doxyfile_INPUT -# echo " ../../core/imt/ \\" >> Doxyfile_INPUT -# echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT -# echo " ../../geom/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/cocoa/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/fitsio/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/gpad/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/gpadv7/ \\" >> Doxyfile_INPUT +echo " ../../core/base/ \\" >> Doxyfile_INPUT +echo " ../../core/dictgen/ \\" >> Doxyfile_INPUT +echo " ../../core/cont/ \\" >> Doxyfile_INPUT +echo " ../../core/foundation/ \\" >> Doxyfile_INPUT +echo " ../../core/gui/ \\" >> Doxyfile_INPUT +echo " ../../core/macosx/ \\" >> Doxyfile_INPUT +echo " ../../core/meta/ \\" >> Doxyfile_INPUT +echo " ../../core/metacling/ \\" >> Doxyfile_INPUT +echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT +echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT +echo " ../../core/rint/ \\" >> Doxyfile_INPUT +echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT +echo " ../../core/thread/ \\" >> Doxyfile_INPUT +echo " ../../core/unix/ \\" >> Doxyfile_INPUT +echo " ../../core/winnt/ \\" >> Doxyfile_INPUT +echo " ../../core/imt/ \\" >> Doxyfile_INPUT +echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT +echo " ../../geom/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/cocoa/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/fitsio/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/gpad/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/gpadv7/ \\" >> Doxyfile_INPUT echo " ../../graf2d/graf/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/gviz/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/postscript/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/quartz/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/win32gdk/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/x11/ \\" >> Doxyfile_INPUT -# echo " ../../graf2d/x11ttf/ \\" >> Doxyfile_INPUT -# echo " ../../graf3d/eve/ \\" >> Doxyfile_INPUT -# echo " ../../graf3d/eve7/ \\" >> Doxyfile_INPUT -# echo " ../../graf3d/g3d/ \\" >> Doxyfile_INPUT -# echo " ../../graf3d/gl/ \\" >> Doxyfile_INPUT -# echo " ../../graf3d/gviz3d/ \\" >> Doxyfile_INPUT -# echo " ../../gui/ \\" >> Doxyfile_INPUT -# echo " ../../hist/ \\" >> Doxyfile_INPUT -# echo " ../../io/doc/TFile \\" >> Doxyfile_INPUT -# echo " ../../io/dcache/ \\" >> Doxyfile_INPUT -# echo " ../../io/io/ \\" >> Doxyfile_INPUT -# echo " ../../io/sql/ \\" >> Doxyfile_INPUT -# echo " ../../io/xml/ \\" >> Doxyfile_INPUT -# echo " ../../io/xmlparser/ \\" >> Doxyfile_INPUT -# echo " ../../main/src/hadd.cxx \\" >> Doxyfile_INPUT -# echo " ../../math/ \\" >> Doxyfile_INPUT -# echo " ../../montecarlo/ \\" >> Doxyfile_INPUT -# echo " ../../net/doc/ \\" >> Doxyfile_INPUT -# echo " ../../net/auth/ \\" >> Doxyfile_INPUT -# echo " ../../net/davix/ \\" >> Doxyfile_INPUT -# echo " ../../net/http/ \\" >> Doxyfile_INPUT -# echo " ../../net/net/ \\" >> Doxyfile_INPUT -# echo " ../../net/netxng/ \\" >> Doxyfile_INPUT -# echo " ../../net/httpsniff/ \\" >> Doxyfile_INPUT -# echo " ../../tmva/ \\" >> Doxyfile_INPUT -# echo " ../../roofit/ \\" >> Doxyfile_INPUT -# echo " ../../tree/ \\" >> Doxyfile_INPUT -# echo " ../../sql/ \\" >> Doxyfile_INPUT -# echo " ../../tutorials/ \\" >> Doxyfile_INPUT -# echo " ../../bindings/tpython/ \\" >> Doxyfile_INPUT -# echo " ../../bindings/pyroot/ \\" >> Doxyfile_INPUT -# echo " ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__init__.py \\" >> Doxyfile_INPUT -# echo " ../../bindings/r/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/gviz/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/postscript/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/quartz/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/win32gdk/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/x11/ \\" >> Doxyfile_INPUT +echo " ../../graf2d/x11ttf/ \\" >> Doxyfile_INPUT +echo " ../../graf3d/eve/ \\" >> Doxyfile_INPUT +echo " ../../graf3d/eve7/ \\" >> Doxyfile_INPUT +echo " ../../graf3d/g3d/ \\" >> Doxyfile_INPUT +echo " ../../graf3d/gl/ \\" >> Doxyfile_INPUT +echo " ../../graf3d/gviz3d/ \\" >> Doxyfile_INPUT +echo " ../../gui/ \\" >> Doxyfile_INPUT +echo " ../../hist/ \\" >> Doxyfile_INPUT +echo " ../../io/doc/TFile \\" >> Doxyfile_INPUT +echo " ../../io/dcache/ \\" >> Doxyfile_INPUT +echo " ../../io/io/ \\" >> Doxyfile_INPUT +echo " ../../io/sql/ \\" >> Doxyfile_INPUT +echo " ../../io/xml/ \\" >> Doxyfile_INPUT +echo " ../../io/xmlparser/ \\" >> Doxyfile_INPUT +echo " ../../main/src/hadd.cxx \\" >> Doxyfile_INPUT +echo " ../../math/ \\" >> Doxyfile_INPUT +echo " ../../montecarlo/ \\" >> Doxyfile_INPUT +echo " ../../net/doc/ \\" >> Doxyfile_INPUT +echo " ../../net/auth/ \\" >> Doxyfile_INPUT +echo " ../../net/davix/ \\" >> Doxyfile_INPUT +echo " ../../net/http/ \\" >> Doxyfile_INPUT +echo " ../../net/net/ \\" >> Doxyfile_INPUT +echo " ../../net/netxng/ \\" >> Doxyfile_INPUT +echo " ../../net/httpsniff/ \\" >> Doxyfile_INPUT +echo " ../../tmva/ \\" >> Doxyfile_INPUT +echo " ../../roofit/ \\" >> Doxyfile_INPUT +echo " ../../tree/ \\" >> Doxyfile_INPUT +echo " ../../sql/ \\" >> Doxyfile_INPUT +echo " ../../tutorials/ \\" >> Doxyfile_INPUT +echo " ../../bindings/tpython/ \\" >> Doxyfile_INPUT +echo " ../../bindings/pyroot/ \\" >> Doxyfile_INPUT +echo " ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__init__.py \\" >> Doxyfile_INPUT +echo " ../../bindings/r/ \\" >> Doxyfile_INPUT # echo " ../../core/clib/ \\" >> Doxyfile_INPUT # echo " ../../core/lzma/ \\" >> Doxyfile_INPUT From 886f98459bdf243b18126e64af3197d103f0b1aa Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Tue, 11 Nov 2025 15:01:03 +0100 Subject: [PATCH 3/4] Make sure dc is at leat 1 --- graf2d/graf/src/TPie.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graf2d/graf/src/TPie.cxx b/graf2d/graf/src/TPie.cxx index 59dc460c738eb..cfd099ab596d4 100644 --- a/graf2d/graf/src/TPie.cxx +++ b/graf2d/graf/src/TPie.cxx @@ -792,7 +792,7 @@ void TPie::Init(Int_t np, Double_t ao, Double_t x, Double_t y, Double_t r) fPieSlices = new TPieSlice*[fNvals]; - Int_t ic = 0, dc = gStyle->GetNumberOfColors()/fNvals; + Int_t ic = 0, dc = TMath::Max(1, gStyle->GetNumberOfColors()/fNvals); for (Int_t i=0;i Date: Wed, 12 Nov 2025 11:32:26 +0100 Subject: [PATCH 4/4] change svg ref file - Improve help --- graf2d/graf/src/TPie.cxx | 3 + test/svg_ref/piechart.svg | 208 +++++++++++++++++++------------------- 2 files changed, 107 insertions(+), 104 deletions(-) diff --git a/graf2d/graf/src/TPie.cxx b/graf2d/graf/src/TPie.cxx index cfd099ab596d4..24711d22c4a53 100644 --- a/graf2d/graf/src/TPie.cxx +++ b/graf2d/graf/src/TPie.cxx @@ -65,6 +65,9 @@ The format string must contain one of these modifiers: ``` mypie->SetLabelFormat("%txt (%frac)"); ``` +The numeric format in the label can be changed with TPie::SetFractionFormat. +The numeric format the slices' values can be changed with TPie::SetValueFormat. +The numeric format for the percent value of a slice can be changed with TPie::SetPercentFormat. If the colors are not specified (`nullptr`) they are automatically taken from the current color palette as shown in the following example. diff --git a/test/svg_ref/piechart.svg b/test/svg_ref/piechart.svg index 13c93e32ffc27..8e0d3e141a9b2 100644 --- a/test/svg_ref/piechart.svg +++ b/test/svg_ref/piechart.svg @@ -42,24 +42,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -69,24 +69,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -96,24 +96,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -123,24 +123,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -150,24 +150,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -177,24 +177,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -204,24 +204,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -231,24 +231,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -258,24 +258,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -285,24 +285,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -312,24 +312,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -339,24 +339,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -366,24 +366,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -393,24 +393,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -420,24 +420,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -447,24 +447,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -474,24 +474,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -501,24 +501,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -528,24 +528,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -555,24 +555,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -582,24 +582,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -609,24 +609,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -636,24 +636,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -663,24 +663,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -690,24 +690,24 @@ piechart.svg + -32z" fill="none" stroke="#0c5097"/> + fill="none" stroke="#0a7587"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34l -92, -13z" fill="none" stroke="#45914f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23l -64, 34z" fill="none" stroke="#b6931c"/> @@ -715,22 +715,22 @@ piechart.svg + fill="#1272d8"/> + fill="#0ea7c1"/> + 1.6l 1.8, 1.5l 1.9, 1.5l 2.0, 1.5l 2.1, 1.4l 2.2, 1.4l 2.3, 1.3l 2.4, 1.3l 2.5, 1.3l 2.6, 1.2l 64, -34z" fill="#76bd7f"/> + -0.164, -1.8l -0.303, -1.8l -0.442, -1.7l -0.580, -1.7l -0.718, -1.7l -0.854, -1.7l -0.989, -1.7l -1.1, -1.7l -1.3, -1.7l -1.4, -1.6l -1.5, -1.6l -1.6, -1.6l -1.8, -1.5l -82, 23z" fill="#e3c049"/>