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

fixed broken labgrid after previous commit

Browse Source
This commit is contained in:
Alberto Griggio 2018-10-30 22:30:12 +01:00
parent 74a467fb4e
commit 4eb93c24f8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/colortoning.cc
View File

@ -1493,6 +1493,12 @@ bool hasMask(const std::vector<double> &dflt, const std::vector<double> &mask)
} }
} }
inline float round_ab(float v)
{
return int(v * 1000) / 1000.f;
}
} // namespace } // namespace
@ -1505,7 +1511,7 @@ void ColorToning::labRegionPopulateList()
for (size_t i = 0; i < labRegionData.size(); ++i) { for (size_t i = 0; i < labRegionData.size(); ++i) {
auto &r = labRegionData[i]; auto &r = labRegionData[i];
auto j = labRegionList->append(std::to_string(i+1)); auto j = labRegionList->append(std::to_string(i+1));
labRegionList->set_text(j, 1, Glib::ustring::compose("a=%1 b=%2 s=%3 l=%4", int(r.a), int(r.b), r.saturation, r.lightness)); labRegionList->set_text(j, 1, Glib::ustring::compose("a=%1 b=%2 s=%3 l=%4", round_ab(r.a), round_ab(r.b), r.saturation, r.lightness));
labRegionList->set_text( labRegionList->set_text(
j, 2, Glib::ustring::compose( j, 2, Glib::ustring::compose(
"%1%2%3", "%1%2%3",
@ -1532,7 +1538,7 @@ void ColorToning::labRegionShow(int idx, bool list_only)
labRegionChromaticityMask->setCurve(r.chromaticityMask); labRegionChromaticityMask->setCurve(r.chromaticityMask);
labRegionLightnessMask->setCurve(r.lightnessMask); labRegionLightnessMask->setCurve(r.lightnessMask);
} }
labRegionList->set_text(idx, 1, Glib::ustring::compose("a=%1 b=%2 s=%3 l=%4", int(r.a), int(r.b), r.saturation, r.lightness)); labRegionList->set_text(idx, 1, Glib::ustring::compose("a=%1 b=%2 s=%3 l=%4", round_ab(r.a), round_ab(r.b), r.saturation, r.lightness));
labRegionList->set_text( labRegionList->set_text(
idx, 2, Glib::ustring::compose( idx, 2, Glib::ustring::compose(
"%1%2%3", "%1%2%3",

2
rtgui/labgrid.cc
View File

@ -177,7 +177,7 @@ bool LabGrid::on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf)
cr->translate(0, height); cr->translate(0, height);
cr->scale(1., -1.); cr->scale(1., -1.);
const int cells = 8; const int cells = 8;
float step = 1.f / float(cells/2); float step = 12000.f / float(cells/2);
for (int j = 0; j < cells; j++) { for (int j = 0; j < cells; j++) {
for (int i = 0; i < cells; i++) { for (int i = 0; i < cells; i++) {
float R, G, B; float R, G, B;