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

In progress...

This commit is contained in:
Kolan Sh 2018-01-19 13:29:12 +03:00
parent 11b87fe895
commit 0a1ccba521
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Chart.vala
View File

@ -194,8 +194,10 @@ namespace CairoChart {
if (!s.zoom_show) continue; if (!s.zoom_show) continue;
var real_x0 = s.get_real_x (rect.x); var real_x0 = s.get_real_x (rect.x);
var real_x1 = s.get_real_x (rect.x + rect.width); var real_x1 = s.get_real_x (rect.x + rect.width);
var real_width = real_x1 - real_x0;
var real_y0 = s.get_real_y (rect.y); var real_y0 = s.get_real_y (rect.y);
var real_y1 = s.get_real_y (rect.y + rect.height); var real_y1 = s.get_real_y (rect.y + rect.height);
var real_height = real_y0 - real_y1;
// if selected square does not intersect with the series's square // if selected square does not intersect with the series's square
if ( real_x1 <= s.axis_x.zoom_min || real_x0 >= s.axis_x.zoom_max if ( real_x1 <= s.axis_x.zoom_min || real_x0 >= s.axis_x.zoom_max
|| real_y0 <= s.axis_y.zoom_min || real_y1 >= s.axis_y.zoom_max) { || real_y0 <= s.axis_y.zoom_min || real_y1 >= s.axis_y.zoom_max) {
@ -206,25 +208,25 @@ namespace CairoChart {
s.axis_x.zoom_min = real_x0; s.axis_x.zoom_min = real_x0;
s.place.zoom_x_min = 0.0; s.place.zoom_x_min = 0.0;
} else { } else {
s.place.zoom_x_min = (s.axis_x.zoom_min - real_x0) / (real_x1 - real_x0); s.place.zoom_x_min = (s.axis_x.zoom_min - real_x0) / real_width;
} }
if (real_x1 <= s.axis_x.zoom_max) { if (real_x1 <= s.axis_x.zoom_max) {
s.axis_x.zoom_max = real_x1; s.axis_x.zoom_max = real_x1;
s.place.zoom_x_max = 1.0; s.place.zoom_x_max = 1.0;
} else { } else {
s.place.zoom_x_max = (s.axis_x.zoom_max - real_x0) / (real_x1 - real_x0); s.place.zoom_x_max = (s.axis_x.zoom_max - real_x0) / real_width;
} }
if (real_y1 >= s.axis_y.zoom_min) { if (real_y1 >= s.axis_y.zoom_min) {
s.axis_y.zoom_min = real_y1; s.axis_y.zoom_min = real_y1;
s.place.zoom_y_min = 0.0; s.place.zoom_y_min = 0.0;
} else { } else {
s.place.zoom_y_min = (s.axis_y.zoom_min - real_y1) / (real_y0 - real_y1); s.place.zoom_y_min = (s.axis_y.zoom_min - real_y1) / real_height;
} }
if (real_y0 <= s.axis_y.zoom_max) { if (real_y0 <= s.axis_y.zoom_max) {
s.axis_y.zoom_max = real_y0; s.axis_y.zoom_max = real_y0;
s.place.zoom_y_max = 1.0; s.place.zoom_y_max = 1.0;
} else { } else {
s.place.zoom_y_max = (s.axis_y.zoom_max - real_y1) / (real_y0 - real_y1); s.place.zoom_y_max = (s.axis_y.zoom_max - real_y1) / real_height;
} }
} }