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

Add initial implementation of waveform

Browse Source
This commit is contained in:
Lawrence Lee
2020-07-21 22:45:10 -07:00
parent a18f17a476
commit 4cbd622569
10 changed files with 257 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
rtengine/improccoordinator.cc
View File

@@ -129,6 +129,8 @@ ImProcCoordinator::ImProcCoordinator() :
histLRETI(256),
waveformWidth(0),
CAMBrightCurveJ(), CAMBrightCurveQ(),
rCurve(),
@@ -1639,7 +1641,30 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
if (hListener) {
updateLRGBHistograms();
hListener->histogramChanged(histRed, histGreen, histBlue, histLuma, histToneCurve, histLCurve, histCCurve, /*histCLurve, histLLCurve,*/ histLCAM, histCCAM, histRedRaw, histGreenRaw, histBlueRaw, histChroma, histLRETI);
updateWaveforms();
hListener->histogramChanged(
histRed,
histGreen,
histBlue,
histLuma,
histToneCurve,
histLCurve,
histCCurve,
/*histCLurve,
* histLLCurve,*/
histLCAM,
histCCAM,
histRedRaw,
histGreenRaw,
histBlueRaw,
histChroma,
histLRETI,
waveformScale,
waveformWidth,
waveformRed.get(),
waveformGreen.get(),
waveformBlue.get()
);
}
}
@@ -1801,6 +1826,43 @@ void ImProcCoordinator::updateLRGBHistograms()
}
void ImProcCoordinator::updateWaveforms()
{
if (!workimg) {
waveformWidth = 0;
return;
}
if (waveformWidth != workimg->getWidth()) {
// Resize waveform arrays.
waveformWidth = workimg->getWidth();
waveformRed.reset(new int[waveformWidth][256]);
waveformGreen.reset(new int[waveformWidth][256]);
waveformBlue.reset(new int[waveformWidth][256]);
}
int (*red)[256] = waveformRed.get();
int (*green)[256] = waveformGreen.get();
int (*blue)[256] = waveformBlue.get();
// Start with zero.
const int waveformSize = 256 * waveformWidth;
memset(waveformRed.get(), 0, waveformSize * sizeof(red[0][0]));
memset(waveformGreen.get(), 0, waveformSize * sizeof(green[0][0]));
memset(waveformBlue.get(), 0, waveformSize * sizeof(blue[0][0]));
const int img_height = workimg->getHeight();
for (int col = 0; col < waveformWidth; col++) {
for (int row = 0; row < img_height; row++) {
red[col][workimg->r(row, col)]++;
green[col][workimg->g(row, col)]++;
blue[col][workimg->b(row, col)]++;
}
}
waveformScale = img_height;
}
bool ImProcCoordinator::getAutoWB(double& temp, double& green, double equal, double tempBias)
{