kolan
/
Cairo-Chart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OK In progress...

This commit is contained in:
Kolan Sh 2018-01-23 13:40:45 +03:00
parent ca63a3af3b
commit dc60f2ea92
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Axis.vala
View File

@ -509,21 +509,15 @@ namespace CairoChart {
for (int sk = si; sk > sj; --sk) { for (int sk = si; sk > sj; --sk) {
var s3 = chart.series[sk]; var s3 = chart.series[sk];
if (!s3.zoom_show) continue; if (!s3.zoom_show) continue;
if (is_x) { Axis axis2, axis3;
if (Math.coord_cross(s2.axis_x.place.zmin, s2.axis_x.place.zmax, s3.axis_x.place.zmin, s3.axis_x.place.zmax) if (is_x) {axis2 = s2.axis_x; axis3 = s3.axis_x; }
|| s2.axis_x.position != s3.axis_x.position else {axis2 = s2.axis_y; axis3 = s3.axis_y; }
|| s2.axis_x.dtype != s3.axis_x.dtype) { if (Math.coord_cross(axis2.place.zmin, axis2.place.zmax, axis3.place.zmin, axis3.place.zmax)
|| axis2.position != axis3.position
|| axis2.dtype != axis3.dtype) {
has_intersection = true; has_intersection = true;
break; break;
} }
} else {
if (Math.coord_cross(s2.axis_y.place.zmin, s2.axis_y.place.zmax, s3.axis_y.place.zmin, s3.axis_y.place.zmax)
|| s2.axis_y.position != s3.axis_y.position
|| s2.axis_y.dtype != s3.axis_y.dtype) {
has_intersection = true;
break;
}
}
} }
if (!has_intersection) { if (!has_intersection) {
if (calc_max_values) { if (calc_max_values) {