liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-02-22 07:06:17 +01:00
parent e720f576ca d2b4fe5e54
commit b3cfb6e04c
26 changed files with 304 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/edit.cc
View File

@@ -196,7 +196,7 @@ void Circle::drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffe
center_ += objectBuffer->getDataProvider()->posScreen + objectBuffer->getDataProvider()->deltaScreen;
}
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*M_PI);
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*rtengine::RT_PI);
cr->stroke();
}
}
@@ -230,7 +230,7 @@ void Circle::drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffe
}
if (filled && state != INSENSITIVE) {
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*M_PI);
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*rtengine::RT_PI);
if (innerLineWidth > 0.) {
cr->fill_preserve();
@@ -239,7 +239,7 @@ void Circle::drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffe
cr->fill();
}
} else if (innerLineWidth > 0.) {
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*M_PI);
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*rtengine::RT_PI);
if (state == INSENSITIVE) {
std::valarray<double> ds (1);
@@ -280,7 +280,8 @@ void Circle::drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short
cr->set_source_rgba (0., 0., 0., (id + 1) / 65535.);
}
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0, 2.*M_PI);
cr->arc (center_.x + 0.5, center_.y + 0.5, radius_, 0., 2.*rtengine::RT_PI);
if (filled) {
if (innerLineWidth > 0.) {