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-21 13:04:02 +03:00
parent 2059f787af
commit 2f0aa310b9
2 changed files with 30 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Area.vala
View File

@ -110,7 +110,6 @@ namespace CairoChart {
return zx1 - zx0;
}
set {
if (zx0 <= zx0 + value <= _x1)
zx1 = zx0 + value;
}
}
@ -123,7 +122,6 @@ namespace CairoChart {
return zy1 - zy0;
}
set {
if (zy0 <= zy0 + value <= _y1)
zy1 = zy0 + value;
}
}
@ -133,6 +131,17 @@ namespace CairoChart {
*/
public Area () { }
/**
* Constructs a new ``Area`` by other ``Area``.
* @param area ``Area`` instance.
*/
public Area.with_area (Area area) {
this.x0 = area.x0;
this.y0 = area.y0;
this.x1 = area.x1;
this.y1 = area.y1;
}
/**
* Constructs a new ``Area`` with absolute coordinates.
* @param x0 left bound.
@ -161,17 +170,6 @@ namespace CairoChart {
this.height = height;
}
/**
* Constructs a new ``Area`` by other ``Area``.
* @param area ``Area`` instance.
*/
public Area.with_area (Area area) {
this.x0 = area.x0;
this.y0 = area.y0;
this.x1 = area.x1;
this.y1 = area.y1;
}
/**
* Constructs a new ``Area`` by ``Cairo.Rectangle``.
* @param rectangle ``Cairo.Rectangle`` instance.

53
src/Range.vala
View File

@ -7,8 +7,16 @@ namespace CairoChart {
double _low = 0;
double _high = 1;
double _zlow = 0;
double _zhigh = 1;
/**
* Zoomed low bound.
*/
double zlow = 0;
/**
* Zoomed high bound.
*/
double zhigh = 1;
/**
* Low bound.
@ -18,7 +26,7 @@ namespace CairoChart {
return _low;
}
set {
_zlow = _low = value;
zlow = _low = value;
}
}
@ -30,33 +38,7 @@ namespace CairoChart {
return _high;
}
set {
_zhigh = _high = value;
}
}
/**
* Zoomed low bound.
*/
double zlow {
get {
return _zlow;
}
set {
if (_low <= value <= _high)
_zlow = value;
}
}
/**
* Zoomed high bound.
*/
double zhigh {
get {
return _zhigh;
}
set {
if (_low <= value <= _high)
_zhigh = value;
zhigh = _high = value;
}
}
@ -68,7 +50,7 @@ namespace CairoChart {
return _high - _low;
}
set {
_zhigh = _high = _low + value;
zhigh = _high = _low + value;
}
}
@ -77,11 +59,10 @@ namespace CairoChart {
*/
public double zrange {
get {
return _zhigh - _zlow;
return zhigh - zlow;
}
set {
if (_zlow <= _zlow + value <= _high)
_zhigh = _zlow + value;
zhigh = zlow + value;
}
}
@ -125,8 +106,8 @@ namespace CairoChart {
* Unzooms ``Range``.
*/
public void unzoom () {
_zlow = low;
_zhigh = high;
zlow = low;
zhigh = high;
}
}
}