22eee9787e
* Added new feature to calculate channel multipliers from crop area. This also saves the crop area channel medians to the processing profiles, in order to get a more consistent color balance when batch-applying the same profile to multiple pictures from the same film roll. * Fixed wrong initialization of array, and missing check for the result of `getFilmNegativeMedians()`. Moved `ImProcCoordinator::translateCoord()` from private member to anonymous namespace. Fixed some whitespace and formatting issues. * Fixed some formatting issues * Passed `ipf` parameter as const in `translateCoord`. Narrowed `using namespace` to single class `Coord2D`. * Added `scaleGain` entry to thumbnail metadata file, to make `scale_mul` multipliers available in thumbnail processing phase. This simplifies multiplier calculations, so that "faking" thumbnail multipliers in the main image processing is not necessary anymore. This way, output values are immune to slight variations of multipliers between successive shots taken with in-camera AWB turned on. Shifted multipliers so that the output channel medians are balanced when "Camera WB" is selected. This way, just computing multipliers from crop and setting "Camera WB" (which is the default) gives a pretty well balanced image as a starting point. * New channel scaling method, based on a film base color sample instead of crop area channel medians. Channels are scaled so that the converted film base values are equal to 1/512th of the output range (65k). This giver better black levels in the output, and more consistency when batch-processing multiple negatives. The output is now compensated for a known fixed WB value, so that the film base will appear grey when WB is set to 3500K, Green=1. Added PPVERSION 347 to preserve backwards compatibility: when a processing profile saved by RT 5.7 is loaded (PPVERSION=346), the new fields are initialized to the special value -1, which will instruct the main processing to follow the old channel scaling behaviour. The old channel scaling multipliers will then be converted to the new film base values so that the resulting image is the same, and the fields will be overwritten as soon as the PP is saved again. This will transparently upgrade the processing profile. When the new behaviour is used, but the film base values are still unset, they are estimated based on channel medians, excluding a 20% border around the image. This should give a better result out-of-the-box for pictures containing a large film holder. * Code cleanup from review * Run astyle on film neg source files * Fixed automated build failure caused by incompatible libraries on my dev PC. * Simplified `Thumbnail::processFilmNegative` method signature. There is no need to pass in `rmi`,`gmi`,`bmi` multipliers from the caller, i can do the same with my own internal multipliers. * Added `FilmNegListener` class to pass estimeted film base values to the GUI after first processing. Removed old `filmBaseValues` instance variable from RawImageSource. * Code cleanup * Forgot to set baseValues flag in `PartialPasteDlg::applyPaste` Fixed `filmBaseValuesLabel` not updating when reading zero baseValues. Normally not needed (the label is updated later by the listener), but when the user is browsing through pictures the listener won't fire, so the label must be updated to show values are unset. * Overwritten channel scaling multipliers by calling `get_colorsCoeff` with `forceAutoWB=false`. Initially, in `RawImageSource::load`, channels are auto-balanced by averaging the whole picture when computing multipliers. This can give different multipliers for multiple shots of the same camera, which will lead to inconsistent conversions when batch-processing multiple negatives. This commit re-sets `scale_mul`, `ref_pre_mul`, etc., in order to "undo" the auto-WB and use the normal camera multipliers. * Found an easier way to get stable overall multipliers, removed the (horrible) on-the-fly mutation of scaling instance variables.
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
/*
|
|
* This file is part of RawTherapee.
|
|
*
|
|
* Copyright (c) 2019 Alberto Romei <aldrop8@gmail.com>
|
|
*
|
|
* RawTherapee is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* RawTherapee is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <array>
|
|
|
|
#include <gtkmm.h>
|
|
|
|
#include "adjuster.h"
|
|
#include "editcallbacks.h"
|
|
#include "guiutils.h"
|
|
#include "toolpanel.h"
|
|
|
|
class FilmNegProvider
|
|
{
|
|
public:
|
|
virtual ~FilmNegProvider() = default;
|
|
|
|
virtual bool getFilmNegativeExponents(rtengine::Coord spotA, rtengine::Coord spotB, std::array<float, 3>& newExps) = 0;
|
|
virtual bool getRawSpotValues(rtengine::Coord spot, int spotSize, std::array<float, 3>& rawValues) = 0;
|
|
};
|
|
|
|
class FilmNegative final :
|
|
public ToolParamBlock,
|
|
public AdjusterListener,
|
|
public FoldableToolPanel,
|
|
public EditSubscriber,
|
|
public rtengine::FilmNegListener
|
|
{
|
|
public:
|
|
FilmNegative();
|
|
~FilmNegative() override;
|
|
|
|
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
|
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
|
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
|
void setBatchMode(bool batchMode) override;
|
|
|
|
void adjusterChanged(Adjuster* a, double newval) override;
|
|
void enabledChanged() override;
|
|
|
|
void filmBaseValuesChanged(std::array<float, 3> rgb) override;
|
|
|
|
void setFilmNegProvider(FilmNegProvider* provider);
|
|
|
|
void setEditProvider(EditDataProvider* provider) override;
|
|
|
|
// EditSubscriber interface
|
|
CursorShape getCursor(int objectID) const override;
|
|
bool mouseOver(int modifierKey) override;
|
|
bool button1Pressed(int modifierKey) override;
|
|
bool button1Released() override;
|
|
void switchOffEditMode() override;
|
|
|
|
private:
|
|
void editToggled();
|
|
void baseSpotToggled();
|
|
|
|
const rtengine::ProcEvent evFilmNegativeExponents;
|
|
const rtengine::ProcEvent evFilmNegativeEnabled;
|
|
const rtengine::ProcEvent evFilmBaseValues;
|
|
|
|
std::vector<rtengine::Coord> refSpotCoords;
|
|
|
|
std::array<float, 3> filmBaseValues;
|
|
|
|
FilmNegProvider* fnp;
|
|
|
|
Adjuster* const greenExp;
|
|
Adjuster* const redRatio;
|
|
Adjuster* const blueRatio;
|
|
|
|
Gtk::Grid* const spotgrid;
|
|
Gtk::ToggleButton* const spotbutton;
|
|
|
|
Gtk::Label* const filmBaseLabel;
|
|
Gtk::Label* const filmBaseValuesLabel;
|
|
Gtk::ToggleButton* const filmBaseSpotButton;
|
|
|
|
};
|