|
1164 | 1164 | height = this.frame_height(), |
1165 | 1165 | pmain = this.main_painter(), |
1166 | 1166 | painter = this, |
1167 | | - findbin = null, best_dist2 = 1e10, best = null; |
| 1167 | + findbin = null, best_dist2 = 1e10, best = null, |
| 1168 | + msize = this.marker_size ? Math.round(this.marker_size/2 + 1.5) : 0; |
1168 | 1169 |
|
1169 | 1170 | this.draw_g.selectAll('.grpoint').each(function() { |
1170 | 1171 | var d = d3.select(this).datum(); |
|
1176 | 1177 | var rect = null; |
1177 | 1178 |
|
1178 | 1179 | if (d.error || d.rect || d.marker) { |
1179 | | - rect = { x1: Math.min(-painter.error_size, d.grx0), |
1180 | | - x2: Math.max(painter.error_size, d.grx2), |
1181 | | - y1: Math.min(-painter.error_size, d.gry2), |
1182 | | - y2: Math.max(painter.error_size, d.gry0) }; |
1183 | | - } else |
1184 | | - if (d.bar) { |
| 1180 | + rect = { x1: Math.min(-painter.error_size, d.grx0, -msize), |
| 1181 | + x2: Math.max(painter.error_size, d.grx2, msize), |
| 1182 | + y1: Math.min(-painter.error_size, d.gry2, -msize), |
| 1183 | + y2: Math.max(painter.error_size, d.gry0, msize) }; |
| 1184 | + } else if (d.bar) { |
1185 | 1185 | rect = { x1: -d.width/2, x2: d.width/2, y1: 0, y2: height - d.gry1 }; |
1186 | 1186 |
|
1187 | 1187 | if (painter.options.Bar===1) { |
|
1192 | 1192 | } else { |
1193 | 1193 | rect = { x1: -5, x2: 5, y1: -5, y2: 5 }; |
1194 | 1194 | } |
1195 | | - var matchx = (pnt.x >= d.grx1 + rect.x1) && (pnt.x <= d.grx1 + rect.x2); |
1196 | | - var matchy = (pnt.y >= d.gry1 + rect.y1) && (pnt.y <= d.gry1 + rect.y2); |
| 1195 | + var matchx = (pnt.x >= d.grx1 + rect.x1) && (pnt.x <= d.grx1 + rect.x2), |
| 1196 | + matchy = (pnt.y >= d.gry1 + rect.y1) && (pnt.y <= d.gry1 + rect.y2); |
1197 | 1197 |
|
1198 | 1198 | if (matchx && (matchy || (pnt.nproc > 1))) { |
1199 | 1199 | best_dist2 = dist2; |
|
0 commit comments