Skip to content

Commit bb5efa0

Browse files
committed
Other small adjustments
1 parent 0855679 commit bb5efa0

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

scripts/JSRoot.hist3d.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,16 +3114,16 @@ JSROOT.define(['d3', 'painter', 'base3d', 'hist'], (d3, jsrp, THREE) => {
31143114

31153115
indx = this.index[indx];
31163116

3117-
let p = this.painter,
3118-
grx = p.grx(this.graph.fX[indx]),
3119-
gry = p.gry(this.graph.fY[indx]),
3120-
grz = p.grz(this.graph.fZ[indx]);
3117+
let p = this.painter, gr = this.graph,
3118+
grx = p.grx(gr.fX[indx]),
3119+
gry = p.gry(gr.fY[indx]),
3120+
grz = p.grz(gr.fZ[indx]);
31213121

3122-
if (this.check_next && indx+1<this.graph.fX.length) {
3122+
if (this.check_next && indx+1<gr.fX.length) {
31233123
let d = intersect.point,
3124-
grx1 = p.grx(this.graph.fX[indx+1]),
3125-
gry1 = p.gry(this.graph.fY[indx+1]),
3126-
grz1 = p.grz(this.graph.fZ[indx+1]);
3124+
grx1 = p.grx(gr.fX[indx+1]),
3125+
gry1 = p.gry(gr.fY[indx+1]),
3126+
grz1 = p.grz(gr.fZ[indx+1]);
31273127
if (sqr(d.x-grx1)+sqr(d.y-gry1)+sqr(d.z-grz1) < sqr(d.x-grx)+sqr(d.y-gry)+sqr(d.z-grz)) {
31283128
grx = grx1; gry = gry1; grz = grz1; indx++;
31293129
}
@@ -3139,9 +3139,9 @@ JSROOT.define(['d3', 'painter', 'base3d', 'hist'], (d3, jsrp, THREE) => {
31393139
color: this.tip_color,
31403140
lines: [ this.tip_name,
31413141
"pnt: " + indx,
3142-
"x: " + p.axisAsText("x", this.graph.fX[indx]),
3143-
"y: " + p.axisAsText("y", this.graph.fY[indx]),
3144-
"z: " + p.axisAsText("z", this.graph.fZ[indx])
3142+
"x: " + p.axisAsText("x", gr.fX[indx]),
3143+
"y: " + p.axisAsText("y", gr.fY[indx]),
3144+
"z: " + p.axisAsText("z", gr.fZ[indx])
31453145
]
31463146
};
31473147
}
@@ -3157,9 +3157,9 @@ JSROOT.define(['d3', 'painter', 'base3d', 'hist'], (d3, jsrp, THREE) => {
31573157

31583158
if (!graph || !main || !fp || !fp.mode3d) return;
31593159

3160-
function countSelected(zmin, zmax) {
3160+
let countSelected = (zmin, zmax) => {
31613161
let cnt = 0;
3162-
for (let i=0; i < graph.fNpoints; ++i) {
3162+
for (let i = 0; i < graph.fNpoints; ++i) {
31633163
if ((graph.fX[i] < fp.scale_xmin) || (graph.fX[i] > fp.scale_xmax) ||
31643164
(graph.fY[i] < fp.scale_ymin) || (graph.fY[i] > fp.scale_ymax) ||
31653165
(graph.fZ[i] < zmin) || (graph.fZ[i] >= zmax)) continue;

0 commit comments

Comments
 (0)