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

Change histogram v-gridlines to stops in all cases

Browse Source
This commit is contained in:
Thanatomanic
2018-07-11 08:13:11 +02:00
parent 531868b01a
commit 5cdbf9a49a
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/histogrampanel.cc
View File

@@ -883,30 +883,26 @@ void HistogramArea::updateBackBuffer ()
std::valarray<double> ch_ds (1); std::valarray<double> ch_ds (1);
ch_ds[0] = 4; ch_ds[0] = 4;
cr->set_dash (ch_ds, 0); cr->set_dash (ch_ds, 0);
// determine the number of gridlines based on current h/w // determine the number of h-gridlines based on current h
int nrOfHGridPartitions = (int)rtengine::min (16.0, pow (2.0, floor ((h - 100) / 250) + 2)); int nrOfHGridPartitions = (int)rtengine::min (16.0, pow (2.0, floor ((h - 100) / 250) + 2));
int nrOfVGridPartitions = (int)rtengine::min (16.0, pow (2.0, floor ((w - 100) / 250) + 2)); int nrOfVGridPartitions = 8; // always show 8 stops (lines at 1,3,7,15,31,63,127)
if (options.histogramDrawMode == 2) {
nrOfVGridPartitions = 8; // always show 8 stops in log-log mode (lines at 1,3,7,15,31,63,127)
}
// draw vertical gridlines // draw vertical gridlines
if (options.histogramDrawMode < 2) { if (options.histogramDrawMode < 2) {
for (int i = 1; i < nrOfVGridPartitions; i++) { for (int i = 1; i < nrOfVGridPartitions; i++) {
cr->move_to (i * w / nrOfVGridPartitions + 0.5, 1.5); cr->move_to ((pow(2.0,i) - 1) / 255 * w + 0.5, 1.5);
cr->line_to (i * w / nrOfVGridPartitions + 0.5, h - 2); cr->line_to ((pow(2.0,i) - 1) / 255 * w + 0.5, h - 2);
cr->stroke (); cr->stroke ();
} }
} else { } else {
for (int i = 1; i < nrOfVGridPartitions; i++) { for (int i = 1; i < nrOfVGridPartitions; i++) {
cr->move_to (scalingFunctionLog (255, pow(2.0,i) - 1) * w / 255 + 0.5, 1.5); cr->move_to (scalingFunctionLog (255, pow(2.0,i) - 1) / 255 * w + 0.5, 1.5);
cr->line_to (scalingFunctionLog (255, pow(2.0,i) - 1) * w / 255 + 0.5, h - 2); cr->line_to (scalingFunctionLog (255, pow(2.0,i) - 1) / 255 * w + 0.5, h - 2);
cr->stroke (); 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++) {
@@ -921,7 +917,7 @@ void HistogramArea::updateBackBuffer ()
cr->stroke (); cr->stroke ();
} }
} }
cr->unset_dash(); cr->unset_dash();
// Draw the frame's border // Draw the frame's border