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

Merge with 'Beep6581/dev'

Browse Source
This commit is contained in:
Pandagrapher
2023-04-29 11:24:55 +02:00
parent 23be310029 3d67ca450f
commit f7c25b18af
53 changed files with 1487 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/filmnegative.cc
View File

@@ -33,6 +33,12 @@ const Glib::ustring FilmNegative::TOOL_NAME = "filmnegative";
namespace
{
/**
* Observer to use for displaying the temperature and tint equivalent of the
* multipliers.
*/
constexpr rtengine::StandardObserver standard_observer = rtengine::ColorTemp::DEFAULT_OBSERVER;
double toAdjuster(double v)
{
return CLAMP(std::log2(v), 6, 16) - 6;
@@ -154,7 +160,7 @@ RGB getFilmNegativeExponents(const RGB &ref1, const RGB &ref2) // , const RGB &c
void temp2rgb(double outLev, double temp, double green, RGB &refOut)
{
rtengine::ColorTemp ct = rtengine::ColorTemp(temp, green, 1., "Custom");
rtengine::ColorTemp ct = rtengine::ColorTemp(temp, green, 1., "Custom", standard_observer);
double rm, gm, bm;
ct.getMultipliers(rm, gm, bm);
@@ -175,7 +181,8 @@ void rgb2temp(const RGB &refOut, double &outLev, double &temp, double &green)
refOut.r / maxVal,
refOut.g / maxVal,
refOut.b / maxVal,
1.);
1.,
standard_observer);
outLev = maxVal;
temp = ct.getTemp();
@@ -188,7 +195,7 @@ void rgb2temp(const RGB &refOut, double &outLev, double &temp, double &green)
FilmNegative::FilmNegative() :
FoldableToolPanel(this, TOOL_NAME, M("TP_FILMNEGATIVE_LABEL"), false, true),
EditSubscriber(ET_OBJECTS),
NEUTRAL_TEMP(rtengine::ColorTemp(1., 1., 1., 1.)),
NEUTRAL_TEMP(rtengine::ColorTemp(1., 1., 1., 1., rtengine::ColorTemp::DEFAULT_OBSERVER)),
evFilmNegativeExponents(ProcEventMapper::getInstance()->newEvent(ALLNORAW, "HISTORY_MSG_FILMNEGATIVE_VALUES")),
evFilmNegativeEnabled(ProcEventMapper::getInstance()->newEvent(ALLNORAW, "HISTORY_MSG_FILMNEGATIVE_ENABLED")),
evFilmNegativeRefSpot(ProcEventMapper::getInstance()->newEvent(ALLNORAW, "HISTORY_MSG_FILMNEGATIVE_REF_SPOT")),