Merge from branch 'dev'

rtgui/paramsedited.h

@@ -169,6 +169,10 @@ struct ColorToningEdited {
     bool labgridBLow;
     bool labgridAHigh;
     bool labgridBHigh;
+    bool labgridALowmerg;
+    bool labgridBLowmerg;
+    bool labgridAHighmerg;
+    bool labgridBHighmerg;
     bool labregions;
     bool labregionsShowMask;
 };
@@ -379,6 +383,468 @@ struct RotateParamsEdited {
 struct DistortionParamsEdited {
     bool amount;
 };
+class LocallabParamsEdited
+{
+public:
+    struct LocallabSpotEdited {
+        // Control spot settings
+        bool name;
+        bool isvisible;
+        bool shape;
+        bool spotMethod;
+        bool wavMethod;
+        bool sensiexclu;
+        bool structexclu;
+        bool struc;
+        bool shapeMethod;
+        bool loc;
+        bool centerX;
+        bool centerY;
+        bool circrad;
+        bool qualityMethod;
+        bool complexMethod;
+        bool transit;
+        bool feather;
+        bool thresh;
+        bool iter;
+        bool balan;
+        bool balanh;
+        bool colorde;
+        bool colorscope;
+        bool transitweak;
+        bool transitgrad;
+        bool avoid;
+        bool blwh;
+        bool recurs;
+        bool laplac;
+        bool deltae;
+        bool shortc;
+        bool savrest;
+        bool scopemask;
+        bool lumask;
+        // Color & Light
+        bool visicolor;
+        bool expcolor;
+        bool complexcolor;
+        bool curvactiv;
+        bool lightness;
+        bool contrast;
+        bool chroma;
+        bool labgridALow;
+        bool labgridBLow;
+        bool labgridAHigh;
+        bool labgridBHigh;
+        bool labgridALowmerg;
+        bool labgridBLowmerg;
+        bool labgridAHighmerg;
+        bool labgridBHighmerg;
+        bool strengthgrid;
+        bool sensi;
+        bool structcol;
+        bool strcol;
+        bool strcolab;
+        bool strcolh;
+        bool angcol;
+        bool blurcolde;
+        bool blurcol;
+        bool contcol;
+        bool blendmaskcol;
+        bool radmaskcol;
+        bool chromaskcol;
+        bool gammaskcol;
+        bool slomaskcol;
+        bool shadmaskcol;
+        bool strumaskcol;
+        bool lapmaskcol;
+        bool qualitycurveMethod;
+        bool gridMethod;
+        bool merMethod;
+        bool toneMethod;
+        bool mergecolMethod;
+        bool llcurve;
+        bool lccurve;
+        bool cccurve;
+        bool clcurve;
+        bool rgbcurve;
+        bool LHcurve;
+        bool HHcurve;
+        bool invers;
+        bool special;
+        bool toolcol;
+        bool enaColorMask;
+        bool fftColorMask;
+        bool CCmaskcurve;
+        bool LLmaskcurve;
+        bool HHmaskcurve;
+        bool HHhmaskcurve;
+        bool softradiuscol;
+        bool opacol;
+        bool mercol;
+        bool merlucol;
+        bool conthrcol;
+        bool Lmaskcurve;
+        bool LLmaskcolcurvewav;
+        bool csthresholdcol;
+        // Exposure
+        bool visiexpose;
+        bool expexpose;
+        bool complexexpose;
+        bool expcomp;
+        bool hlcompr;
+        bool hlcomprthresh;
+        bool black;
+        bool shadex;
+        bool shcompr;
+        bool expchroma;
+        bool sensiex;
+        bool structexp;
+        bool blurexpde;
+        bool strexp;
+        bool angexp;
+        bool excurve;
+        bool inversex;
+        bool enaExpMask;
+        bool enaExpMaskaft;
+        bool CCmaskexpcurve;
+        bool LLmaskexpcurve;
+        bool HHmaskexpcurve;
+        bool blendmaskexp;
+        bool radmaskexp;
+        bool chromaskexp;
+        bool gammaskexp;
+        bool slomaskexp;
+        bool lapmaskexp;
+        bool strmaskexp;
+        bool angmaskexp;
+        bool softradiusexp;
+        bool Lmaskexpcurve;
+        bool expMethod;
+        bool exnoiseMethod;
+        bool laplacexp;
+        bool balanexp;
+        bool linear;
+        bool gamm;
+        bool fatamount;
+        bool fatdetail;
+        bool fatanchor;
+        bool fatlevel;
+        // Shadow highlight
+        bool visishadhigh;
+        bool expshadhigh;
+        bool complexshadhigh;
+        bool shMethod;
+        bool multsh[6];
+        bool highlights;
+        bool h_tonalwidth;
+        bool shadows;
+        bool s_tonalwidth;
+        bool sh_radius;
+        bool sensihs;
+        bool enaSHMask;
+        bool CCmaskSHcurve;
+        bool LLmaskSHcurve;
+        bool HHmaskSHcurve;
+        bool blendmaskSH;
+        bool radmaskSH;
+        bool blurSHde;
+        bool strSH;
+        bool angSH;
+        bool inverssh;
+        bool chromaskSH;
+        bool gammaskSH;
+        bool slomaskSH;
+        bool lapmaskSH;
+        bool detailSH;
+        bool LmaskSHcurve;
+        bool fatamountSH;
+        bool fatanchorSH;
+        bool gamSH;
+        bool sloSH;
+        // Vibrance
+        bool visivibrance;
+        bool expvibrance;
+        bool complexvibrance;
+        bool saturated;
+        bool pastels;
+        bool warm;
+        bool psthreshold;
+        bool protectskins;
+        bool avoidcolorshift;
+        bool pastsattog;
+        bool sensiv;
+        bool skintonescurve;
+        bool CCmaskvibcurve;
+        bool LLmaskvibcurve;
+        bool HHmaskvibcurve;
+        bool enavibMask;
+        bool blendmaskvib;
+        bool radmaskvib;
+        bool chromaskvib;
+        bool gammaskvib;
+        bool slomaskvib;
+        bool lapmaskvib;
+        bool strvib;
+        bool strvibab;
+        bool strvibh;
+        bool angvib;
+        bool Lmaskvibcurve;
+        // Soft Light
+        bool visisoft;
+        bool expsoft;
+        bool complexsoft;
+        bool streng;
+        bool sensisf;
+        bool laplace;
+        bool softMethod;
+        // Blur & Noise
+        bool visiblur;
+        bool expblur;
+        bool complexblur;
+        bool radius;
+        bool strength;
+        bool sensibn;
+        bool itera;
+        bool guidbl;
+        bool strbl;
+        bool isogr;
+        bool strengr;
+        bool scalegr;
+        bool epsbl;
+        bool blMethod;
+        bool chroMethod;
+        bool blurMethod;
+        bool medMethod;
+        bool activlum;
+        bool noiselumf;
+        bool noiselumf0;
+        bool noiselumf2;
+        bool noiselumc;
+        bool noiselumdetail;
+        bool noiselequal;
+        bool noisechrof;
+        bool noisechroc;
+        bool noisechrodetail;
+        bool adjblur;
+        bool bilateral;
+        bool sensiden;
+        bool detailthr;
+        bool locwavcurveden;
+        bool showmaskblMethodtyp;
+        bool CCmaskblcurve;
+        bool LLmaskblcurve;
+        bool HHmaskblcurve;
+        bool enablMask;
+        bool fftwbl;
+        bool toolbl;
+        bool blendmaskbl;
+        bool radmaskbl;
+        bool chromaskbl;
+        bool gammaskbl;
+        bool slomaskbl;
+        bool lapmaskbl;
+        bool shadmaskbl;
+        bool shadmaskblsha;
+        bool strumaskbl;
+        bool Lmaskblcurve;
+        bool LLmaskblcurvewav;
+        bool csthresholdblur;
+        // Tone Mapping
+        bool visitonemap;
+        bool exptonemap;
+        bool complextonemap;
+        bool stren;
+        bool gamma;
+        bool estop;
+        bool scaltm;
+        bool rewei;
+        bool satur;
+        bool sensitm;
+        bool softradiustm;
+        bool amount;
+        bool equiltm;
+        bool CCmasktmcurve;
+        bool LLmasktmcurve;
+        bool HHmasktmcurve;
+        bool enatmMask;
+        bool enatmMaskaft;
+        bool blendmasktm;
+        bool radmasktm;
+        bool chromasktm;
+        bool gammasktm;
+        bool slomasktm;
+        bool lapmasktm;
+        bool Lmasktmcurve;
+        // Retinex
+        bool visireti;
+        bool expreti;
+        bool complexreti;
+        bool retinexMethod;
+        bool str;
+        bool chrrt;
+        bool neigh;
+        bool vart;
+        bool offs;
+        bool dehaz;
+        bool depth;
+        bool sensih;
+        bool localTgaincurve;
+        bool localTtranscurve;
+        bool inversret;
+        bool equilret;
+        bool loglin;
+        bool lumonly;
+        bool softradiusret;
+        bool CCmaskreticurve;
+        bool LLmaskreticurve;
+        bool HHmaskreticurve;
+        bool enaretiMask;
+        bool enaretiMasktmap;
+        bool blendmaskreti;
+        bool radmaskreti;
+        bool chromaskreti;
+        bool gammaskreti;
+        bool slomaskreti;
+        bool lapmaskreti;
+        bool scalereti;
+        bool darkness;
+        bool lightnessreti;
+        bool limd;
+        bool cliptm;
+        bool fftwreti;
+        bool Lmaskreticurve;
+        // Sharpening
+        bool visisharp;
+        bool expsharp;
+        bool complexsharp;
+        bool sharcontrast;
+        bool sharradius;
+        bool sharamount;
+        bool shardamping;
+        bool shariter;
+        bool sharblur;
+        bool sensisha;
+        bool inverssha;
+        // Local Contrast
+        bool visicontrast;
+        bool expcontrast;
+        bool complexcontrast;
+        bool lcradius;
+        bool lcamount;
+        bool lcdarkness;
+        bool lclightness;
+        bool sigmalc;
+        bool levelwav;
+        bool residcont;
+        bool residsha;
+        bool residshathr;
+        bool residhi;
+        bool residhithr;
+        bool residblur;
+        bool levelblur;
+        bool sigmabl;
+        bool residchro;
+        bool residcomp;
+        bool sigma;
+        bool offset;
+        bool sigmadr;
+        bool threswav;
+        bool chromalev;
+        bool chromablu;
+        bool sigmadc;
+        bool deltad;
+        bool fatres;
+        bool clarilres;
+        bool claricres;
+        bool clarisoft;
+        bool sigmalc2;
+        bool strwav;
+        bool angwav;
+        bool strengthw;
+        bool sigmaed;
+        bool radiusw;
+        bool detailw;
+        bool gradw;
+        bool tloww;
+        bool thigw;
+        bool edgw;
+        bool basew;
+        bool sensilc;
+        bool fftwlc;
+        bool blurlc;
+        bool wavblur;
+        bool wavedg;
+        bool waveshow;
+        bool wavcont;
+        bool wavcomp;
+        bool wavgradl;
+        bool wavcompre;
+        bool origlc;
+        bool localcontMethod;
+        bool localedgMethod;
+        bool localneiMethod;
+        bool locwavcurve;
+        bool csthreshold;
+        bool loclevwavcurve;
+        bool locconwavcurve;
+        bool loccompwavcurve;
+        bool loccomprewavcurve;
+        bool locedgwavcurve;
+        bool CCmasklccurve;
+        bool LLmasklccurve;
+        bool HHmasklccurve;
+        bool enalcMask;
+        bool blendmasklc;
+        bool radmasklc;
+        bool chromasklc;
+        bool Lmasklccurve;
+        // Contrast by detail levels
+        bool visicbdl;
+        bool expcbdl;
+        bool complexcbdl;
+        bool mult[6];
+        bool chromacbdl;
+        bool threshold;
+        bool sensicb;
+        bool clarityml;
+        bool contresid;
+        bool blurcbdl;
+        bool softradiuscb;
+        bool enacbMask;
+        bool CCmaskcbcurve;
+        bool LLmaskcbcurve;
+        bool HHmaskcbcurve;
+        bool blendmaskcb;
+        bool radmaskcb;
+        bool chromaskcb;
+        bool gammaskcb;
+        bool slomaskcb;
+        bool lapmaskcb;
+        bool Lmaskcbcurve;
+        // Log encoding
+        bool visilog;
+        bool explog;
+        bool autocompute;
+        bool sourceGray;
+        bool targetGray;
+        bool Autogray;
+        bool fullimage;
+        bool blackEv;
+        bool whiteEv;
+        bool detail;
+        bool sensilog;
+        bool baselog;
+        bool strlog;
+        bool anglog;
+
+        LocallabSpotEdited(bool v);
+
+        void set(bool v);
+    };
+
+    bool enabled;
+    bool selspot;
+    std::vector<LocallabSpotEdited> spots;
+};
 
 struct LensProfParamsEdited {
     bool lcpFile;
@@ -512,6 +978,12 @@ struct WaveletParamsEdited {
     bool strength;
     bool balance;
     bool iter;
+    bool sigmafin;
+    bool sigmaton;
+    bool sigmacol;
+    bool sigmadir;
+    bool rangeab;
+    bool protab;
     bool median;
     bool medianlev;
     bool linkedg;
@@ -584,6 +1056,7 @@ struct WaveletParamsEdited {
     bool level3noise;
     bool ccwcurve;
     bool blcurve;
+    bool opacityCurveSH;
     bool opacityCurveBY;
     bool opacityCurveRG;
     bool opacityCurveW;
@@ -616,6 +1089,11 @@ struct WaveletParamsEdited {
     bool exptoning;
     bool expnoise;
     bool expclari;
+    bool labgridALow;
+    bool labgridBLow;
+    bool labgridAHigh;
+    bool labgridBHigh;
+    
 };
 
 struct DirPyrEqualizerParamsEdited {
@@ -727,6 +1205,14 @@ struct RAWParamsEdited {
     bool ff_clipControl;
     bool exPos;
 
+    struct PreprocessWBParamsEdited {
+        bool mode;
+
+        bool isUnchanged() const;
+    };
+
+    PreprocessWBParamsEdited preprocessWB;
+
     bool isUnchanged() const;
 };
 
@@ -775,6 +1261,7 @@ struct ParamsEdited {
     LensProfParamsEdited lensProf;
     PerspectiveParamsEdited perspective;
     GradientParamsEdited gradient;
+    LocallabParamsEdited locallab;
     PCVignetteParamsEdited pcvignette;
     CACorrParamsEdited cacorrection;
     VignettingParamsEdited vignetting;