Skip to content

Commit c0e2271

Browse files
committed
Fix - correct names of v7 classes
1 parent 04e9345 commit c0e2271

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

scripts/JSRootPainter.v7.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2865,7 +2865,7 @@
28652865

28662866
if (arr)
28672867
for (var n=0;n<arr.length;++n)
2868-
if (arr[n] && arr[n]._typename != "ROOT::Experimental::TPadDisplayItem") return true;
2868+
if (arr[n] && arr[n]._typename != "ROOT::Experimental::RPadDisplayItem") return true;
28692869

28702870
return false;
28712871
}
@@ -3154,15 +3154,15 @@
31543154

31553155
if (objpainter) {
31563156

3157-
if (snap._typename == "ROOT::Experimental::TPadDisplayItem") // subpad
3157+
if (snap._typename == "ROOT::Experimental::RPadDisplayItem") // subpad
31583158
return objpainter.RedrawPadSnap(snap, draw_callback);
31593159

31603160
if (objpainter.UpdateObject(snap.fObject, snap.fOption || "")) objpainter.Redraw();
31613161

31623162
continue; // call next
31633163
}
31643164

3165-
if (snap._typename == "ROOT::Experimental::TPadDisplayItem") { // subpad
3165+
if (snap._typename == "ROOT::Experimental::RPadDisplayItem") { // subpad
31663166

31673167
var subpad = snap; // not subpad, but just attributes
31683168

@@ -4110,10 +4110,10 @@
41104110
return painter;
41114111
}
41124112

4113-
// JSROOT.addDrawFunc({ name: "ROOT::Experimental::TPadDisplayItem", icon: "img_canvas", func: drawPad, opt: "" });
4113+
// JSROOT.addDrawFunc({ name: "ROOT::Experimental::RPadDisplayItem", icon: "img_canvas", func: drawPad, opt: "" });
41144114

4115-
JSROOT.addDrawFunc({ name: "ROOT::Experimental::THistDrawable<1>", icon: "img_histo1d", prereq: "v7hist", func: "JSROOT.v7.drawHist1", opt: "" });
4116-
JSROOT.addDrawFunc({ name: "ROOT::Experimental::THistDrawable<2>", icon: "img_histo2d", prereq: "v7hist", func: "JSROOT.v7.drawHist2", opt: "" });
4115+
JSROOT.addDrawFunc({ name: "ROOT::Experimental::RHistDrawable<1>", icon: "img_histo1d", prereq: "v7hist", func: "JSROOT.v7.drawHist1", opt: "" });
4116+
JSROOT.addDrawFunc({ name: "ROOT::Experimental::RHistDrawable<2>", icon: "img_histo2d", prereq: "v7hist", func: "JSROOT.v7.drawHist2", opt: "" });
41174117
JSROOT.addDrawFunc({ name: "ROOT::Experimental::RText", icon: "img_text", prereq: "v7more", func: "JSROOT.v7.drawText", opt: "", direct: true });
41184118
JSROOT.addDrawFunc({ name: "ROOT::Experimental::RLine", icon: "img_graph", prereq: "v7more", func: "JSROOT.v7.drawLine", opt: "", direct: true });
41194119
JSROOT.addDrawFunc({ name: "ROOT::Experimental::RMarker", icon: "img_graph", prereq: "v7more", func: "JSROOT.v7.drawMarker", opt: "", direct: true });

scripts/JSRootPainter.v7hist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
}
208208
if (!axis || axis.GetBinCoord) return axis;
209209

210-
if (axis._typename == "ROOT::Experimental::TAxisEquidistant") {
210+
if (axis._typename == "ROOT::Experimental::RAxisEquidistant") {
211211
axis.min = axis.fLow;
212212
axis.max = axis.fLow + (axis.fNBins-2)/axis.fInvBinWidth;
213213

0 commit comments

Comments
 (0)