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

Merge branch 'dev' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre
2020-05-18 14:54:30 +02:00
parent 8b60ea4794 90180a7d1f
commit f42548b018
306 changed files with 20836 additions and 10481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
rtgui/filmnegative.cc
View File

@@ -44,6 +44,17 @@ Adjuster* createExponentAdjuster(AdjusterListener* listener, const Glib::ustring
return adj;
}
Glib::ustring formatBaseValues(const std::array<float, 3>& rgb)
{
if (rgb[0] <= 0.f && rgb[1] <= 0.f && rgb[2] <= 0.f) {
return "- - -";
} else {
return Glib::ustring::format(std::fixed, std::setprecision(1), rgb[0]) + " " +
Glib::ustring::format(std::fixed, std::setprecision(1), rgb[1]) + " " +
Glib::ustring::format(std::fixed, std::setprecision(1), rgb[2]);
}
}
}
FilmNegative::FilmNegative() :
@@ -51,12 +62,17 @@ FilmNegative::FilmNegative() :
EditSubscriber(ET_OBJECTS),
evFilmNegativeExponents(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_FILMNEGATIVE_VALUES")),
evFilmNegativeEnabled(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_FILMNEGATIVE_ENABLED")),
evFilmBaseValues(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_FILMNEGATIVE_FILMBASE")),
filmBaseValues({0.f, 0.f, 0.f}),
fnp(nullptr),
greenExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_GREEN"), 0.3, 4, 1.5)), // master exponent (green channel)
redRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_RED"), 0.3, 3, (2.04 / 1.5))), // ratio of red exponent to master exponent
blueRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_BLUE"), 0.3, 3, (1.29 / 1.5))), // ratio of blue exponent to master exponent
spotgrid(Gtk::manage(new Gtk::Grid())),
spotbutton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_PICK"))))
spotbutton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_PICK")))),
filmBaseLabel(Gtk::manage(new Gtk::Label(M("TP_FILMNEGATIVE_FILMBASE_VALUES"), Gtk::ALIGN_START))),
filmBaseValuesLabel(Gtk::manage(new Gtk::Label("- - -"))),
filmBaseSpotButton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_FILMBASE_PICK"))))
{
spotgrid->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(spotgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
@@ -64,7 +80,10 @@ FilmNegative::FilmNegative() :
setExpandAlignProperties(spotbutton, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
spotbutton->get_style_context()->add_class("independent");
spotbutton->set_tooltip_text(M("TP_FILMNEGATIVE_GUESS_TOOLTIP"));
spotbutton->set_image (*Gtk::manage (new RTImage ("color-picker-small.png")));
spotbutton->set_image(*Gtk::manage(new RTImage("color-picker-small.png")));
filmBaseSpotButton->set_tooltip_text(M("TP_FILMNEGATIVE_FILMBASE_TOOLTIP"));
setExpandAlignProperties(filmBaseValuesLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
// TODO make spot size configurable ?
@@ -81,7 +100,7 @@ FilmNegative::FilmNegative() :
// spotsize->set_active(0);
// spotsize->append ("4");
spotgrid->attach (*spotbutton, 0, 1, 1, 1);
spotgrid->attach(*spotbutton, 0, 1, 1, 1);
// spotgrid->attach (*slab, 1, 0, 1, 1);
// spotgrid->attach (*wbsizehelper, 2, 0, 1, 1);
@@ -90,13 +109,26 @@ FilmNegative::FilmNegative() :
pack_start(*blueRatio, Gtk::PACK_SHRINK, 0);
pack_start(*spotgrid, Gtk::PACK_SHRINK, 0);
Gtk::HSeparator* const sep = Gtk::manage(new Gtk::HSeparator());
sep->get_style_context()->add_class("grid-row-separator");
pack_start(*sep, Gtk::PACK_SHRINK, 0);
Gtk::Grid* const fbGrid = Gtk::manage(new Gtk::Grid());
fbGrid->attach(*filmBaseLabel, 0, 0, 1, 1);
fbGrid->attach(*filmBaseValuesLabel, 1, 0, 1, 1);
pack_start(*fbGrid, Gtk::PACK_SHRINK, 0);
pack_start(*filmBaseSpotButton, Gtk::PACK_SHRINK, 0);
spotbutton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::editToggled));
// spotsize->signal_changed().connect( sigc::mem_fun(*this, &WhiteBalance::spotSizeChanged) );
filmBaseSpotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::baseSpotToggled));
// Editing geometry; create the spot rectangle
Rectangle* const spotRect = new Rectangle();
spotRect->filled = false;
visibleGeometry.push_back(spotRect);
// Stick a dummy rectangle over the whole image in mouseOverGeometry.
@@ -134,6 +166,14 @@ void FilmNegative::read(const rtengine::procparams::ProcParams* pp, const Params
greenExp->setValue(pp->filmNegative.greenExp);
blueRatio->setValue(pp->filmNegative.blueRatio);
filmBaseValues[0] = pp->filmNegative.redBase;
filmBaseValues[1] = pp->filmNegative.greenBase;
filmBaseValues[2] = pp->filmNegative.blueBase;
// If base values are not set in params, estimated values will be passed in later
// (after processing) via FilmNegListener
filmBaseValuesLabel->set_text(formatBaseValues(filmBaseValues));
enableListener();
}
@@ -142,14 +182,23 @@ void FilmNegative::write(rtengine::procparams::ProcParams* pp, ParamsEdited* ped
pp->filmNegative.redRatio = redRatio->getValue();
pp->filmNegative.greenExp = greenExp->getValue();
pp->filmNegative.blueRatio = blueRatio->getValue();
pp->filmNegative.enabled = getEnabled();
if (pedited) {
pedited->filmNegative.redRatio = redRatio->getEditedState();
pedited->filmNegative.greenExp = greenExp->getEditedState();
pedited->filmNegative.blueRatio = blueRatio->getEditedState();
pedited->filmNegative.baseValues = filmBaseValues[0] != pp->filmNegative.redBase
|| filmBaseValues[1] != pp->filmNegative.greenBase
|| filmBaseValues[2] != pp->filmNegative.blueBase;
pedited->filmNegative.enabled = !get_inconsistent();
}
pp->filmNegative.redBase = filmBaseValues[0];
pp->filmNegative.greenBase = filmBaseValues[1];
pp->filmNegative.blueBase = filmBaseValues[2];
}
void FilmNegative::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
@@ -172,8 +221,8 @@ void FilmNegative::setDefaults(const rtengine::procparams::ProcParams* defParams
void FilmNegative::setBatchMode(bool batchMode)
{
if (batchMode) {
spotConn.disconnect();
removeIfThere(this, spotgrid, false);
removeIfThere(this, filmBaseSpotButton, false);
ToolPanel::setBatchMode(batchMode);
redRatio->showEditedCB();
greenExp->showEditedCB();
@@ -205,16 +254,20 @@ void FilmNegative::enabledChanged()
if (listener) {
if (get_inconsistent()) {
listener->panelChanged(evFilmNegativeEnabled, M("GENERAL_UNCHANGED"));
}
else if (getEnabled()) {
} else if (getEnabled()) {
listener->panelChanged(evFilmNegativeEnabled, M("GENERAL_ENABLED"));
}
else {
} else {
listener->panelChanged(evFilmNegativeEnabled, M("GENERAL_DISABLED"));
}
}
}
void FilmNegative::filmBaseValuesChanged(std::array<float, 3> rgb)
{
filmBaseValues = rgb;
filmBaseValuesLabel->set_text(formatBaseValues(filmBaseValues));
}
void FilmNegative::setFilmNegProvider(FilmNegProvider* provider)
{
fnp = provider;
@@ -227,7 +280,7 @@ void FilmNegative::setEditProvider(EditDataProvider* provider)
CursorShape FilmNegative::getCursor(int objectID, int xPos, int yPos) const
{
return CSSpotWB;
return CSSpotWB;
}
bool FilmNegative::mouseOver(int modifierKey)
@@ -246,31 +299,57 @@ bool FilmNegative::button1Pressed(int modifierKey)
EditSubscriber::action = EditSubscriber::Action::NONE;
if (listener) {
refSpotCoords.push_back(provider->posImage);
if (spotbutton->get_active()) {
if (refSpotCoords.size() == 2) {
// User has selected 2 reference gray spots. Calculating new exponents
// from channel values and updating parameters.
refSpotCoords.push_back(provider->posImage);
std::array<float, 3> newExps;
if (fnp->getFilmNegativeExponents(refSpotCoords[0], refSpotCoords[1], newExps)) {
if (refSpotCoords.size() == 2) {
// User has selected 2 reference gray spots. Calculating new exponents
// from channel values and updating parameters.
std::array<float, 3> newExps;
if (fnp->getFilmNegativeExponents(refSpotCoords[0], refSpotCoords[1], newExps)) {
disableListener();
// Leaving green exponent unchanged, setting red and blue exponents based on
// the ratios between newly calculated exponents.
redRatio->setValue(newExps[0] / newExps[1]);
blueRatio->setValue(newExps[2] / newExps[1]);
enableListener();
if (listener && getEnabled()) {
listener->panelChanged(
evFilmNegativeExponents,
Glib::ustring::compose(
"Ref=%1\nR=%2\nB=%3",
greenExp->getValue(),
redRatio->getValue(),
blueRatio->getValue()
)
);
}
}
switchOffEditMode();
}
} else if (filmBaseSpotButton->get_active()) {
std::array<float, 3> newBaseLev;
if (fnp->getRawSpotValues(provider->posImage, 32, newBaseLev)) {
disableListener();
// Leaving green exponent unchanged, setting red and blue exponents based on
// the ratios between newly calculated exponents.
redRatio->setValue(newExps[0] / newExps[1]);
blueRatio->setValue(newExps[2] / newExps[1]);
filmBaseValues = newBaseLev;
enableListener();
const Glib::ustring vs = formatBaseValues(filmBaseValues);
filmBaseValuesLabel->set_text(vs);
if (listener && getEnabled()) {
listener->panelChanged(
evFilmNegativeExponents,
Glib::ustring::compose(
"Ref=%1\nR=%2\nB=%3",
greenExp->getValue(),
redRatio->getValue(),
blueRatio->getValue()
)
);
listener->panelChanged(evFilmBaseValues, vs);
}
}
@@ -292,11 +371,38 @@ void FilmNegative::switchOffEditMode()
refSpotCoords.clear();
unsubscribe();
spotbutton->set_active(false);
filmBaseSpotButton->set_active(false);
}
void FilmNegative::editToggled()
{
if (spotbutton->get_active()) {
filmBaseSpotButton->set_active(false);
refSpotCoords.clear();
subscribe();
int w, h;
getEditProvider()->getImageSize(w, h);
// Stick a dummy rectangle over the whole image in mouseOverGeometry.
// This is to make sure the getCursor() call is fired everywhere.
Rectangle* const imgRect = static_cast<Rectangle*>(mouseOverGeometry.at(0));
imgRect->setXYWH(0, 0, w, h);
} else {
refSpotCoords.clear();
unsubscribe();
}
}
void FilmNegative::baseSpotToggled()
{
if (filmBaseSpotButton->get_active()) {
spotbutton->set_active(false);
refSpotCoords.clear();
subscribe();
int w, h;