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

Add H-S and H-C vectorscopes

Browse Source
This commit is contained in:
Lawrence Lee
2020-08-03 18:23:25 -07:00
parent 6df69b3786
commit fbe73614c3
8 changed files with 299 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
rtengine/improccoordinator.cc
View File

@@ -1643,6 +1643,9 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
if (hListener->updateHistogram()) {
updateLRGBHistograms();
}
if (hListener->updateVectorscope()) {
updateVectorscope();
}
if (hListener->updateWaveform()) {
updateWaveforms();
}
@@ -1765,6 +1768,8 @@ void ImProcCoordinator::notifyHistogramChanged()
histBlueRaw,
histChroma,
histLRETI,
vectorscopeScale,
vectorscope,
waveformScale,
waveformWidth,
waveformRed.get(),
@@ -1835,6 +1840,55 @@ void ImProcCoordinator::updateLRGBHistograms()
}
void ImProcCoordinator::updateVectorscope()
{
if (!workimg) {
return;
}
int x1, y1, x2, y2;
params->crop.mapToResized(pW, pH, scale, x1, x2, y1, y2);
constexpr int size = HistogramListener::vectorscope_size;
memset(vectorscope, 0, size * size * sizeof(vectorscope[0][0]));
for (int i = y1; i < y2; i++) {
int ofs = (i * pW + x1) * 3;
for (int j = x1; j < x2; j++) {
switch (hListener->vectorscopeType()) {
case 0: {
// HS
int r = 256 * workimg->data[ofs++];
int g = 256 * workimg->data[ofs++];
int b = 256 * workimg->data[ofs++];
float h, s, l;
Color::rgb2hsl(r, g, b, h, s, l);
const int col = s * cos(2 * RT_PI * h) * (size / 2) + size / 2;
const int row = s * sin(2 * RT_PI * h) * (size / 2) + size / 2;
if (col >= 0 && col < size && row >= 0 && row < size) {
vectorscope[row][col]++;
}
break;
}
case 1: {
// CH
const int col = (size / 96000.0) * nprevl->a[i][j] + size / 2;
const int row = (size / 96000.0) * nprevl->b[i][j] + size / 2;
if (col >= 0 && col < size && row >= 0 && row < size) {
vectorscope[row][col]++;
}
break;
}
}
}
}
vectorscopeScale = workimg->getWidth() * workimg->getHeight();
}
void ImProcCoordinator::updateWaveforms()
{
if (!workimg) {
@@ -2314,7 +2368,7 @@ void ImProcCoordinator::setHighQualComputed()
highQualityComputed = true;
}
void ImProcCoordinator::updateWaveform()
void ImProcCoordinator::requestUpdateWaveform()
{
if (hListener) {
updateWaveforms();
@@ -2322,7 +2376,7 @@ void ImProcCoordinator::updateWaveform()
}
}
void ImProcCoordinator::updateHistogram()
void ImProcCoordinator::requestUpdateHistogram()
{
if (hListener) {
updateLRGBHistograms();
@@ -2330,4 +2384,12 @@ void ImProcCoordinator::updateHistogram()
}
}
void ImProcCoordinator::requestUpdateVectorscope()
{
if (hListener) {
updateVectorscope();
notifyHistogramChanged();
}
}
}