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

Merge with dev - save provisory work

Browse Source
This commit is contained in:
Desmis
2017-12-09 14:32:32 +01:00
parent 5748d98678 d668e0d745
commit 392d2a6769
50 changed files with 2095 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
rtgui/paramsedited.cc
View File

@@ -21,13 +21,13 @@
#include "options.h"
#include "addsetids.h"
ParamsEdited::ParamsEdited (bool value)
ParamsEdited::ParamsEdited(bool value)
{
set (value);
set(value);
}
void ParamsEdited::set (bool v)
void ParamsEdited::set(bool v)
{
general.rank = v;
@@ -336,6 +336,7 @@ void ParamsEdited::set (bool v)
locallab.lightness = v;
locallab.contrast = v;
locallab.chroma = v;
locallab.warm = v;
locallab.expcomp = v;
locallab.hlcompr = v;
locallab.hlcomprthresh = v;
@@ -531,14 +532,14 @@ void ParamsEdited::set (bool v)
raw.xtranssensor.exBlackRed = v;
raw.xtranssensor.exBlackGreen = v;
raw.xtranssensor.exBlackBlue = v;
raw.caCorrection = v;
raw.caBlue = v;
raw.caRed = v;
raw.ca_autocorrect = v;
raw.cablue = v;
raw.cared = v;
raw.hotPixelFilter = v;
raw.deadPixelFilter = v;
raw.hotDeadPixelThresh = v;
raw.hotdeadpix_thresh = v;
raw.darkFrame = v;
raw.dfAuto = v;
raw.df_autoselect = v;
raw.ff_file = v;
raw.ff_AutoSelect = v;
raw.ff_BlurRadius = v;
@@ -669,10 +670,10 @@ void ParamsEdited::set (bool v)
using namespace rtengine;
using namespace rtengine::procparams;
void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>& src)
void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>& src)
{
set (true);
set(true);
if (src.empty()) {
return;
@@ -918,7 +919,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
fattal.enabled = fattal.enabled && p.fattal.enabled == other.fattal.enabled;
fattal.threshold = fattal.threshold && p.fattal.threshold == other.fattal.threshold;
fattal.amount = fattal.amount && p.fattal.amount == other.fattal.amount;
sh.enabled = sh.enabled && p.sh.enabled == other.sh.enabled;
sh.hq = sh.hq && p.sh.hq == other.sh.hq;
sh.highlights = sh.highlights && p.sh.highlights == other.sh.highlights;
@@ -993,6 +994,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
locallab.lightness = locallab.lightness && p.locallab.lightness == other.locallab.lightness;
locallab.contrast = locallab.contrast && p.locallab.contrast == other.locallab.contrast;
locallab.chroma = locallab.chroma && p.locallab.chroma == other.locallab.chroma;
locallab.warm = locallab.warm && p.locallab.warm == other.locallab.warm;
locallab.expcomp = locallab.expcomp && p.locallab.expcomp == other.locallab.expcomp;
locallab.hlcompr = locallab.hlcompr && p.locallab.hlcompr == other.locallab.hlcompr;
locallab.hlcomprthresh = locallab.hlcomprthresh && p.locallab.hlcomprthresh == other.locallab.hlcomprthresh;
@@ -1180,14 +1182,14 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
raw.xtranssensor.exBlackRed = raw.xtranssensor.exBlackRed && p.raw.xtranssensor.blackred == other.raw.xtranssensor.blackred;
raw.xtranssensor.exBlackGreen = raw.xtranssensor.exBlackGreen && p.raw.xtranssensor.blackgreen == other.raw.xtranssensor.blackgreen;
raw.xtranssensor.exBlackBlue = raw.xtranssensor.exBlackBlue && p.raw.xtranssensor.blackblue == other.raw.xtranssensor.blackblue;
raw.caCorrection = raw.caCorrection && p.raw.ca_autocorrect == other.raw.ca_autocorrect;
raw.caRed = raw.caRed && p.raw.cared == other.raw.cared;
raw.caBlue = raw.caBlue && p.raw.cablue == other.raw.cablue;
raw.ca_autocorrect = raw.ca_autocorrect && p.raw.ca_autocorrect == other.raw.ca_autocorrect;
raw.cared = raw.cared && p.raw.cared == other.raw.cared;
raw.cablue = raw.cablue && p.raw.cablue == other.raw.cablue;
raw.hotPixelFilter = raw.hotPixelFilter && p.raw.hotPixelFilter == other.raw.hotPixelFilter;
raw.deadPixelFilter = raw.deadPixelFilter && p.raw.deadPixelFilter == other.raw.deadPixelFilter;
raw.hotDeadPixelThresh = raw.hotDeadPixelThresh && p.raw.hotdeadpix_thresh == other.raw.hotdeadpix_thresh;
raw.hotdeadpix_thresh = raw.hotdeadpix_thresh && p.raw.hotdeadpix_thresh == other.raw.hotdeadpix_thresh;
raw.darkFrame = raw.darkFrame && p.raw.dark_frame == other.raw.dark_frame;
raw.dfAuto = raw.dfAuto && p.raw.df_autoselect == other.raw.df_autoselect;
raw.df_autoselect = raw.df_autoselect && p.raw.df_autoselect == other.raw.df_autoselect;
raw.ff_file = raw.ff_file && p.raw.ff_file == other.raw.ff_file;
raw.ff_AutoSelect = raw.ff_AutoSelect && p.raw.ff_AutoSelect == other.raw.ff_AutoSelect;
raw.ff_BlurRadius = raw.ff_BlurRadius && p.raw.ff_BlurRadius == other.raw.ff_BlurRadius;
@@ -1312,7 +1314,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
}
}
void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rtengine::procparams::ProcParams& mods, bool forceSet)
void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rtengine::procparams::ProcParams& mods, bool forceSet)
{
bool dontforceSet = !forceSet;
@@ -2197,12 +2199,14 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (fattal.enabled) {
toEdit.fattal.enabled = mods.fattal.enabled;
}
if (fattal.threshold) {
toEdit.fattal.threshold = mods.fattal.threshold;
}
if (fattal.amount) {
toEdit.fattal.amount = mods.fattal.amount;
}
}
if (sh.enabled) {
toEdit.sh.enabled = mods.sh.enabled;
@@ -2528,6 +2532,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.locallab.chroma = mods.locallab.chroma;
}
if (locallab.warm) {
toEdit.locallab.warm = mods.locallab.warm;
}
if (locallab.expcomp) {
toEdit.locallab.expcomp = mods.locallab.expcomp;
}
@@ -3192,15 +3200,15 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.raw.xtranssensor.blackblue = dontforceSet && options.baBehav[ADDSET_RAWEXPOS_BLACKS] ? toEdit.raw.xtranssensor.blackblue + mods.raw.xtranssensor.blackblue : mods.raw.xtranssensor.blackblue;
}
if (raw.caCorrection) {
if (raw.ca_autocorrect) {
toEdit.raw.ca_autocorrect = mods.raw.ca_autocorrect;
}
if (raw.caRed) {
if (raw.cared) {
toEdit.raw.cared = dontforceSet && options.baBehav[ADDSET_RAWCACORR] ? toEdit.raw.cared + mods.raw.cared : mods.raw.cared;
}
if (raw.caBlue) {
if (raw.cablue) {
toEdit.raw.cablue = dontforceSet && options.baBehav[ADDSET_RAWCACORR] ? toEdit.raw.cablue + mods.raw.cablue : mods.raw.cablue;
}
@@ -3220,7 +3228,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.raw.deadPixelFilter = mods.raw.deadPixelFilter;
}
if (raw.hotDeadPixelThresh) {
if (raw.hotdeadpix_thresh) {
toEdit.raw.hotdeadpix_thresh = mods.raw.hotdeadpix_thresh;
}
@@ -3228,7 +3236,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.raw.dark_frame = mods.raw.dark_frame;
}
if (raw.dfAuto) {
if (raw.df_autoselect) {
toEdit.raw.df_autoselect = mods.raw.df_autoselect;
}
@@ -3683,8 +3691,8 @@ bool RAWParamsEdited::XTransSensor::isUnchanged() const
bool RAWParamsEdited::isUnchanged() const
{
return bayersensor.isUnchanged() && xtranssensor.isUnchanged() && caCorrection && caRed && caBlue && hotPixelFilter && deadPixelFilter && hotDeadPixelThresh && darkFrame
&& dfAuto && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType && exPos && exPreser && ff_AutoClipControl && ff_clipControl;
return bayersensor.isUnchanged() && xtranssensor.isUnchanged() && ca_autocorrect && cared && cablue && hotPixelFilter && deadPixelFilter && hotdeadpix_thresh && darkFrame
&& df_autoselect && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType && exPos && exPreser && ff_AutoClipControl && ff_clipControl;
}
bool LensProfParamsEdited::isUnchanged() const