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

Cosmetic change to histogram: added padding. Some minor code improvement

Browse Source
This commit is contained in:
Thanatomanic 2020-07-12 07:01:51 +02:00
parent dd7fd08f93
commit dced61b619
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rtgui/histogrampanel.cc
View File

@ -826,31 +826,29 @@ void HistogramArea::updateBackBuffer ()
int nrOfVGridPartitions = 8; // always show 8 stops (lines at 1,3,7,15,31,63,127) int nrOfVGridPartitions = 8; // always show 8 stops (lines at 1,3,7,15,31,63,127)
// draw vertical gridlines // draw vertical gridlines
if (options.histogramDrawMode < 2) { for (int i = 0; i <= nrOfVGridPartitions; i++) {
for (int i = 1; i < nrOfVGridPartitions; i++) { double xpos = padding + 0.5;
cr->move_to ((pow(2.0,i) - 1) / 255.0 * w + 0.5, 0.); if (options.histogramDrawMode < 2) {
cr->line_to ((pow(2.0,i) - 1) / 255.0 * w + 0.5, h); xpos += (pow(2.0,i) - 1) * (w - padding * 2.0) / 255.0;
cr->stroke (); } else {
} xpos += HistogramScaling::log (255, pow(2.0,i) - 1) * (w - padding * 2.0) / 255.0;
} else {
for (int i = 1; i < nrOfVGridPartitions; i++) {
cr->move_to (HistogramScaling::log (255, pow(2.0,i) - 1) / 255.0 * w + 0.5, 0.);
cr->line_to (HistogramScaling::log (255, pow(2.0,i) - 1) / 255.0 * w + 0.5, h);
cr->stroke ();
} }
cr->move_to (xpos, 0.);
cr->line_to (xpos, h);
cr->stroke ();
} }
// draw horizontal gridlines // draw horizontal gridlines
if (options.histogramDrawMode == 0) { if (options.histogramDrawMode == 0) {
for (int i = 1; i < nrOfHGridPartitions; i++) { for (int i = 1; i < nrOfHGridPartitions; i++) {
cr->move_to (0., i * (double)h / nrOfHGridPartitions + 0.5); cr->move_to (padding, i * (double)h / nrOfHGridPartitions + 0.5);
cr->line_to (w, i * (double)h / nrOfHGridPartitions + 0.5); cr->line_to (w - padding, i * (double)h / nrOfHGridPartitions + 0.5);
cr->stroke (); cr->stroke ();
} }
} else { } else {
for (int i = 1; i < nrOfHGridPartitions; i++) { for (int i = 1; i < nrOfHGridPartitions; i++) {
cr->move_to (0., h - HistogramScaling::log (h, i * (double)h / nrOfHGridPartitions) + 0.5*s); cr->move_to (padding, h - HistogramScaling::log (h, i * (double)h / nrOfHGridPartitions) + 0.5);
cr->line_to (w, h - HistogramScaling::log (h, i * (double)h / nrOfHGridPartitions) + 0.5*s); cr->line_to (w - padding, h - HistogramScaling::log (h, i * (double)h / nrOfHGridPartitions) + 0.5);
cr->stroke (); cr->stroke ();
} }
} }
@ -988,7 +986,7 @@ void HistogramArea::drawCurve(Cairo::RefPtr<Cairo::Context> &cr,
double s = RTScalable::getScale(); double s = RTScalable::getScale();
cr->set_line_width(s); cr->set_line_width(s);
cr->move_to (0, vsize - 1); cr->move_to (padding, vsize - 1);
scale = scale <= 0.0 ? 0.001 : scale; // avoid division by zero and negative values scale = scale <= 0.0 ? 0.001 : scale; // avoid division by zero and negative values
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
@ -1003,13 +1001,13 @@ void HistogramArea::drawCurve(Cairo::RefPtr<Cairo::Context> &cr,
iscaled = HistogramScaling::log (255.0, (double)i); iscaled = HistogramScaling::log (255.0, (double)i);
} }
double posX = (iscaled / 255.0) * (hsize - 1); double posX = padding + iscaled * (hsize - padding * 2.0) / 255.0;
double posY = vsize - 2 + val * (4 - vsize) / vsize; double posY = vsize - 2 + val * (4 - vsize) / vsize;
cr->line_to (posX, posY); cr->line_to (posX, posY);
} }
cr->line_to (hsize - 1, vsize - 1); cr->line_to (hsize - padding, vsize - 1);
} }
void HistogramArea::drawMarks(Cairo::RefPtr<Cairo::Context> &cr, void HistogramArea::drawMarks(Cairo::RefPtr<Cairo::Context> &cr,
@ -1018,11 +1016,11 @@ void HistogramArea::drawMarks(Cairo::RefPtr<Cairo::Context> &cr,
int s = 8 * RTScalable::getScale(); int s = 8 * RTScalable::getScale();
if(data[0] > scale) { if(data[0] > scale) {
cr->rectangle(0, (ui++)*s, s, s); cr->rectangle(padding, (ui++)*s, s, s);
} }
if(data[255] > scale) { if(data[255] > scale) {
cr->rectangle(hsize - s, (oi++)*s, s, s); cr->rectangle(hsize - s - padding, (oi++)*s, s, s);
} }
cr->fill(); cr->fill();

2
rtgui/histogrampanel.h
View File

@ -138,6 +138,8 @@ protected:
bool rawMode; bool rawMode;
bool isPressed; bool isPressed;
double movingPosition; double movingPosition;
double padding = 5.0;
HistogramAreaIdleHelper* haih; HistogramAreaIdleHelper* haih;