diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..5cdfd8d5b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,19 @@
+## Thank You
+Thank you for showing interest in contributing to RawTherapee. It is people such as yourself who make this program and project possible.
+
+## Contribute as a Tester
+The most useful feedback is based on the latest development code, and in the case of crashes should include a stack backtrace made using a debug build.
+- Compilation instructions for Linux:
+ - http://rawpedia.rawtherapee.com/Linux
+- Compilation instructions for Windows:
+ - http://rawpedia.rawtherapee.com/Windows
+- Compilation instructions for macOS:
+ - http://rawpedia.rawtherapee.com/MacOS
+- How to write useful bug reports including how to get stack backtraces:
+ - http://rawpedia.rawtherapee.com/How_to_write_useful_bug_reports
+
+## Contributing as a Programmer
+- Announce and discuss your plans in GitHub before starting work.
+- Keep branches small so that completed and working features can be merged into the "dev" branch often, and so that they can be abandoned if they head in the wrong direction.
+- Use C++11
+- Code must be run through astyle version 3 or newer before being merged.
diff --git a/rtdata/languages/default b/rtdata/languages/default
index f90a8b1f2..708a25b85 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -704,6 +704,9 @@ HISTORY_MSG_472;PS - Smooth transitions
HISTORY_MSG_473;PS - Use LMMSE
HISTORY_MSG_474;PS - Equalize
HISTORY_MSG_475;PS - Equalize channel
+HISTORY_MSG_476;CAM02 - Temp out
+HISTORY_MSG_477;CAM02 - Green out
+HISTORY_MSG_478;CAM02 - Yb out
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
HISTORY_SNAPSHOT;Snapshot
@@ -952,7 +955,8 @@ PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Name
PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
PREFERENCES_CUSTPROFBUILDPATH;Executable path
PREFERENCES_CUTOVERLAYBRUSH;Crop mask color/transparency
-PREFERENCES_D50;5000K
+PREFERENCES_D50_OLD;5000K
+PREFERENCES_D50;Settings in main menu
PREFERENCES_D55;5500K
PREFERENCES_D60;6000K
PREFERENCES_D65;6500K
@@ -997,7 +1001,8 @@ PREFERENCES_GREY;Output device's Yb luminance (%)
PREFERENCES_GREY05;Yb=05 CIE L#30
PREFERENCES_GREY10;Yb=10 CIE L#40
PREFERENCES_GREY15;Yb=15 CIE L#45
-PREFERENCES_GREY18;Yb=18 CIE L#50
+PREFERENCES_GREY18_OLD;Yb=18 CIE L#50
+PREFERENCES_GREY18;Settings in main menu
PREFERENCES_GREY23;Yb=23 CIE L#55
PREFERENCES_GREY30;Yb=30 CIE L#60
PREFERENCES_GREY40;Yb=40 CIE L#70
@@ -1322,7 +1327,7 @@ TP_COLORAPP_LABEL_VIEWING;Viewing Conditions
TP_COLORAPP_LIGHT;Lightness (J)
TP_COLORAPP_LIGHT_TOOLTIP;Lightness in CIECAM02 differs from L*a*b* and RGB lightness.
TP_COLORAPP_MODEL;WP Model
-TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\nWB [RT] + [output]: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Preferences > Color Management.\n\nWB [RT+CAT02] + [output]: RT's white balance settings are used by CAT02 and the output device's white balance is set in Preferences - Color Management.
+TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\nWB [RT] + [output]: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Viewing Conditions.\n\nWB [RT+CAT02] + [output]: RT's white balance settings are used by CAT02 and the output device's white balance is set in Viewing Conditions.
TP_COLORAPP_RSTPRO;Red & skin-tones protection
TP_COLORAPP_RSTPRO_TOOLTIP;Red and skin-tones protection affects both sliders and curves.
TP_COLORAPP_SHARPCIE;--unused--
@@ -1347,6 +1352,7 @@ TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]
TP_COLORAPP_WBRT;WB [RT] + [output]
+TP_COLORAPP_YB;Yb (mean luminance)
TP_COLORTONING_AB;o C/L
TP_COLORTONING_AUTOSAT;Automatic
TP_COLORTONING_BALANCE;Balance
@@ -2137,3 +2143,5 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: Alt-f
ZOOMPANEL_ZOOMFITSCREEN;Fit whole image to screen\nShortcut: f
ZOOMPANEL_ZOOMIN;Zoom In\nShortcut: +
ZOOMPANEL_ZOOMOUT;Zoom Out\nShortcut: -
+GIMP_PLUGIN_INFO;Welcome to the RawTherapee GIMP plugin!\nOnce you are done editing, simply close the main RawTherapee window and the image will be automatically imported in GIMP.
+DONT_SHOW_AGAIN;Don't show this message again.
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 4440129c1..b5e555a1f 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -208,7 +208,7 @@ void ImProcFunctions::firstAnalysis (const Imagefloat* const original, const Pro
}
// Copyright (c) 2012 Jacques Desmis
-void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh, int pW, int pwb, LabImage* lab, const ProcParams* params ,
+void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh, int pW, int pwb, LabImage* lab, const ProcParams* params,
const ColorAppearance & customColCurve1, const ColorAppearance & customColCurve2, const ColorAppearance & customColCurve3,
LUTu & histLCAM, LUTu & histCCAM, LUTf & CAMBrightCurveJ, LUTf & CAMBrightCurveQ, float &mean, int Iterates, int scale, bool execsharp, double &d, int rtt)
{
@@ -263,6 +263,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
double Yw;
Yw = 1.0;
double Xw, Zw;
+ double Xwout, Zwout;
double f, c, nc, yb = 0., la, xw, yw, zw, f2 = 0., c2 = 0., nc2 = 0., yb2 = 0., la2;
double fl, n, nbb, ncb, aw;
double xwd = 0., ywd, zwd = 0.;
@@ -273,6 +274,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
bool ciedata = params->colorappearance.datacie;
ColorTemp::temp2mulxyz (params->wb.temperature, params->wb.green, params->wb.method, Xw, Zw); //compute white Xw Yw Zw : white current WB
+ ColorTemp::temp2mulxyz (params->colorappearance.tempout, params->colorappearance.greenout, "Custom", Xwout, Zwout);
//viewing condition for surround
if (params->colorappearance.surround == "Average") {
@@ -319,59 +321,66 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
bool needJ = (alg == 0 || alg == 1 || alg == 3);
bool needQ = (alg == 2 || alg == 3);
+ /*
+ //settings white point of output device - or illuminant viewing
+ if (settings->viewingdevice == 0) {
+ xwd = 96.42; //5000K
+ ywd = 100.0;
+ zwd = 82.52;
+ } else if (settings->viewingdevice == 1) {
+ xwd = 95.68; //5500
+ ywd = 100.0;
+ zwd = 92.15;
+ } else if (settings->viewingdevice == 2) {
+ xwd = 95.24; //6000
+ ywd = 100.0;
+ zwd = 100.81;
+ } else if (settings->viewingdevice == 3) {
+ xwd = 95.04; //6500
+ ywd = 100.0;
+ zwd = 108.88;
+ } else if (settings->viewingdevice == 4) {
+ xwd = 109.85; //tungsten
+ ywd = 100.0;
+ zwd = 35.58;
+ } else if (settings->viewingdevice == 5) {
+ xwd = 99.18; //fluo F2
+ ywd = 100.0;
+ zwd = 67.39;
+ } else if (settings->viewingdevice == 6) {
+ xwd = 95.04; //fluo F7
+ ywd = 100.0;
+ zwd = 108.75;
+ } else if (settings->viewingdevice == 7) {
+ xwd = 100.96; //fluo F11
+ ywd = 100.0;
+ zwd = 64.35;
+ }
+ */
- //settings white point of output device - or illuminant viewing
- if (settings->viewingdevice == 0) {
- xwd = 96.42; //5000K
- ywd = 100.0;
- zwd = 82.52;
- } else if (settings->viewingdevice == 1) {
- xwd = 95.68; //5500
- ywd = 100.0;
- zwd = 92.15;
- } else if (settings->viewingdevice == 2) {
- xwd = 95.24; //6000
- ywd = 100.0;
- zwd = 100.81;
- } else if (settings->viewingdevice == 3) {
- xwd = 95.04; //6500
- ywd = 100.0;
- zwd = 108.88;
- } else if (settings->viewingdevice == 4) {
- xwd = 109.85; //tungsten
- ywd = 100.0;
- zwd = 35.58;
- } else if (settings->viewingdevice == 5) {
- xwd = 99.18; //fluo F2
- ywd = 100.0;
- zwd = 67.39;
- } else if (settings->viewingdevice == 6) {
- xwd = 95.04; //fluo F7
- ywd = 100.0;
- zwd = 108.75;
- } else if (settings->viewingdevice == 7) {
- xwd = 100.96; //fluo F11
- ywd = 100.0;
- zwd = 64.35;
- }
+ xwd = 100. * Xwout;
+ zwd = 100. * Zwout;
+ ywd = 100. / params->colorappearance.greenout;//approximation to simplify
-
- //settings mean Luminance Y of output device or viewing
- if (settings->viewingdevicegrey == 0) {
- yb2 = 5.0;
- } else if (settings->viewingdevicegrey == 1) {
- yb2 = 10.0;
- } else if (settings->viewingdevicegrey == 2) {
- yb2 = 15.0;
- } else if (settings->viewingdevicegrey == 3) {
- yb2 = 18.0;
- } else if (settings->viewingdevicegrey == 4) {
- yb2 = 23.0;
- } else if (settings->viewingdevicegrey == 5) {
- yb2 = 30.0;
- } else if (settings->viewingdevicegrey == 6) {
- yb2 = 40.0;
- }
+ /*
+ //settings mean Luminance Y of output device or viewing
+ if (settings->viewingdevicegrey == 0) {
+ yb2 = 5.0;
+ } else if (settings->viewingdevicegrey == 1) {
+ yb2 = 10.0;
+ } else if (settings->viewingdevicegrey == 2) {
+ yb2 = 15.0;
+ } else if (settings->viewingdevicegrey == 3) {
+ yb2 = 18.0;
+ } else if (settings->viewingdevicegrey == 4) {
+ yb2 = 23.0;
+ } else if (settings->viewingdevicegrey == 5) {
+ yb2 = 30.0;
+ } else if (settings->viewingdevicegrey == 6) {
+ yb2 = 40.0;
+ }
+ */
+ yb2 = params->colorappearance.ybout;
//La and la2 = ambiant luminosity scene and viewing
la = double (params->colorappearance.adapscen);
@@ -607,7 +616,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
x, y, z,
xw1, yw1, zw1,
yb, la,
- f, c, nc, pilot, gamu , n, nbb, ncb, pfl, cz, d );
+ f, c, nc, pilot, gamu, n, nbb, ncb, pfl, cz, d );
Jpro = J;
Cpro = C;
hpro = h;
@@ -635,7 +644,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
schr = -99.8;
}
- Ciecam02::curvecolor (schr, Sp , sres, parsat);
+ Ciecam02::curvecolor (schr, Sp, sres, parsat);
double coe = pow (fl, 0.25);
float dred = 100.f; // in C mode
float protect_red = 80.0f; // in C mode
@@ -671,9 +680,9 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
}
if (alg == 3 || alg == 2) {
- Ciecam02::curvecolor (mchr, Mp , sres, parsat);
+ Ciecam02::curvecolor (mchr, Mp, sres, parsat);
} else {
- Ciecam02::curvecolor (0.0, Mp , sres, parsat); //colorfullness
+ Ciecam02::curvecolor (0.0, Mp, sres, parsat); //colorfullness
}
float dred = 100.f; //in C mode
@@ -708,9 +717,9 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
}
if (alg == 3) {
- Ciecam02::curvecolor (schr, Sp , sres, parsat);
+ Ciecam02::curvecolor (schr, Sp, sres, parsat);
} else {
- Ciecam02::curvecolor (0.0, Sp , sres, parsat); //saturation
+ Ciecam02::curvecolor (0.0, Sp, sres, parsat); //saturation
}
dred = 100.f; // in C mode
@@ -730,9 +739,9 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
}
if (alg != 2) {
- Ciecam02::curvecolor (chr, Cp , sres, parsat);
+ Ciecam02::curvecolor (chr, Cp, sres, parsat);
} else {
- Ciecam02::curvecolor (0.0, Cp , sres, parsat); //chroma
+ Ciecam02::curvecolor (0.0, Cp, sres, parsat); //chroma
}
dred = 55.f;
@@ -1222,7 +1231,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int begh, int endh
float chrom = 50.f;
{
int hotbad = 0;
- ImProcFunctions::badpixcam (ncie, artifact, 5, 2 , b_l, t_l, t_r, b_r, params->dirpyrequalizer.skinprotect , chrom, hotbad); //enabled remove artifacts for cbDL
+ ImProcFunctions::badpixcam (ncie, artifact, 5, 2, b_l, t_l, t_r, b_r, params->dirpyrequalizer.skinprotect, chrom, hotbad); //enabled remove artifacts for cbDL
}
}
}
@@ -1491,6 +1500,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
float xwd, ywd, zwd;
int alg = 0;
bool algepd = false;
+ double Xwout, Zwout;
const bool epdEnabled = params->epd.enabled;
bool ciedata = (params->colorappearance.datacie && pW != 1) && ! ((params->colorappearance.tonecie && (epdEnabled)) || (params->sharpening.enabled && settings->autocielab && execsharp)
@@ -1498,6 +1508,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
|| (params->impulseDenoise.enabled && settings->autocielab) || (params->colorappearance.badpixsl > 0 && settings->autocielab));
ColorTemp::temp2mulxyz (params->wb.temperature, params->wb.green, params->wb.method, Xw, Zw); //compute white Xw Yw Zw : white current WB
+ ColorTemp::temp2mulxyz (params->colorappearance.tempout, params->colorappearance.greenout, "Custom", Xwout, Zwout);
//viewing condition for surround
if (params->colorappearance.surround == "Average") {
@@ -1542,59 +1553,64 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
algepd = true;
}
- //settings white point of output device - or illuminant viewing
- if (settings->viewingdevice == 0) {
- xwd = 96.42f; //5000K
- ywd = 100.0f;
- zwd = 82.52f;
- } else if (settings->viewingdevice == 1) {
- xwd = 95.68f; //5500
- ywd = 100.0f;
- zwd = 92.15f;
- } else if (settings->viewingdevice == 2) {
- xwd = 95.24f; //6000
- ywd = 100.0f;
- zwd = 100.81f;
- } else if (settings->viewingdevice == 3) {
- xwd = 95.04f; //6500
- ywd = 100.0f;
- zwd = 108.88f;
- } else if (settings->viewingdevice == 4) {
- xwd = 109.85f; //tungsten
- ywd = 100.0f;
- zwd = 35.58f;
- } else if (settings->viewingdevice == 5) {
- xwd = 99.18f; //fluo F2
- ywd = 100.0f;
- zwd = 67.39f;
- } else if (settings->viewingdevice == 6) {
- xwd = 95.04f; //fluo F7
- ywd = 100.0f;
- zwd = 108.75f;
- } else { /*if(settings->viewingdevice == 7) */
- xwd = 100.96f; //fluo F11
- ywd = 100.0f;
- zwd = 64.35f;
- }
-
-
- //settings mean Luminance Y of output device or viewing
- if (settings->viewingdevicegrey == 0) {
- yb2 = 5.0f;
- } else if (settings->viewingdevicegrey == 1) {
- yb2 = 10.0f;
- } else if (settings->viewingdevicegrey == 2) {
- yb2 = 15.0f;
- } else if (settings->viewingdevicegrey == 3) {
- yb2 = 18.0f;
- } else if (settings->viewingdevicegrey == 4) {
- yb2 = 23.0f;
- } else if (settings->viewingdevicegrey == 5) {
- yb2 = 30.0f;
- } else { /* if(settings->viewingdevicegrey == 6)*/
- yb2 = 40.0f;
- }
-
+ xwd = 100.f * Xwout;
+ zwd = 100.f * Zwout;
+ ywd = 100.f / params->colorappearance.greenout;//approximation to simplify
+ /*
+ //settings white point of output device - or illuminant viewing
+ if (settings->viewingdevice == 0) {
+ xwd = 96.42f; //5000K
+ ywd = 100.0f;
+ zwd = 82.52f;
+ } else if (settings->viewingdevice == 1) {
+ xwd = 95.68f; //5500
+ ywd = 100.0f;
+ zwd = 92.15f;
+ } else if (settings->viewingdevice == 2) {
+ xwd = 95.24f; //6000
+ ywd = 100.0f;
+ zwd = 100.81f;
+ } else if (settings->viewingdevice == 3) {
+ xwd = 95.04f; //6500
+ ywd = 100.0f;
+ zwd = 108.88f;
+ } else if (settings->viewingdevice == 4) {
+ xwd = 109.85f; //tungsten
+ ywd = 100.0f;
+ zwd = 35.58f;
+ } else if (settings->viewingdevice == 5) {
+ xwd = 99.18f; //fluo F2
+ ywd = 100.0f;
+ zwd = 67.39f;
+ } else if (settings->viewingdevice == 6) {
+ xwd = 95.04f; //fluo F7
+ ywd = 100.0f;
+ zwd = 108.75f;
+ } else {
+ xwd = 100.96f; //fluo F11
+ ywd = 100.0f;
+ zwd = 64.35f;
+ }
+ */
+ yb2 = params->colorappearance.ybout;
+ /*
+ //settings mean Luminance Y of output device or viewing
+ if (settings->viewingdevicegrey == 0) {
+ yb2 = 5.0f;
+ } else if (settings->viewingdevicegrey == 1) {
+ yb2 = 10.0f;
+ } else if (settings->viewingdevicegrey == 2) {
+ yb2 = 15.0f;
+ } else if (settings->viewingdevicegrey == 3) {
+ yb2 = 18.0f;
+ } else if (settings->viewingdevicegrey == 4) {
+ yb2 = 23.0f;
+ } else if (settings->viewingdevicegrey == 5) {
+ yb2 = 30.0f;
+ } else {
+ yb2 = 40.0f;
+ }
+ */
//La and la2 = ambiant luminosity scene and viewing
la = float (params->colorappearance.adapscen);
@@ -2014,7 +2030,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
float Cp = (spro * spro * Qpro) / (1000000.f);
Cpro = Cp * 100.f;
float sres;
- Ciecam02::curvecolorfloat (chr, Cp , sres, 1.8f);
+ Ciecam02::curvecolorfloat (chr, Cp, sres, 1.8f);
Color::skinredfloat (Jpro, hpro, sres, Cp, 55.f, 30.f, 1, rstprotection, 100.f, Cpro);
} else if (alg == 1) {
// Lightness saturation
@@ -2022,7 +2038,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
float sres;
float Sp = spro / 100.0f;
float parsat = 1.5f; //parsat=1.5 =>saturation ; 1.8 => chroma ; 2.5 => colorfullness (personal evaluation)
- Ciecam02::curvecolorfloat (schr, Sp , sres, parsat);
+ Ciecam02::curvecolorfloat (schr, Sp, sres, parsat);
float dred = 100.f; // in C mode
float protect_red = 80.0f; // in C mode
dred = 100.0f * sqrtf ((dred * coe) / Qpro);
@@ -2034,7 +2050,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
Qpro = CAMBrightCurveQ[ (float) (Qpro * coefQ)]; //brightness and contrast
float Mp, sres;
Mp = Mpro / 100.0f;
- Ciecam02::curvecolorfloat (mchr, Mp , sres, 2.5f);
+ Ciecam02::curvecolorfloat (mchr, Mp, sres, 2.5f);
float dred = 100.f; //in C mode
float protect_red = 80.0f; // in C mode
dred *= coe; //in M mode
@@ -2049,7 +2065,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
float Mp, sres;
Mp = Mpro / 100.0f;
- Ciecam02::curvecolorfloat (mchr, Mp , sres, 2.5f);
+ Ciecam02::curvecolorfloat (mchr, Mp, sres, 2.5f);
float dred = 100.f; //in C mode
float protect_red = 80.0f; // in C mode
dred *= coe; //in M mode
@@ -2066,7 +2082,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
Jpro = CAMBrightCurveJ[ (float) (Jpro * 327.68f)]; //lightness CIECAM02 + contrast
float Sp = spro / 100.0f;
- Ciecam02::curvecolorfloat (schr, Sp , sres, 1.5f);
+ Ciecam02::curvecolorfloat (schr, Sp, sres, 1.5f);
dred = 100.f; // in C mode
protect_red = 80.0f; // in C mode
dred = 100.0f * sqrtf ((dred * coe) / Q);
@@ -2075,7 +2091,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
Qpro = QproFactor * sqrtf (Jpro);
float Cp = (spro * spro * Qpro) / (1000000.f);
Cpro = Cp * 100.f;
- Ciecam02::curvecolorfloat (chr, Cp , sres, 1.8f);
+ Ciecam02::curvecolorfloat (chr, Cp, sres, 1.8f);
Color::skinredfloat (Jpro, hpro, sres, Cp, 55.f, 30.f, 1, rstprotection, 100.f, Cpro);
// disabled this code, Issue 2690
// if(Jpro < 1.f && Cpro > 12.f) Cpro=12.f;//reduce artifacts by "pseudo gamut control CIECAM"
@@ -2573,7 +2589,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
int hotbad = 0;
float chrom = 50.f;
lab->deleteLab();
- ImProcFunctions::badpixcam (ncie, artifact, 5, 2 , b_l, t_l, t_r, b_r, params->dirpyrequalizer.skinprotect, chrom, hotbad); //enabled remove artifacts for cbDL
+ ImProcFunctions::badpixcam (ncie, artifact, 5, 2, b_l, t_l, t_r, b_r, params->dirpyrequalizer.skinprotect, chrom, hotbad); //enabled remove artifacts for cbDL
lab->reallocLab();
}
}
@@ -2935,15 +2951,15 @@ filmlike_clip (float *r, float *g, float *b)
}
void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer *pipetteBuffer, LUTf & hltonecurve, LUTf & shtonecurve, LUTf & tonecurve,
- SHMap* shmap, int sat, LUTf & rCurve, LUTf & gCurve, LUTf & bCurve, float satLimit , float satLimitOpacity, const ColorGradientCurve & ctColorCurve, const OpacityCurve & ctOpacityCurve, bool opautili, LUTf & clToningcurve, LUTf & cl2Toningcurve,
+ SHMap* shmap, int sat, LUTf & rCurve, LUTf & gCurve, LUTf & bCurve, float satLimit, float satLimitOpacity, const ColorGradientCurve & ctColorCurve, const OpacityCurve & ctOpacityCurve, bool opautili, LUTf & clToningcurve, LUTf & cl2Toningcurve,
const ToneCurve & customToneCurve1, const ToneCurve & customToneCurve2, const ToneCurve & customToneCurvebw1, const ToneCurve & customToneCurvebw2, double &rrm, double &ggm, double &bbm, float &autor, float &autog, float &autob, DCPProfile *dcpProf, const DCPProfile::ApplyState &asIn, LUTu &histToneCurve )
{
- rgbProc (working, lab, pipetteBuffer, hltonecurve, shtonecurve, tonecurve, shmap, sat, rCurve, gCurve, bCurve, satLimit , satLimitOpacity, ctColorCurve, ctOpacityCurve, opautili, clToningcurve, cl2Toningcurve, customToneCurve1, customToneCurve2, customToneCurvebw1, customToneCurvebw2, rrm, ggm, bbm, autor, autog, autob, params->toneCurve.expcomp, params->toneCurve.hlcompr, params->toneCurve.hlcomprthresh, dcpProf, asIn, histToneCurve);
+ rgbProc (working, lab, pipetteBuffer, hltonecurve, shtonecurve, tonecurve, shmap, sat, rCurve, gCurve, bCurve, satLimit, satLimitOpacity, ctColorCurve, ctOpacityCurve, opautili, clToningcurve, cl2Toningcurve, customToneCurve1, customToneCurve2, customToneCurvebw1, customToneCurvebw2, rrm, ggm, bbm, autor, autog, autob, params->toneCurve.expcomp, params->toneCurve.hlcompr, params->toneCurve.hlcomprthresh, dcpProf, asIn, histToneCurve);
}
// Process RGB image and convert to LAB space
void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer *pipetteBuffer, LUTf & hltonecurve, LUTf & shtonecurve, LUTf & tonecurve,
- SHMap* shmap, int sat, LUTf & rCurve, LUTf & gCurve, LUTf & bCurve, float satLimit , float satLimitOpacity, const ColorGradientCurve & ctColorCurve, const OpacityCurve & ctOpacityCurve, bool opautili, LUTf & clToningcurve, LUTf & cl2Toningcurve,
+ SHMap* shmap, int sat, LUTf & rCurve, LUTf & gCurve, LUTf & bCurve, float satLimit, float satLimitOpacity, const ColorGradientCurve & ctColorCurve, const OpacityCurve & ctOpacityCurve, bool opautili, LUTf & clToningcurve, LUTf & cl2Toningcurve,
const ToneCurve & customToneCurve1, const ToneCurve & customToneCurve2, const ToneCurve & customToneCurvebw1, const ToneCurve & customToneCurvebw2, double &rrm, double &ggm, double &bbm, float &autor, float &autog, float &autob, double expcomp, int hlcompr, int hlcomprthresh, DCPProfile *dcpProf, const DCPProfile::ApplyState &asIn, LUTu &histToneCurve )
{
BENCHFUN
@@ -6585,7 +6601,7 @@ void ImProcFunctions::EPDToneMap (LabImage *lab, unsigned int Iterates, int skip
fwrite(L, N, sizeof(float), f);
fclose(f);*/
- epd.CompressDynamicRange (L, sca / float(skip), edgest, Compression, DetailBoost, Iterates, rew);
+ epd.CompressDynamicRange (L, sca / float (skip), edgest, Compression, DetailBoost, Iterates, rew);
//Restore past range, also desaturate a bit per Mantiuk's Color correction for tone mapping.
float s = (1.0f + 38.7889f) * powf (Compression, 1.5856f) / (1.0f + 38.7889f * powf (Compression, 1.5856f));
diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index c16469bec..9e515f55c 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -502,6 +502,10 @@ enum ProcEvent {
EvPixelShiftLmmse = 472,
EvPixelShiftEqualBright = 473,
EvPixelShiftEqualBrightChannel = 474,
+ EvCATtempout = 475,
+ EvCATgreenout = 476,
+ EvCATybout = 477,
+
NUMOFEVENTS
};
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 01e645c35..3f54bb3ae 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -31,11 +31,13 @@
using namespace std;
extern Options options;
-namespace {
+namespace
+{
-void avoidEmptyCurve(std::vector &curve) {
- if(curve.empty()) {
- curve.push_back(FCT_Linear);
+void avoidEmptyCurve (std::vector &curve)
+{
+ if (curve.empty()) {
+ curve.push_back (FCT_Linear);
}
}
@@ -56,11 +58,11 @@ const char *RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::numMe
const char *RAWParams::ff_BlurTypestring[RAWParams::numFlatFileBlurTypes] = {/*"Parametric",*/ "Area Flatfield", "Vertical Flatfield", "Horizontal Flatfield", "V+H Flatfield"};
std::vector WBParams::wbEntries;
-bool ToneCurveParams::HLReconstructionNecessary(LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw)
+bool ToneCurveParams::HLReconstructionNecessary (LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw)
{
if (options.rtSettings.verbose)
- printf("histRedRaw[ 0]=%07d, histGreenRaw[ 0]=%07d, histBlueRaw[ 0]=%07d\nhistRedRaw[255]=%07d, histGreenRaw[255]=%07d, histBlueRaw[255]=%07d\n",
- histRedRaw[0], histGreenRaw[0], histBlueRaw[0], histRedRaw[255], histGreenRaw[255], histBlueRaw[255]);
+ printf ("histRedRaw[ 0]=%07d, histGreenRaw[ 0]=%07d, histBlueRaw[ 0]=%07d\nhistRedRaw[255]=%07d, histGreenRaw[255]=%07d, histBlueRaw[255]=%07d\n",
+ histRedRaw[0], histGreenRaw[0], histBlueRaw[0], histRedRaw[255], histGreenRaw[255], histBlueRaw[255]);
return histRedRaw[255] > 50 || histGreenRaw[255] > 50 || histBlueRaw[255] > 50 || histRedRaw[0] > 50 || histGreenRaw[0] > 50 || histBlueRaw[0] > 50;
}
@@ -68,40 +70,40 @@ bool ToneCurveParams::HLReconstructionNecessary(LUTu &histRedRaw, LUTu &histGree
void WBParams::init()
{
// Creation of the different methods and its associated temperature value
- wbEntries.push_back(new WBEntry("Camera" , WBT_CAMERA, M("TP_WBALANCE_CAMERA"), 0, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Auto" , WBT_AUTO, M("TP_WBALANCE_AUTO"), 0, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Daylight" , WBT_DAYLIGHT, M("TP_WBALANCE_DAYLIGHT"), 5300, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Cloudy" , WBT_CLOUDY, M("TP_WBALANCE_CLOUDY"), 6200, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Shade" , WBT_SHADE, M("TP_WBALANCE_SHADE"), 7600, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Water 1" , WBT_WATER, M("TP_WBALANCE_WATER1"), 35000, 0.3f, 1.1f, 0.f));
- wbEntries.push_back(new WBEntry("Water 2" , WBT_WATER, M("TP_WBALANCE_WATER2"), 48000, 0.63f, 1.38f, 0.f));
- wbEntries.push_back(new WBEntry("Tungsten" , WBT_TUNGSTEN, M("TP_WBALANCE_TUNGSTEN"), 2856, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F1" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO1"), 6430, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F2" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO2"), 4230, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F3" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO3"), 3450, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F4" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO4"), 2940, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F5" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO5"), 6350, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F6" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO6"), 4150, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F7" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO7"), 6500, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F8" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO8"), 5020, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F9" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO9"), 4330, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F10" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO10"), 5300, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F11" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO11"), 4000, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Fluo F12" , WBT_FLUORESCENT, M("TP_WBALANCE_FLUO12"), 3000, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("HMI Lamp" , WBT_LAMP, M("TP_WBALANCE_HMI"), 4800, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("GTI Lamp" , WBT_LAMP, M("TP_WBALANCE_GTI"), 5000, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("JudgeIII Lamp" , WBT_LAMP, M("TP_WBALANCE_JUDGEIII"), 5100, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Solux Lamp 3500K" , WBT_LAMP, M("TP_WBALANCE_SOLUX35"), 3480, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Solux Lamp 4100K" , WBT_LAMP, M("TP_WBALANCE_SOLUX41"), 3930, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Solux Lamp 4700K" , WBT_LAMP, M("TP_WBALANCE_SOLUX47"), 4700, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("NG Solux Lamp 4700K" , WBT_LAMP, M("TP_WBALANCE_SOLUX47_NG"), 4480, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("LED LSI Lumelex 2040", WBT_LED, M("TP_WBALANCE_LED_LSI"), 2970, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("LED CRS SP12 WWMR16" , WBT_LED, M("TP_WBALANCE_LED_CRS"), 3050, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Flash 5500K" , WBT_FLASH, M("TP_WBALANCE_FLASH55"), 5500, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Flash 6000K" , WBT_FLASH, M("TP_WBALANCE_FLASH60"), 6000, 1.f, 1.f, 0.f));
- wbEntries.push_back(new WBEntry("Flash 6500K" , WBT_FLASH, M("TP_WBALANCE_FLASH65"), 6500, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Camera", WBT_CAMERA, M ("TP_WBALANCE_CAMERA"), 0, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Auto", WBT_AUTO, M ("TP_WBALANCE_AUTO"), 0, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Daylight", WBT_DAYLIGHT, M ("TP_WBALANCE_DAYLIGHT"), 5300, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Cloudy", WBT_CLOUDY, M ("TP_WBALANCE_CLOUDY"), 6200, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Shade", WBT_SHADE, M ("TP_WBALANCE_SHADE"), 7600, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Water 1", WBT_WATER, M ("TP_WBALANCE_WATER1"), 35000, 0.3f, 1.1f, 0.f));
+ wbEntries.push_back (new WBEntry ("Water 2", WBT_WATER, M ("TP_WBALANCE_WATER2"), 48000, 0.63f, 1.38f, 0.f));
+ wbEntries.push_back (new WBEntry ("Tungsten", WBT_TUNGSTEN, M ("TP_WBALANCE_TUNGSTEN"), 2856, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F1", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO1"), 6430, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F2", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO2"), 4230, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F3", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO3"), 3450, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F4", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO4"), 2940, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F5", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO5"), 6350, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F6", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO6"), 4150, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F7", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO7"), 6500, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F8", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO8"), 5020, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F9", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO9"), 4330, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F10", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO10"), 5300, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F11", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO11"), 4000, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Fluo F12", WBT_FLUORESCENT, M ("TP_WBALANCE_FLUO12"), 3000, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("HMI Lamp", WBT_LAMP, M ("TP_WBALANCE_HMI"), 4800, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("GTI Lamp", WBT_LAMP, M ("TP_WBALANCE_GTI"), 5000, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("JudgeIII Lamp", WBT_LAMP, M ("TP_WBALANCE_JUDGEIII"), 5100, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Solux Lamp 3500K", WBT_LAMP, M ("TP_WBALANCE_SOLUX35"), 3480, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Solux Lamp 4100K", WBT_LAMP, M ("TP_WBALANCE_SOLUX41"), 3930, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Solux Lamp 4700K", WBT_LAMP, M ("TP_WBALANCE_SOLUX47"), 4700, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("NG Solux Lamp 4700K", WBT_LAMP, M ("TP_WBALANCE_SOLUX47_NG"), 4480, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("LED LSI Lumelex 2040", WBT_LED, M ("TP_WBALANCE_LED_LSI"), 2970, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("LED CRS SP12 WWMR16", WBT_LED, M ("TP_WBALANCE_LED_CRS"), 3050, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Flash 5500K", WBT_FLASH, M ("TP_WBALANCE_FLASH55"), 5500, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Flash 6000K", WBT_FLASH, M ("TP_WBALANCE_FLASH60"), 6000, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Flash 6500K", WBT_FLASH, M ("TP_WBALANCE_FLASH65"), 6500, 1.f, 1.f, 0.f));
// Should remain the last one
- wbEntries.push_back(new WBEntry("Custom" , WBT_CUSTOM, M("TP_WBALANCE_CUSTOM"), 0, 1.f, 1.f, 0.f));
+ wbEntries.push_back (new WBEntry ("Custom", WBT_CUSTOM, M ("TP_WBALANCE_CUSTOM"), 0, 1.f, 1.f, 0.f));
}
void WBParams::cleanup()
@@ -112,15 +114,15 @@ void WBParams::cleanup()
}
// Maps crop to resized width (e.g. smaller previews)
-void CropParams::mapToResized(int resizedWidth, int resizedHeight, int scale, int &x1, int &x2, int &y1, int &y2) const
+void CropParams::mapToResized (int resizedWidth, int resizedHeight, int scale, int &x1, int &x2, int &y1, int &y2) const
{
x1 = 0, x2 = resizedWidth, y1 = 0, y2 = resizedHeight;
if (enabled) {
- x1 = min(resizedWidth - 1, max(0, x / scale));
- y1 = min(resizedHeight - 1, max(0, y / scale));
- x2 = min(resizedWidth, max(0, (x + w) / scale));
- y2 = min(resizedHeight, max(0, (y + h) / scale));
+ x1 = min (resizedWidth - 1, max (0, x / scale));
+ y1 = min (resizedHeight - 1, max (0, y / scale));
+ x2 = min (resizedWidth, max (0, (x + w) / scale));
+ y2 = min (resizedHeight, max (0, (y + h) / scale));
}
}
@@ -129,7 +131,7 @@ RetinexParams::RetinexParams ()
setDefaults ();
}
-void RetinexParams::getDefaulttransmissionCurve(std::vector &curve)
+void RetinexParams::getDefaulttransmissionCurve (std::vector &curve)
{
double v[12] = { 0.00, 0.50, 0.35, 0.35,
0.60, 0.75, 0.35, 0.35,
@@ -137,27 +139,27 @@ void RetinexParams::getDefaulttransmissionCurve(std::vector &curve)
};
- curve.resize(13);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (13);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void RetinexParams::getDefaultgaintransmissionCurve(std::vector &curve)
+void RetinexParams::getDefaultgaintransmissionCurve (std::vector &curve)
{
- double v[16] = { 0.00, 0.1, 0.35, 0.00,
+ double v[16] = { 0.00, 0.1, 0.35, 0.00,
0.25, 0.25, 0.35, 0.35,
0.70, 0.25, 0.35, 0.35,
- 1.00, 0.1, 0.00, 0.00
+ 1.00, 0.1, 0.00, 0.00
};
- curve.resize(17);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (17);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
@@ -165,23 +167,23 @@ void RetinexParams::getDefaultgaintransmissionCurve(std::vector &curve)
void RetinexParams::setDefaults()
{
enabled = false;
- str = 20;
- scal = 3;
+ str = 20;
+ scal = 3;
iter = 1;
grad = 1;
grads = 1;
- gam = 1.30;
- slope = 3.;
- neigh = 80;
- offs = 0;
- vart = 200;
+ gam = 1.30;
+ slope = 3.;
+ neigh = 80;
+ offs = 0;
+ vart = 200;
limd = 8;
highl = 4;
- highlights = 0;
- htonalwidth = 80;
- shadows = 0;
- stonalwidth = 80;
- radius = 40;
+ highlights = 0;
+ htonalwidth = 80;
+ shadows = 0;
+ stonalwidth = 80;
+ radius = 40;
skal = 3;
retinexMethod = "high";
@@ -191,88 +193,88 @@ void RetinexParams::setDefaults()
gammaretinex = "none";
medianmap = false;
cdcurve.clear();
- cdcurve.push_back(DCT_Linear);
+ cdcurve.push_back (DCT_Linear);
cdHcurve.clear();
- cdHcurve.push_back(DCT_Linear);
+ cdHcurve.push_back (DCT_Linear);
lhcurve.clear();
- lhcurve.push_back(DCT_Linear);
+ lhcurve.push_back (DCT_Linear);
mapcurve.clear();
- mapcurve.push_back(DCT_Linear);
- getDefaultgaintransmissionCurve(gaintransmissionCurve);
+ mapcurve.push_back (DCT_Linear);
+ getDefaultgaintransmissionCurve (gaintransmissionCurve);
- getDefaulttransmissionCurve(transmissionCurve);
+ getDefaulttransmissionCurve (transmissionCurve);
}
-void RetinexParams::getCurves(RetinextransmissionCurve &transmissionCurveLUT, RetinexgaintransmissionCurve &gaintransmissionCurveLUT) const
+void RetinexParams::getCurves (RetinextransmissionCurve &transmissionCurveLUT, RetinexgaintransmissionCurve &gaintransmissionCurveLUT) const
{
- transmissionCurveLUT.Set(this->transmissionCurve);
- gaintransmissionCurveLUT.Set(this->gaintransmissionCurve);
+ transmissionCurveLUT.Set (this->transmissionCurve);
+ gaintransmissionCurveLUT.Set (this->gaintransmissionCurve);
}
-ColorToningParams::ColorToningParams () : hlColSat(60, 80, false), shadowsColSat(80, 208, false)
+ColorToningParams::ColorToningParams () : hlColSat (60, 80, false), shadowsColSat (80, 208, false)
{
setDefaults();
}
-void ColorToningParams::getDefaultColorCurve(std::vector &curve)
+void ColorToningParams::getDefaultColorCurve (std::vector &curve)
{
double v[8] = { 0.050, 0.62, 0.25, 0.25,
0.585, 0.11, 0.25, 0.25
};
- curve.resize(9);
- curve.at(0) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void ColorToningParams::getDefaultOpacityCurve(std::vector &curve)
+void ColorToningParams::getDefaultOpacityCurve (std::vector &curve)
{
double v[16] = { 0.00, 0.3, 0.35, 0.00,
0.25, 0.8, 0.35, 0.35,
0.70, 0.8, 0.35, 0.35,
1.00, 0.3, 0.00, 0.00
};
- curve.resize(17);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (17);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void ColorToningParams::getDefaultCLCurve(std::vector &curve)
+void ColorToningParams::getDefaultCLCurve (std::vector &curve)
{
double v[6] = { 0.00, 0.00,
0.35, 0.65,
1.00, 1.00
};
- curve.resize(7);
- curve.at(0) = double(DCT_NURBS);
+ curve.resize (7);
+ curve.at (0) = double (DCT_NURBS);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void ColorToningParams::getDefaultCL2Curve(std::vector &curve)
+void ColorToningParams::getDefaultCL2Curve (std::vector &curve)
{
double v[6] = { 0.00, 0.00,
0.35, 0.65,
1.00, 1.00
};
- curve.resize(7);
- curve.at(0) = double(DCT_NURBS);
+ curve.resize (7);
+ curve.at (0) = double (DCT_NURBS);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
@@ -282,13 +284,13 @@ void ColorToningParams::setDefaults()
autosat = true;
method = "Lab";
- getDefaultColorCurve(colorCurve);
- getDefaultOpacityCurve(opacityCurve);
- getDefaultCLCurve(clcurve);
- getDefaultCL2Curve(cl2curve);
+ getDefaultColorCurve (colorCurve);
+ getDefaultOpacityCurve (opacityCurve);
+ getDefaultCLCurve (clcurve);
+ getDefaultCL2Curve (cl2curve);
- hlColSat.setValues(60, 80);
- shadowsColSat.setValues(80, 208);
+ hlColSat.setValues (60, 80);
+ shadowsColSat.setValues (80, 208);
balance = 0;
satProtectionThreshold = 30;
saturatedOpacity = 80;
@@ -308,37 +310,37 @@ void ColorToningParams::setDefaults()
bluehigh = 0.0;
}
-void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vector &opacityCurve) const
+void ColorToningParams::mixerToCurve (std::vector &colorCurve, std::vector &opacityCurve) const
{
// check if non null first
if (!redlow && !greenlow && !bluelow && !redmed && !greenmed && !bluemed && !redhigh && !greenhigh && !bluehigh) {
- colorCurve.resize(1);
- colorCurve.at(0) = FCT_Linear;
- opacityCurve.resize(1);
- opacityCurve.at(0) = FCT_Linear;
+ colorCurve.resize (1);
+ colorCurve.at (0) = FCT_Linear;
+ opacityCurve.resize (1);
+ opacityCurve.at (0) = FCT_Linear;
return;
}
- float low[3]; // RGB color for shadows
- float med[3]; // RGB color for mid-tones
+ float low[3]; // RGB color for shadows
+ float med[3]; // RGB color for mid-tones
float high[3]; // RGB color for highlights
- float lowSat = 0.f;
- float medSat = 0.f;
+ float lowSat = 0.f;
+ float medSat = 0.f;
float highSat = 0.f;
float minTmp, maxTmp;
- // Fill the shadow mixer values of the Color TOning tool
- low[0] = float(redlow ) / 100.f; // [-1. ; +1.]
- low[1] = float(greenlow) / 100.f; // [-1. ; +1.]
- low[2] = float(bluelow ) / 100.f; // [-1. ; +1.]
- minTmp = min(low[0], low[1], low[2]);
- maxTmp = max(low[0], low[1], low[2]);
+// Fill the shadow mixer values of the Color TOning tool
+ low[0] = float (redlow ) / 100.f; // [-1. ; +1.]
+ low[1] = float (greenlow) / 100.f; // [-1. ; +1.]
+ low[2] = float (bluelow ) / 100.f; // [-1. ; +1.]
+ minTmp = min (low[0], low[1], low[2]);
+ maxTmp = max (low[0], low[1], low[2]);
if (maxTmp - minTmp > 0.005f) {
float v[3];
lowSat = (maxTmp - minTmp) / 2.f;
- if (low[0] == minTmp) {
+ if (low[0] == minTmp) {
v[0] = 0.f;
} else if (low[1] == minTmp) {
v[1] = 0.f;
@@ -346,7 +348,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 0.f;
}
- if (low[0] == maxTmp) {
+ if (low[0] == maxTmp) {
v[0] = 1.f;
} else if (low[1] == maxTmp) {
v[1] = 1.f;
@@ -354,7 +356,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 1.f;
}
- if (low[0] != minTmp && low[0] != maxTmp) {
+ if (low[0] != minTmp && low[0] != maxTmp) {
v[0] = (low[0] - minTmp) / (maxTmp - minTmp);
} else if (low[1] != minTmp && low[1] != maxTmp) {
v[1] = (low[1] - minTmp) / (maxTmp - minTmp);
@@ -369,18 +371,18 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
low[0] = low[1] = low[2] = 1.f;
}
- // Fill the mid-tones mixer values of the Color TOning tool
- med[0] = float(redmed ) / 100.f; // [-1. ; +1.]
- med[1] = float(greenmed) / 100.f; // [-1. ; +1.]
- med[2] = float(bluemed ) / 100.f; // [-1. ; +1.]
- minTmp = min(med[0], med[1], med[2]);
- maxTmp = max(med[0], med[1], med[2]);
+// Fill the mid-tones mixer values of the Color TOning tool
+ med[0] = float (redmed ) / 100.f; // [-1. ; +1.]
+ med[1] = float (greenmed) / 100.f; // [-1. ; +1.]
+ med[2] = float (bluemed ) / 100.f; // [-1. ; +1.]
+ minTmp = min (med[0], med[1], med[2]);
+ maxTmp = max (med[0], med[1], med[2]);
if (maxTmp - minTmp > 0.005f) {
float v[3];
medSat = (maxTmp - minTmp) / 2.f;
- if (med[0] == minTmp) {
+ if (med[0] == minTmp) {
v[0] = 0.f;
} else if (med[1] == minTmp) {
v[1] = 0.f;
@@ -388,7 +390,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 0.f;
}
- if (med[0] == maxTmp) {
+ if (med[0] == maxTmp) {
v[0] = 1.f;
} else if (med[1] == maxTmp) {
v[1] = 1.f;
@@ -396,7 +398,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 1.f;
}
- if (med[0] != minTmp && med[0] != maxTmp) {
+ if (med[0] != minTmp && med[0] != maxTmp) {
v[0] = (med[0] - minTmp) / (maxTmp - minTmp);
} else if (med[1] != minTmp && med[1] != maxTmp) {
v[1] = (med[1] - minTmp) / (maxTmp - minTmp);
@@ -412,17 +414,17 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
}
// Fill the highlight mixer values of the Color TOning tool
- high[0] = float(redhigh ) / 100.f; // [-1. ; +1.]
- high[1] = float(greenhigh) / 100.f; // [-1. ; +1.]
- high[2] = float(bluehigh ) / 100.f; // [-1. ; +1.]
- minTmp = min(high[0], high[1], high[2]);
- maxTmp = max(high[0], high[1], high[2]);
+ high[0] = float (redhigh ) / 100.f; // [-1. ; +1.]
+ high[1] = float (greenhigh) / 100.f; // [-1. ; +1.]
+ high[2] = float (bluehigh ) / 100.f; // [-1. ; +1.]
+ minTmp = min (high[0], high[1], high[2]);
+ maxTmp = max (high[0], high[1], high[2]);
if (maxTmp - minTmp > 0.005f) {
float v[3];
highSat = (maxTmp - minTmp) / 2.f;
- if (high[0] == minTmp) {
+ if (high[0] == minTmp) {
v[0] = 0.f;
} else if (high[1] == minTmp) {
v[1] = 0.f;
@@ -430,7 +432,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 0.f;
}
- if (high[0] == maxTmp) {
+ if (high[0] == maxTmp) {
v[0] = 1.f;
} else if (high[1] == maxTmp) {
v[1] = 1.f;
@@ -438,7 +440,7 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
v[2] = 1.f;
}
- if (high[0] != minTmp && high[0] != maxTmp) {
+ if (high[0] != minTmp && high[0] != maxTmp) {
v[0] = (high[0] - minTmp) / (maxTmp - minTmp);
} else if (high[1] != minTmp && high[1] != maxTmp) {
v[1] = (high[1] - minTmp) / (maxTmp - minTmp);
@@ -462,100 +464,100 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
- colorCurve.resize( medSat != 0.f ? 13 : 9 );
- colorCurve.at(0) = FCT_MinMaxCPoints;
- opacityCurve.resize(13);
- opacityCurve.at(0) = FCT_MinMaxCPoints;
+ colorCurve.resize ( medSat != 0.f ? 13 : 9 );
+ colorCurve.at (0) = FCT_MinMaxCPoints;
+ opacityCurve.resize (13);
+ opacityCurve.at (0) = FCT_MinMaxCPoints;
float h, s, l;
int idx = 1;
if (lowSat == 0.f) {
if (medSat != 0.f) {
- Color::rgb2hsl(med[0], med[1], med[2], h, s, l);
+ Color::rgb2hsl (med[0], med[1], med[2], h, s, l);
} else { // highSat can't be null if the 2 other ones are!
- Color::rgb2hsl(high[0], high[1], high[2], h, s, l);
+ Color::rgb2hsl (high[0], high[1], high[2], h, s, l);
}
} else {
- Color::rgb2hsl(low[0], low[1], low[2], h, s, l);
+ Color::rgb2hsl (low[0], low[1], low[2], h, s, l);
}
- colorCurve.at(idx++) = xPosLow;
- colorCurve.at(idx++) = h;
- colorCurve.at(idx++) = 0.35;
- colorCurve.at(idx++) = 0.35;
+ colorCurve.at (idx++) = xPosLow;
+ colorCurve.at (idx++) = h;
+ colorCurve.at (idx++) = 0.35;
+ colorCurve.at (idx++) = 0.35;
if (medSat != 0.f) {
- Color::rgb2hsl(med[0], med[1], med[2], h, s, l);
- colorCurve.at(idx++) = xPosMed;
- colorCurve.at(idx++) = h;
- colorCurve.at(idx++) = 0.35;
- colorCurve.at(idx++) = 0.35;
+ Color::rgb2hsl (med[0], med[1], med[2], h, s, l);
+ colorCurve.at (idx++) = xPosMed;
+ colorCurve.at (idx++) = h;
+ colorCurve.at (idx++) = 0.35;
+ colorCurve.at (idx++) = 0.35;
}
if (highSat == 0.f) {
if (medSat != 0.f) {
- Color::rgb2hsl(med[0], med[1], med[2], h, s, l);
+ Color::rgb2hsl (med[0], med[1], med[2], h, s, l);
} else { // lowSat can't be null if the 2 other ones are!
- Color::rgb2hsl(low[0], low[1], low[2], h, s, l);
+ Color::rgb2hsl (low[0], low[1], low[2], h, s, l);
}
} else {
- Color::rgb2hsl(high[0], high[1], high[2], h, s, l);
+ Color::rgb2hsl (high[0], high[1], high[2], h, s, l);
}
- colorCurve.at(idx++) = xPosHigh;
- colorCurve.at(idx++) = h;
- colorCurve.at(idx++) = 0.35;
- colorCurve.at(idx) = 0.35;
+ colorCurve.at (idx++) = xPosHigh;
+ colorCurve.at (idx++) = h;
+ colorCurve.at (idx++) = 0.35;
+ colorCurve.at (idx) = 0.35;
- opacityCurve.at(1) = xPosLow;
- opacityCurve.at(2) = double(lowSat);
- opacityCurve.at(3) = 0.35;
- opacityCurve.at(4) = 0.35;
- opacityCurve.at(5) = xPosMed;
- opacityCurve.at(6) = double(medSat);
- opacityCurve.at(7) = 0.35;
- opacityCurve.at(8) = 0.35;
- opacityCurve.at(9) = xPosHigh;
- opacityCurve.at(10) = double(highSat);
- opacityCurve.at(11) = 0.35;
- opacityCurve.at(12) = 0.35;
+ opacityCurve.at (1) = xPosLow;
+ opacityCurve.at (2) = double (lowSat);
+ opacityCurve.at (3) = 0.35;
+ opacityCurve.at (4) = 0.35;
+ opacityCurve.at (5) = xPosMed;
+ opacityCurve.at (6) = double (medSat);
+ opacityCurve.at (7) = 0.35;
+ opacityCurve.at (8) = 0.35;
+ opacityCurve.at (9) = xPosHigh;
+ opacityCurve.at (10) = double (highSat);
+ opacityCurve.at (11) = 0.35;
+ opacityCurve.at (12) = 0.35;
}
-void ColorToningParams::slidersToCurve(std::vector &colorCurve, std::vector &opacityCurve) const
+void ColorToningParams::slidersToCurve (std::vector &colorCurve, std::vector &opacityCurve) const
{
if (hlColSat.value[0] == 0 && shadowsColSat.value[0] == 0) { // if both opacity are null, set both curves to Linear
- colorCurve.resize(1);
- colorCurve.at(0) = FCT_Linear;
- opacityCurve.resize(1);
- opacityCurve.at(0) = FCT_Linear;
+ colorCurve.resize (1);
+ colorCurve.at (0) = FCT_Linear;
+ opacityCurve.resize (1);
+ opacityCurve.at (0) = FCT_Linear;
return;
}
- colorCurve.resize(9);
- colorCurve.at(0) = FCT_MinMaxCPoints;
- colorCurve.at(1) = 0.26 + 0.12 * double(balance) / 100.;
- colorCurve.at(2) = double(shadowsColSat.value[1]) / 360.;
- colorCurve.at(3) = 0.35;
- colorCurve.at(4) = 0.35;
- colorCurve.at(5) = 0.64 + 0.12 * double(balance) / 100.;
- colorCurve.at(6) = double(hlColSat.value[1]) / 360.;
- colorCurve.at(7) = 0.35;
- colorCurve.at(8) = 0.35;
+ colorCurve.resize (9);
+ colorCurve.at (0) = FCT_MinMaxCPoints;
+ colorCurve.at (1) = 0.26 + 0.12 * double (balance) / 100.;
+ colorCurve.at (2) = double (shadowsColSat.value[1]) / 360.;
+ colorCurve.at (3) = 0.35;
+ colorCurve.at (4) = 0.35;
+ colorCurve.at (5) = 0.64 + 0.12 * double (balance) / 100.;
+ colorCurve.at (6) = double (hlColSat.value[1]) / 360.;
+ colorCurve.at (7) = 0.35;
+ colorCurve.at (8) = 0.35;
- opacityCurve.resize(9);
- opacityCurve.at(0) = FCT_MinMaxCPoints;
- opacityCurve.at(1) = colorCurve.at(1);
- opacityCurve.at(2) = double(shadowsColSat.value[0]) / 100.;
- opacityCurve.at(3) = 0.35;
- opacityCurve.at(4) = 0.35;
- opacityCurve.at(5) = colorCurve.at(5);
- opacityCurve.at(6) = double(hlColSat.value[0]) / 100.;
- opacityCurve.at(7) = 0.35;
- opacityCurve.at(8) = 0.35;
+ opacityCurve.resize (9);
+ opacityCurve.at (0) = FCT_MinMaxCPoints;
+ opacityCurve.at (1) = colorCurve.at (1);
+ opacityCurve.at (2) = double (shadowsColSat.value[0]) / 100.;
+ opacityCurve.at (3) = 0.35;
+ opacityCurve.at (4) = 0.35;
+ opacityCurve.at (5) = colorCurve.at (5);
+ opacityCurve.at (6) = double (hlColSat.value[0]) / 100.;
+ opacityCurve.at (7) = 0.35;
+ opacityCurve.at (8) = 0.35;
}
-void ColorToningParams::getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const
+void ColorToningParams::getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const
{
float satur = 0.8f;
float lumin = 0.5f; //middle of luminance for optimization of gamut - no real importance...as we work in XYZ and gamut control
@@ -564,94 +566,127 @@ void ColorToningParams::getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurv
std::vector cCurve, oCurve;
if (method == "RGBSliders" || method == "Splitlr") {
- slidersToCurve(cCurve, oCurve);
+ slidersToCurve (cCurve, oCurve);
} else if (method == "Splitco") {
- mixerToCurve(cCurve, oCurve);
+ mixerToCurve (cCurve, oCurve);
} else {
cCurve = this->colorCurve;
oCurve = this->opacityCurve;
}
- if(method == "Lab") {
- if(twocolor == "Separ") {
+ if (method == "Lab") {
+ if (twocolor == "Separ") {
satur = 0.9f;
}
- if(twocolor == "All" || twocolor == "Two") {
+ if (twocolor == "All" || twocolor == "Two") {
satur = 0.9f;
}
- colorCurveLUT.SetXYZ(cCurve, xyz_rgb, rgb_xyz, satur, lumin);
- opacityCurveLUT.Set(oCurve, opautili);
- } else if(method == "Splitlr" || method == "Splitco") {
- colorCurveLUT.SetXYZ(cCurve, xyz_rgb, rgb_xyz, satur, lumin);
- opacityCurveLUT.Set(oCurve, opautili);
- } else if(method.substr(0, 3) == "RGB") {
- colorCurveLUT.SetRGB(cCurve, xyz_rgb, rgb_xyz);
- opacityCurveLUT.Set(oCurve, opautili);
+ colorCurveLUT.SetXYZ (cCurve, xyz_rgb, rgb_xyz, satur, lumin);
+ opacityCurveLUT.Set (oCurve, opautili);
+ } else if (method == "Splitlr" || method == "Splitco") {
+ colorCurveLUT.SetXYZ (cCurve, xyz_rgb, rgb_xyz, satur, lumin);
+ opacityCurveLUT.Set (oCurve, opautili);
+ } else if (method.substr (0, 3) == "RGB") {
+ colorCurveLUT.SetRGB (cCurve, xyz_rgb, rgb_xyz);
+ opacityCurveLUT.Set (oCurve, opautili);
}
}
-SharpeningParams::SharpeningParams() : enabled(false), radius(0.5), amount(200), threshold(20, 80, 2000, 1200, false), edgesonly(false), edges_radius(1.9), edges_tolerance(1800), halocontrol(false), halocontrol_amount(85), deconvamount(75), deconvradius(0.75), deconviter(30), deconvdamping(20) {};
+SharpeningParams::SharpeningParams() :
+ enabled (false),
+ radius (0.5),
+ amount (200),
+ threshold (20, 80, 2000, 1200, false),
+ edgesonly (false),
+ edges_radius (1.9),
+ edges_tolerance (1800),
+ halocontrol (false),
+ halocontrol_amount (85),
+ deconvamount (75),
+ deconvradius (0.75),
+ deconviter (30),
+ deconvdamping (20)
+{};
-VibranceParams::VibranceParams() : enabled(false), pastels(0), saturated(0), psthreshold(0, 75, false), protectskins(false), avoidcolorshift(true), pastsattog(true) {};
+VibranceParams::VibranceParams() :
+ enabled (false),
+ pastels (0),
+ saturated (0),
+ psthreshold (0, 75, false),
+ protectskins (false),
+ avoidcolorshift (true),
+ pastsattog (true)
+{};
//WaveletParams::WaveletParams (): hueskin(-5, 25, 170, 120, false), hueskin2(-260, -250, -130, -140, false), hllev(50, 75, 100, 98, false), bllev(0, 2, 50, 25, false), pastlev(0, 2, 30, 20, false), satlev(30, 45, 130, 100, false), edgcont(0, 20, 100, 75, false){
-WaveletParams::WaveletParams (): hueskin(-5, 25, 170, 120, false), hueskin2(-260, -250, -130, -140, false), hllev(50, 75, 100, 98, false), bllev(0, 2, 50, 25, false),
- pastlev(0, 2, 30, 20, false), satlev(30, 45, 130, 100, false), edgcont(bl, tl, br, tr, false), /* edgcont(0, 10, 75, 40, false),*/level0noise(0, 0, false), level1noise(0, 0, false), level2noise(0, 0, false), level3noise(0, 0, false)
+WaveletParams::WaveletParams() :
+ hueskin ( -5, 25, 170, 120, false),
+ hueskin2 (-260, -250, -130, -140, false),
+ hllev ( 50, 75, 100, 98, false),
+ bllev ( 0, 2, 50, 25, false),
+ pastlev ( 0, 2, 30, 20, false),
+ satlev ( 30, 45, 130, 100, false),
+ edgcont ( bl, tl, br, tr, false),
+ /*edgcont ( 0, 10, 75, 40, false),*/
+ level0noise (0, 0, false),
+ level1noise (0, 0, false),
+ level2noise (0, 0, false),
+ level3noise (0, 0, false)
{
setDefaults ();
}
-void WaveletParams::getDefaultOpacityCurveRG(std::vector &curve)
+void WaveletParams::getDefaultOpacityCurveRG (std::vector &curve)
{
- double v[8] = { 0.0, 0.50, 0.35, 0.35,
+ double v[8] = { 0.0, 0.50, 0.35, 0.35,
1.00, 0.50, 0.35, 0.35
};
- curve.resize(9);
- curve.at(0) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void WaveletParams::getDefaultOpacityCurveBY(std::vector &curve)
+void WaveletParams::getDefaultOpacityCurveBY (std::vector &curve)
{
- double v[8] = { 0.0, 0.50, 0.35, 0.35,
+ double v[8] = { 0.0, 0.50, 0.35, 0.35,
1.00, 0.50, 0.35, 0.35
};
- curve.resize(9);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void WaveletParams::getDefaultOpacityCurveW(std::vector &curve)
+void WaveletParams::getDefaultOpacityCurveW (std::vector &curve)
{
double v[16] = { 0.00, 0.35, 0.35, 0.00,
0.35, 0.75, 0.35, 0.35,
0.60, 0.75, 0.35, 0.35,
1.00, 0.35, 0.00, 0.00
};
- curve.resize(17);
- curve.at(0) = double(FCT_MinMaxCPoints);
+ curve.resize (17);
+ curve.at (0) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void WaveletParams::getDefaultOpacityCurveWL(std::vector &curve)
+void WaveletParams::getDefaultOpacityCurveWL (std::vector &curve)
{
- double v[8] = { 0.0, 0.50, 0.35, 0.35,
+ double v[8] = { 0.0, 0.50, 0.35, 0.35,
1.00, 0.50, 0.35, 0.35
};
@@ -659,47 +694,48 @@ void WaveletParams::getDefaultOpacityCurveWL(std::vector &curve)
0.42, 0.53, 0.35, 0.35,
1.00, 0.15, 0.00, 0.00 };
*/
- curve.resize(9);
- curve.at(0) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void WaveletParams::getDefaultCCWCurve(std::vector &curve)
+void WaveletParams::getDefaultCCWCurve (std::vector &curve)
{
- double v[12] = { 0.0, 0.25, 0.35, 0.35,
- 0.50, 0.75, 0.35, 0.35, 0.90, 0.0, 0.35, 0.35
+ double v[12] = { 0.0, 0.25, 0.35, 0.35,
+ 0.50, 0.75, 0.35, 0.35,
+ 0.90, 0.0, 0.35, 0.35
};
- curve.resize(13);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (13);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void WaveletParams::getCurves(WavCurve &cCurve, WavOpacityCurveRG &opacityCurveLUTRG, WavOpacityCurveBY &opacityCurveLUTBY, WavOpacityCurveW &opacityCurveLUTW, WavOpacityCurveWL &opacityCurveLUTWL) const
+void WaveletParams::getCurves (WavCurve &cCurve, WavOpacityCurveRG &opacityCurveLUTRG, WavOpacityCurveBY &opacityCurveLUTBY, WavOpacityCurveW &opacityCurveLUTW, WavOpacityCurveWL &opacityCurveLUTWL) const
{
- cCurve.Set(this->ccwcurve);
- opacityCurveLUTRG.Set(this->opacityCurveRG);
- opacityCurveLUTBY.Set(this->opacityCurveBY);
- opacityCurveLUTW.Set(this->opacityCurveW);
- opacityCurveLUTWL.Set(this->opacityCurveWL);
+ cCurve.Set (this->ccwcurve);
+ opacityCurveLUTRG.Set (this->opacityCurveRG);
+ opacityCurveLUTBY.Set (this->opacityCurveBY);
+ opacityCurveLUTW.Set (this->opacityCurveW);
+ opacityCurveLUTWL.Set (this->opacityCurveWL);
}
void WaveletParams::setDefaults()
{
- getDefaultCCWCurve(ccwcurve);
- getDefaultOpacityCurveRG(opacityCurveRG);
- getDefaultOpacityCurveBY(opacityCurveBY);
- getDefaultOpacityCurveW(opacityCurveW);
- getDefaultOpacityCurveWL(opacityCurveWL);
+ getDefaultCCWCurve (ccwcurve);
+ getDefaultOpacityCurveRG (opacityCurveRG);
+ getDefaultOpacityCurveBY (opacityCurveBY);
+ getDefaultOpacityCurveW (opacityCurveW);
+ getDefaultOpacityCurveWL (opacityCurveWL);
enabled = false;
median = false;
medianlev = false;
@@ -713,40 +749,40 @@ void WaveletParams::setDefaults()
balance = 0;
iter = 0;
wavclCurve.clear ();
- wavclCurve.push_back(DCT_Linear);
+ wavclCurve.push_back (DCT_Linear);
- Lmethod = "4_";
- CHmethod = "without";
- CHSLmethod = "SL";
- EDmethod = "CU";
- NPmethod = "none";
- BAmethod = "none";
- TMmethod = "cont";
- HSmethod = "with";
- CLmethod = "all";
- Backmethod = "grey";
- Dirmethod = "all";
- Tilesmethod = "full";
- daubcoeffmethod = "4_";
- rescon = 0;
- resconH = 0;
- reschro = 0;
- tmrs = 0;
- gamma = 1;
- sky = 0.;
- sup = 0;
- thres = 7;
- chroma = 5;
- chro = 0;
- contrast = 0;
- edgrad = 15;
- edgval = 0;
- edgthresh = 10;
- thr = 35;
- thrH = 65;
+ Lmethod = "4_";
+ CHmethod = "without";
+ CHSLmethod = "SL";
+ EDmethod = "CU";
+ NPmethod = "none";
+ BAmethod = "none";
+ TMmethod = "cont";
+ HSmethod = "with";
+ CLmethod = "all";
+ Backmethod = "grey";
+ Dirmethod = "all";
+ Tilesmethod = "full";
+ daubcoeffmethod = "4_";
+ rescon = 0;
+ resconH = 0;
+ reschro = 0;
+ tmrs = 0;
+ gamma = 1;
+ sky = 0.;
+ sup = 0;
+ thres = 7;
+ chroma = 5;
+ chro = 0;
+ contrast = 0;
+ edgrad = 15;
+ edgval = 0;
+ edgthresh = 10;
+ thr = 35;
+ thrH = 65;
skinprotect = 0.;
- hueskin.setValues(-5, 25, 170, 120);
- hueskin2.setValues(-260, -250, -130, -140);
+ hueskin.setValues ( -5, 25, 170, 120);
+ hueskin2.setValues (-260, -250, -130, -140);
threshold = 5;
threshold2 = 4;
edgedetect = 90;
@@ -754,20 +790,20 @@ void WaveletParams::setDefaults()
edgedetectthr2 = 0;
edgesensi = 60;
edgeampli = 10;
- hllev.setValues(50, 75, 100, 98);
- bllev.setValues(0, 2, 50, 25);
- pastlev.setValues(0, 2, 30, 20);
- satlev.setValues(30, 45, 130, 100);
-// edgcont.setValues(bl, tl, br, tr);
- edgcont.setValues(0, 10, 75, 40);
- level0noise.setValues(0, 0);
- level1noise.setValues(0, 0);
- level2noise.setValues(0, 0);
- level3noise.setValues(0, 0);
+ hllev.setValues (50, 75, 100, 98);
+ bllev.setValues ( 0, 2, 50, 25);
+ pastlev.setValues ( 0, 2, 30, 20);
+ satlev.setValues (30, 45, 130, 100);
+ //edgcont.setValues (bl, tl, br, tr);
+ edgcont.setValues ( 0, 10, 75, 40);
+ level0noise.setValues (0, 0);
+ level1noise.setValues (0, 0);
+ level2noise.setValues (0, 0);
+ level3noise.setValues (0, 0);
hhcurve.clear ();
- hhcurve.push_back(FCT_Linear);
+ hhcurve.push_back (FCT_Linear);
Chcurve.clear ();
- Chcurve.push_back(FCT_Linear);
+ Chcurve.push_back (FCT_Linear);
expcontrast = false;
expchroma = false;
expedge = false;
@@ -776,13 +812,14 @@ void WaveletParams::setDefaults()
exptoning = false;
expnoise = false;
- for(int i = 0; i < 9; i ++) {
+ for (int i = 0; i < 9; i ++) {
c[i] = 0;
}
- for(int i = 0; i < 9; i ++) {
+ for (int i = 0; i < 9; i ++) {
ch[i] = 0;
}
+
greenlow = greenmed = greenhigh = 0.0;
bluelow = bluemed = bluehigh = 0.0;
@@ -794,20 +831,20 @@ DirPyrDenoiseParams::DirPyrDenoiseParams ()
setDefaults ();
}
-void DirPyrDenoiseParams::getDefaultNoisCurve(std::vector &curve)
+void DirPyrDenoiseParams::getDefaultNoisCurve (std::vector &curve)
{
double v[8] = { 0.05, 0.15, 0.35, 0.35,
0.55, 0.04, 0.35, 0.35
};
- curve.resize(9);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
-void DirPyrDenoiseParams::getDefaultCCCurve(std::vector &curve)
+void DirPyrDenoiseParams::getDefaultCCCurve (std::vector &curve)
{
// double v[8]= { 0.15, 0.00,0.35,0.35,
// 0.60, 0.05,0.35,0.35};
@@ -815,11 +852,11 @@ void DirPyrDenoiseParams::getDefaultCCCurve(std::vector &curve)
0.35, 0.05, 0.35, 0.35
};
- curve.resize(9);
- curve.at(0 ) = double(FCT_MinMaxCPoints);
+ curve.resize (9);
+ curve.at (0 ) = double (FCT_MinMaxCPoints);
for (size_t i = 1; i < curve.size(); ++i) {
- curve.at(i) = v[i - 1];
+ curve.at (i) = v[i - 1];
}
}
@@ -827,8 +864,8 @@ void DirPyrDenoiseParams::getDefaultCCCurve(std::vector &curve)
void DirPyrDenoiseParams::setDefaults()
{
- getDefaultNoisCurve(lcurve);
- getDefaultCCCurve(cccurve);
+ getDefaultNoisCurve (lcurve);
+ getDefaultCCCurve (cccurve);
enabled = false;
enhance = false;
@@ -852,32 +889,32 @@ void DirPyrDenoiseParams::setDefaults()
perform = false;
}
-void DirPyrDenoiseParams::getCurves(NoiseCurve &lCurve, NoiseCurve &cCurve) const
+void DirPyrDenoiseParams::getCurves (NoiseCurve &lCurve, NoiseCurve &cCurve) const
{
- lCurve.Set(this->lcurve);
- cCurve.Set(this->cccurve);
+ lCurve.Set (this->lcurve);
+ cCurve.Set (this->cccurve);
}
void ToneCurveParams::setDefaults()
{
- autoexp = false;
- clip = 0.02;
- expcomp = 0;
- brightness = 0;
- contrast = 0;
- saturation = 0;
- black = 0;
- hlcompr = 0;
+ autoexp = false;
+ clip = 0.02;
+ expcomp = 0;
+ brightness = 0;
+ contrast = 0;
+ saturation = 0;
+ black = 0;
+ hlcompr = 0;
hlcomprthresh = 33;
- shcompr = 50;
+ shcompr = 50;
curve.clear ();
- curve.push_back(DCT_Linear);
+ curve.push_back (DCT_Linear);
curve2.clear ();
- curve2.push_back(DCT_Linear);
- curveMode = ToneCurveParams::TC_MODE_STD;
- curveMode2 = ToneCurveParams::TC_MODE_STD;
+ curve2.push_back (DCT_Linear);
+ curveMode = ToneCurveParams::TC_MODE_STD;
+ curveMode2 = ToneCurveParams::TC_MODE_STD;
hrenabled = false;
- method = "Blend";
+ method = "Blend";
}
void LensProfParams::setDefaults()
@@ -932,7 +969,7 @@ void RAWParams::setDefaults()
bayersensor.ccSteps = 0;
bayersensor.dcb_iterations = 2;
bayersensor.dcb_enhance = true;
- //bayersensor.all_enhance = false;
+//bayersensor.all_enhance = false;
bayersensor.lmmse_iterations = 2;
bayersensor.black0 = 0.0;
bayersensor.black1 = 0.0;
@@ -970,17 +1007,17 @@ void RAWParams::setDefaults()
void ColorManagementParams::setDefaults()
{
- input = "(cameraICC)";
+ input = "(cameraICC)";
toneCurve = false;
applyLookTable = false;
applyBaselineExposureOffset = true;
applyHueSatMap = true;
dcpIlluminant = 0;
working = "ProPhoto";
- output = "RT_sRGB";
- outputIntent = RI_RELATIVE;
+ output = "RT_sRGB";
+ outputIntent = RI_RELATIVE;
outputBPC = true;
- gamma = "default";
+ gamma = "default";
gampos = 2.22;
slpos = 4.5;
freegamma = false;
@@ -1021,164 +1058,167 @@ void ProcParams::setDefaults ()
toneCurve.setDefaults();
- labCurve.brightness = 0;
- labCurve.contrast = 0;
- labCurve.chromaticity = 0;
+ labCurve.brightness = 0;
+ labCurve.contrast = 0;
+ labCurve.chromaticity = 0;
labCurve.avoidcolorshift = false;
labCurve.lcredsk = true;
- labCurve.rstprotection = 0;
+ labCurve.rstprotection = 0;
labCurve.lcurve.clear ();
- labCurve.lcurve.push_back(DCT_Linear);
+ labCurve.lcurve.push_back (DCT_Linear);
labCurve.acurve.clear ();
- labCurve.acurve.push_back(DCT_Linear);
+ labCurve.acurve.push_back (DCT_Linear);
labCurve.bcurve.clear ();
- labCurve.bcurve.push_back(DCT_Linear);
+ labCurve.bcurve.push_back (DCT_Linear);
labCurve.cccurve.clear ();
- labCurve.cccurve.push_back(DCT_Linear);
+ labCurve.cccurve.push_back (DCT_Linear);
labCurve.chcurve.clear ();
- labCurve.chcurve.push_back(FCT_Linear);
+ labCurve.chcurve.push_back (FCT_Linear);
labCurve.lhcurve.clear ();
- labCurve.lhcurve.push_back(FCT_Linear);
+ labCurve.lhcurve.push_back (FCT_Linear);
labCurve.hhcurve.clear ();
- labCurve.hhcurve.push_back(FCT_Linear);
+ labCurve.hhcurve.push_back (FCT_Linear);
labCurve.lccurve.clear ();
- labCurve.lccurve.push_back(DCT_Linear);
+ labCurve.lccurve.push_back (DCT_Linear);
labCurve.clcurve.clear ();
- labCurve.clcurve.push_back(DCT_Linear);
+ labCurve.clcurve.push_back (DCT_Linear);
- rgbCurves.lumamode = false;
+ rgbCurves.lumamode = false;
rgbCurves.rcurve.clear ();
- rgbCurves.rcurve.push_back(DCT_Linear);
+ rgbCurves.rcurve.push_back (DCT_Linear);
rgbCurves.gcurve.clear ();
- rgbCurves.gcurve.push_back(DCT_Linear);
+ rgbCurves.gcurve.push_back (DCT_Linear);
rgbCurves.bcurve.clear ();
- rgbCurves.bcurve.push_back(DCT_Linear);
+ rgbCurves.bcurve.push_back (DCT_Linear);
colorToning.setDefaults();
- sharpenEdge.enabled = false;
- sharpenEdge.passes = 2;
- sharpenEdge.amount = 50.0;
- sharpenEdge.threechannels = false;
+ sharpenEdge.enabled = false;
+ sharpenEdge.passes = 2;
+ sharpenEdge.amount = 50.0;
+ sharpenEdge.threechannels = false;
- sharpenMicro.enabled = false;
- sharpenMicro.amount = 20.0;
- sharpenMicro.uniformity = 50.0;
- sharpenMicro.matrix = false;
+ sharpenMicro.enabled = false;
+ sharpenMicro.amount = 20.0;
+ sharpenMicro.uniformity = 50.0;
+ sharpenMicro.matrix = false;
- sharpening.enabled = false;
- sharpening.radius = 0.5;
- sharpening.amount = 200;
- sharpening.threshold.setValues(20, 80, 2000, 1200);
- sharpening.edgesonly = false;
- sharpening.edges_radius = 1.9;
- sharpening.edges_tolerance = 1800;
- sharpening.halocontrol = false;
+ sharpening.enabled = false;
+ sharpening.radius = 0.5;
+ sharpening.amount = 200;
+ sharpening.threshold.setValues (20, 80, 2000, 1200);
+ sharpening.edgesonly = false;
+ sharpening.edges_radius = 1.9;
+ sharpening.edges_tolerance = 1800;
+ sharpening.halocontrol = false;
sharpening.halocontrol_amount = 85;
- sharpening.method = "usm";
- sharpening.deconvradius = 0.75;
- sharpening.deconviter = 30;
- sharpening.deconvdamping = 20;
- sharpening.deconvamount = 75;
+ sharpening.method = "usm";
+ sharpening.deconvradius = 0.75;
+ sharpening.deconviter = 30;
+ sharpening.deconvdamping = 20;
+ sharpening.deconvamount = 75;
- prsharpening.enabled = false;
- prsharpening.radius = 0.5;
- prsharpening.amount = 200;
- prsharpening.threshold.setValues(20, 80, 2000, 1200);
- prsharpening.edgesonly = false;
- prsharpening.edges_radius = 1.9;
- prsharpening.edges_tolerance = 1800;
- prsharpening.halocontrol = false;
+ prsharpening.enabled = false;
+ prsharpening.radius = 0.5;
+ prsharpening.amount = 200;
+ prsharpening.threshold.setValues (20, 80, 2000, 1200);
+ prsharpening.edgesonly = false;
+ prsharpening.edges_radius = 1.9;
+ prsharpening.edges_tolerance = 1800;
+ prsharpening.halocontrol = false;
prsharpening.halocontrol_amount = 85;
- prsharpening.method = "rld";
- prsharpening.deconvradius = 0.45;
- prsharpening.deconviter = 100;
- prsharpening.deconvdamping = 0;
- prsharpening.deconvamount = 100;
+ prsharpening.method = "rld";
+ prsharpening.deconvradius = 0.45;
+ prsharpening.deconviter = 100;
+ prsharpening.deconvdamping = 0;
+ prsharpening.deconvamount = 100;
- vibrance.enabled = false;
- vibrance.pastels = 0;
- vibrance.saturated = 0;
- vibrance.psthreshold.setValues(0, 75);
- vibrance.protectskins = false;
- vibrance.avoidcolorshift = true;
- vibrance.pastsattog = true;
+ vibrance.enabled = false;
+ vibrance.pastels = 0;
+ vibrance.saturated = 0;
+ vibrance.psthreshold.setValues (0, 75);
+ vibrance.protectskins = false;
+ vibrance.avoidcolorshift = true;
+ vibrance.pastsattog = true;
vibrance.skintonescurve.clear ();
- vibrance.skintonescurve.push_back(DCT_Linear);
+ vibrance.skintonescurve.push_back (DCT_Linear);
- wb.method = "Camera";
- wb.temperature = 6504;
- wb.green = 1.0;
- wb.equal = 1.0;
- wb.tempBias = 0.0;
- colorappearance.enabled = false;
- colorappearance.degree = 90;
- colorappearance.autodegree = true;
- colorappearance.surround = "Average";
- colorappearance.adaplum = 16;
- colorappearance.badpixsl = 0;
- colorappearance.adapscen = 2000.0;
- colorappearance.autoadapscen = true;
- colorappearance.algo = "No";
- colorappearance.wbmodel = "RawT";
- colorappearance.jlight = 0.0;
- colorappearance.qbright = 0.0;
- colorappearance.chroma = 0.0;
- colorappearance.schroma = 0.0;
- colorappearance.mchroma = 0.0;
+ wb.method = "Camera";
+ wb.temperature = 6504;
+ wb.green = 1.0;
+ wb.equal = 1.0;
+ wb.tempBias = 0.0;
+ colorappearance.enabled = false;
+ colorappearance.degree = 90;
+ colorappearance.autodegree = true;
+ colorappearance.surround = "Average";
+ colorappearance.adaplum = 16;
+ colorappearance.badpixsl = 0;
+ colorappearance.adapscen = 2000.0;
+ colorappearance.autoadapscen = true;
+ colorappearance.algo = "No";
+ colorappearance.wbmodel = "RawT";
+ colorappearance.jlight = 0.0;
+ colorappearance.qbright = 0.0;
+ colorappearance.chroma = 0.0;
+ colorappearance.schroma = 0.0;
+ colorappearance.mchroma = 0.0;
colorappearance.rstprotection = 0.0;
- colorappearance.contrast = 0.0;
- colorappearance.qcontrast = 0.0;
- colorappearance.colorh = 0.0;
- colorappearance.surrsource = false;
- colorappearance.gamut = true;
-// colorappearance.badpix = false;
- colorappearance.datacie = false;
- colorappearance.tonecie = false;
-// colorappearance.sharpcie = false;
+ colorappearance.contrast = 0.0;
+ colorappearance.qcontrast = 0.0;
+ colorappearance.colorh = 0.0;
+ colorappearance.surrsource = false;
+ colorappearance.gamut = true;
+// colorappearance.badpix = false;
+ colorappearance.datacie = false;
+ colorappearance.tonecie = false;
+// colorappearance.sharpcie = false;
colorappearance.curve.clear ();
- colorappearance.curve.push_back(DCT_Linear);
+ colorappearance.curve.push_back (DCT_Linear);
colorappearance.curve2.clear ();
- colorappearance.curve2.push_back(DCT_Linear);
- colorappearance.curveMode = ColorAppearanceParams::TC_MODE_LIGHT;
- colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_LIGHT;
+ colorappearance.curve2.push_back (DCT_Linear);
+ colorappearance.curveMode = ColorAppearanceParams::TC_MODE_LIGHT;
+ colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_LIGHT;
colorappearance.curve3.clear ();
- colorappearance.curve3.push_back(DCT_Linear);
- colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_CHROMA;
+ colorappearance.curve3.push_back (DCT_Linear);
+ colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_CHROMA;
+ colorappearance.tempout = 5000;
+ colorappearance.greenout = 1.0;
+ colorappearance.ybout = 18;
- impulseDenoise.enabled = false;
- impulseDenoise.thresh = 50;
+ impulseDenoise.enabled = false;
+ impulseDenoise.thresh = 50;
- defringe.enabled = false;
- defringe.radius = 2.0;
- defringe.threshold = 13;
+ defringe.enabled = false;
+ defringe.radius = 2.0;
+ defringe.threshold = 13;
defringe.huecurve.resize (25);
- defringe.huecurve.at(0) = FCT_MinMaxCPoints;
- defringe.huecurve.at(1) = 0.166666667;
- defringe.huecurve.at(2) = 0.;
- defringe.huecurve.at(3) = 0.35;
- defringe.huecurve.at(4) = 0.35;
- defringe.huecurve.at(5) = 0.347;
- defringe.huecurve.at(6) = 0.;
- defringe.huecurve.at(7) = 0.35;
- defringe.huecurve.at(8) = 0.35;
- defringe.huecurve.at(9) = 0.513667426;
- defringe.huecurve.at(10) = 0;
- defringe.huecurve.at(11) = 0.35;
- defringe.huecurve.at(12) = 0.35;
- defringe.huecurve.at(13) = 0.668944571;
- defringe.huecurve.at(14) = 0.;
- defringe.huecurve.at(15) = 0.35;
- defringe.huecurve.at(16) = 0.35;
- defringe.huecurve.at(17) = 0.8287775246;
- defringe.huecurve.at(18) = 0.97835991;
- defringe.huecurve.at(19) = 0.35;
- defringe.huecurve.at(20) = 0.35;
- defringe.huecurve.at(21) = 0.9908883827;
- defringe.huecurve.at(22) = 0.;
- defringe.huecurve.at(23) = 0.35;
- defringe.huecurve.at(24) = 0.35;
+ defringe.huecurve.at (0) = FCT_MinMaxCPoints;
+ defringe.huecurve.at (1) = 0.166666667;
+ defringe.huecurve.at (2) = 0.;
+ defringe.huecurve.at (3) = 0.35;
+ defringe.huecurve.at (4) = 0.35;
+ defringe.huecurve.at (5) = 0.347;
+ defringe.huecurve.at (6) = 0.;
+ defringe.huecurve.at (7) = 0.35;
+ defringe.huecurve.at (8) = 0.35;
+ defringe.huecurve.at (9) = 0.513667426;
+ defringe.huecurve.at (10) = 0;
+ defringe.huecurve.at (11) = 0.35;
+ defringe.huecurve.at (12) = 0.35;
+ defringe.huecurve.at (13) = 0.668944571;
+ defringe.huecurve.at (14) = 0.;
+ defringe.huecurve.at (15) = 0.35;
+ defringe.huecurve.at (16) = 0.35;
+ defringe.huecurve.at (17) = 0.8287775246;
+ defringe.huecurve.at (18) = 0.97835991;
+ defringe.huecurve.at (19) = 0.35;
+ defringe.huecurve.at (20) = 0.35;
+ defringe.huecurve.at (21) = 0.9908883827;
+ defringe.huecurve.at (22) = 0.;
+ defringe.huecurve.at (23) = 0.35;
+ defringe.huecurve.at (24) = 0.35;
dirpyrDenoise.setDefaults();
@@ -1189,35 +1229,35 @@ void ProcParams::setDefaults ()
epd.scale = 1.0;
epd.reweightingIterates = 0;
- sh.enabled = false;
- sh.hq = false;
- sh.highlights = 0;
- sh.htonalwidth = 80;
- sh.shadows = 0;
- sh.stonalwidth = 80;
+ sh.enabled = false;
+ sh.hq = false;
+ sh.highlights = 0;
+ sh.htonalwidth = 80;
+ sh.shadows = 0;
+ sh.stonalwidth = 80;
sh.localcontrast = 0;
- sh.radius = 40;
+ sh.radius = 40;
- crop.enabled = false;
- crop.x = -1;
- crop.y = -1;
- crop.w = 15000;
- crop.h = 15000;
- crop.fixratio = true;
- crop.ratio = "3:2";
+ crop.enabled = false;
+ crop.x = -1;
+ crop.y = -1;
+ crop.w = 15000;
+ crop.h = 15000;
+ crop.fixratio = true;
+ crop.ratio = "3:2";
crop.orientation = "As Image";
- crop.guide = "Frame";
+ crop.guide = "Frame";
coarse.setDefaults();
commonTrans.autofill = true;
- rotate.degree = 0;
+ rotate.degree = 0;
- distortion.amount = 0;
+ distortion.amount = 0;
perspective.horizontal = 0;
- perspective.vertical = 0;
+ perspective.vertical = 0;
gradient.enabled = false;
gradient.degree = 0;
@@ -1231,7 +1271,7 @@ void ProcParams::setDefaults ()
pcvignette.feather = 50;
pcvignette.roundness = 50;
- cacorrection.red = 0;
+ cacorrection.red = 0;
cacorrection.blue = 0;
@@ -1243,29 +1283,29 @@ void ProcParams::setDefaults ()
lensProf.setDefaults();
- chmixer.red[0] = 100;
- chmixer.red[1] = 0;
- chmixer.red[2] = 0;
+ chmixer.red[0] = 100;
+ chmixer.red[1] = 0;
+ chmixer.red[2] = 0;
chmixer.green[0] = 0;
chmixer.green[1] = 100;
chmixer.green[2] = 0;
- chmixer.blue[0] = 0;
- chmixer.blue[1] = 0;
- chmixer.blue[2] = 100;
+ chmixer.blue[0] = 0;
+ chmixer.blue[1] = 0;
+ chmixer.blue[2] = 100;
- blackwhite.autoc = false;
- blackwhite.enabledcc = true;
- blackwhite.enabled = false;
- blackwhite.mixerRed = 33;
- blackwhite.mixerGreen = 33;
- blackwhite.mixerBlue = 33;
+ blackwhite.autoc = false;
+ blackwhite.enabledcc = true;
+ blackwhite.enabled = false;
+ blackwhite.mixerRed = 33;
+ blackwhite.mixerGreen = 33;
+ blackwhite.mixerBlue = 33;
blackwhite.mixerOrange = 33;
blackwhite.mixerYellow = 33;
- blackwhite.mixerCyan = 33;
- blackwhite.mixerMagenta = 33;
+ blackwhite.mixerCyan = 33;
+ blackwhite.mixerMagenta = 33;
blackwhite.mixerPurple = 33;
- blackwhite.gammaRed = 0;
- blackwhite.gammaGreen = 0;
+ blackwhite.gammaRed = 0;
+ blackwhite.gammaGreen = 0;
blackwhite.gammaBlue = 0;
blackwhite.luminanceCurve.clear ();
blackwhite.luminanceCurve.push_back (FCT_Linear);
@@ -1273,15 +1313,15 @@ void ProcParams::setDefaults ()
blackwhite.filter = "None";
blackwhite.setting = "NormalContrast";
blackwhite.beforeCurve.clear ();
- blackwhite.beforeCurve.push_back(DCT_Linear);
- blackwhite.beforeCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
+ blackwhite.beforeCurve.push_back (DCT_Linear);
+ blackwhite.beforeCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
blackwhite.afterCurve.clear ();
- blackwhite.afterCurve.push_back(DCT_Linear);
- blackwhite.afterCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
- blackwhite.algo = "SP";
+ blackwhite.afterCurve.push_back (DCT_Linear);
+ blackwhite.afterCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
+ blackwhite.algo = "SP";
resize.enabled = false;
- resize.scale = 1.0;
+ resize.scale = 1.0;
resize.appliesTo = "Cropped area";
resize.method = "Lanczos";
resize.dataspec = 3;
@@ -1295,14 +1335,14 @@ void ProcParams::setDefaults ()
dirpyrequalizer.cbdlMethod = "bef";
- for(int i = 0; i < 6; i ++) {
+ for (int i = 0; i < 6; i ++) {
dirpyrequalizer.mult[i] = 1.0;
}
dirpyrequalizer.threshold = 0.2;
dirpyrequalizer.skinprotect = 0.;
- dirpyrequalizer.hueskin.setValues(-5, 25, 170, 120); //default (b_l 0, t_l 30, b_r 170, t_r 120);
-// dirpyrequalizer.algo = "FI";
+ dirpyrequalizer.hueskin.setValues (-5, 25, 170, 120); //default (b_l 0, t_l 30, b_r 170, t_r 120);
+// dirpyrequalizer.algo = "FI";
hsvequalizer.hcurve.clear ();
hsvequalizer.hcurve.push_back (FCT_Linear);
@@ -1325,54 +1365,54 @@ void ProcParams::setDefaults ()
ppVersion = PPVERSION;
}
-static Glib::ustring expandRelativePath(const Glib::ustring &procparams_fname, const Glib::ustring &prefix, Glib::ustring embedded_fname)
+static Glib::ustring expandRelativePath (const Glib::ustring &procparams_fname, const Glib::ustring &prefix, Glib::ustring embedded_fname)
{
- if (embedded_fname == "" || !Glib::path_is_absolute(procparams_fname)) {
+ if (embedded_fname == "" || !Glib::path_is_absolute (procparams_fname)) {
return embedded_fname;
}
if (prefix != "") {
- if (embedded_fname.length() < prefix.length() || embedded_fname.substr(0, prefix.length()) != prefix) {
+ if (embedded_fname.length() < prefix.length() || embedded_fname.substr (0, prefix.length()) != prefix) {
return embedded_fname;
}
- embedded_fname = embedded_fname.substr(prefix.length());
+ embedded_fname = embedded_fname.substr (prefix.length());
}
- if (Glib::path_is_absolute(embedded_fname)) {
+ if (Glib::path_is_absolute (embedded_fname)) {
return prefix + embedded_fname;
}
- Glib::ustring absPath = prefix + Glib::path_get_dirname(procparams_fname) + G_DIR_SEPARATOR_S + embedded_fname;
+ Glib::ustring absPath = prefix + Glib::path_get_dirname (procparams_fname) + G_DIR_SEPARATOR_S + embedded_fname;
return absPath;
}
-static Glib::ustring relativePathIfInside(const Glib::ustring &procparams_fname, bool fnameAbsolute, Glib::ustring embedded_fname)
+static Glib::ustring relativePathIfInside (const Glib::ustring &procparams_fname, bool fnameAbsolute, Glib::ustring embedded_fname)
{
- if (fnameAbsolute || embedded_fname == "" || !Glib::path_is_absolute(procparams_fname)) {
+ if (fnameAbsolute || embedded_fname == "" || !Glib::path_is_absolute (procparams_fname)) {
return embedded_fname;
}
Glib::ustring prefix = "";
- if (embedded_fname.length() > 5 && embedded_fname.substr(0, 5) == "file:") {
- embedded_fname = embedded_fname.substr(5);
+ if (embedded_fname.length() > 5 && embedded_fname.substr (0, 5) == "file:") {
+ embedded_fname = embedded_fname.substr (5);
prefix = "file:";
}
- if (!Glib::path_is_absolute(embedded_fname)) {
+ if (!Glib::path_is_absolute (embedded_fname)) {
return prefix + embedded_fname;
}
- Glib::ustring dir1 = Glib::path_get_dirname(procparams_fname) + G_DIR_SEPARATOR_S;
- Glib::ustring dir2 = Glib::path_get_dirname(embedded_fname) + G_DIR_SEPARATOR_S;
+ Glib::ustring dir1 = Glib::path_get_dirname (procparams_fname) + G_DIR_SEPARATOR_S;
+ Glib::ustring dir2 = Glib::path_get_dirname (embedded_fname) + G_DIR_SEPARATOR_S;
- if (dir2.substr(0, dir1.length()) != dir1) {
+ if (dir2.substr (0, dir1.length()) != dir1) {
// it's in a different directory, ie not inside
return prefix + embedded_fname;
}
- return prefix + embedded_fname.substr(dir1.length());
+ return prefix + embedded_fname.substr (dir1.length());
}
int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, bool fnameAbsolute, ParamsEdited* pedited)
@@ -1388,11 +1428,11 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
Glib::KeyFile keyFile;
- keyFile.set_string ("Version", "AppVersion", APPVERSION);
- keyFile.set_integer ("Version", "Version", PPVERSION);
+ keyFile.set_string ("Version", "AppVersion", APPVERSION);
+ keyFile.set_integer ("Version", "Version", PPVERSION);
if (!pedited || pedited->general.rank) {
- keyFile.set_integer ("General", "Rank", rank);
+ keyFile.set_integer ("General", "Rank", rank);
}
if (!pedited || pedited->general.colorlabel) {
@@ -1400,36 +1440,36 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->general.intrash) {
- keyFile.set_boolean ("General", "InTrash", inTrash);
+ keyFile.set_boolean ("General", "InTrash", inTrash);
}
- // save tone curve
+// save tone curve
if (!pedited || pedited->toneCurve.autoexp) {
- keyFile.set_boolean ("Exposure", "Auto", toneCurve.autoexp);
+ keyFile.set_boolean ("Exposure", "Auto", toneCurve.autoexp);
}
if (!pedited || pedited->toneCurve.clip) {
- keyFile.set_double ("Exposure", "Clip", toneCurve.clip);
+ keyFile.set_double ("Exposure", "Clip", toneCurve.clip);
}
if (!pedited || pedited->toneCurve.expcomp) {
- keyFile.set_double ("Exposure", "Compensation", toneCurve.expcomp);
+ keyFile.set_double ("Exposure", "Compensation", toneCurve.expcomp);
}
if (!pedited || pedited->toneCurve.brightness) {
- keyFile.set_integer ("Exposure", "Brightness", toneCurve.brightness);
+ keyFile.set_integer ("Exposure", "Brightness", toneCurve.brightness);
}
if (!pedited || pedited->toneCurve.contrast) {
- keyFile.set_integer ("Exposure", "Contrast", toneCurve.contrast);
+ keyFile.set_integer ("Exposure", "Contrast", toneCurve.contrast);
}
if (!pedited || pedited->toneCurve.saturation) {
- keyFile.set_integer ("Exposure", "Saturation", toneCurve.saturation);
+ keyFile.set_integer ("Exposure", "Saturation", toneCurve.saturation);
}
if (!pedited || pedited->toneCurve.black) {
- keyFile.set_integer ("Exposure", "Black", toneCurve.black);
+ keyFile.set_integer ("Exposure", "Black", toneCurve.black);
}
if (!pedited || pedited->toneCurve.hlcompr) {
@@ -1441,124 +1481,124 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->toneCurve.shcompr) {
- keyFile.set_integer ("Exposure", "ShadowCompr", toneCurve.shcompr);
+ keyFile.set_integer ("Exposure", "ShadowCompr", toneCurve.shcompr);
}
- // save highlight recovery settings
+// save highlight recovery settings
if (!pedited || pedited->toneCurve.hrenabled) {
- keyFile.set_boolean ("HLRecovery", "Enabled", toneCurve.hrenabled);
+ keyFile.set_boolean ("HLRecovery", "Enabled", toneCurve.hrenabled);
}
if (!pedited || pedited->toneCurve.method) {
- keyFile.set_string ("HLRecovery", "Method", toneCurve.method);
+ keyFile.set_string ("HLRecovery", "Method", toneCurve.method);
}
- if (!pedited || pedited->toneCurve.curveMode) {
+ if (!pedited || pedited->toneCurve.curveMode) {
Glib::ustring method;
switch (toneCurve.curveMode) {
- case (ToneCurveParams::TC_MODE_STD):
- method = "Standard";
- break;
+ case (ToneCurveParams::TC_MODE_STD):
+ method = "Standard";
+ break;
- case (ToneCurveParams::TC_MODE_FILMLIKE):
- method = "FilmLike";
- break;
+ case (ToneCurveParams::TC_MODE_FILMLIKE):
+ method = "FilmLike";
+ break;
- case (ToneCurveParams::TC_MODE_SATANDVALBLENDING):
- method = "SatAndValueBlending";
- break;
+ case (ToneCurveParams::TC_MODE_SATANDVALBLENDING):
+ method = "SatAndValueBlending";
+ break;
- case (ToneCurveParams::TC_MODE_WEIGHTEDSTD):
- method = "WeightedStd";
- break;
+ case (ToneCurveParams::TC_MODE_WEIGHTEDSTD):
+ method = "WeightedStd";
+ break;
- case (ToneCurveParams::TC_MODE_LUMINANCE):
- method = "Luminance";
- break;
+ case (ToneCurveParams::TC_MODE_LUMINANCE):
+ method = "Luminance";
+ break;
- case (ToneCurveParams::TC_MODE_PERCEPTUAL):
- method = "Perceptual";
- break;
+ case (ToneCurveParams::TC_MODE_PERCEPTUAL):
+ method = "Perceptual";
+ break;
}
- keyFile.set_string ("Exposure", "CurveMode", method);
+ keyFile.set_string ("Exposure", "CurveMode", method);
}
- if (!pedited || pedited->toneCurve.curveMode2) {
+ if (!pedited || pedited->toneCurve.curveMode2) {
Glib::ustring method;
switch (toneCurve.curveMode2) {
- case (ToneCurveParams::TC_MODE_STD):
- method = "Standard";
- break;
+ case (ToneCurveParams::TC_MODE_STD):
+ method = "Standard";
+ break;
- case (ToneCurveParams::TC_MODE_FILMLIKE):
- method = "FilmLike";
- break;
+ case (ToneCurveParams::TC_MODE_FILMLIKE):
+ method = "FilmLike";
+ break;
- case (ToneCurveParams::TC_MODE_SATANDVALBLENDING):
- method = "SatAndValueBlending";
- break;
+ case (ToneCurveParams::TC_MODE_SATANDVALBLENDING):
+ method = "SatAndValueBlending";
+ break;
- case (ToneCurveParams::TC_MODE_WEIGHTEDSTD):
- method = "WeightedStd";
- break;
+ case (ToneCurveParams::TC_MODE_WEIGHTEDSTD):
+ method = "WeightedStd";
+ break;
- case (ToneCurveParams::TC_MODE_LUMINANCE):
- method = "Luminance";
- break;
+ case (ToneCurveParams::TC_MODE_LUMINANCE):
+ method = "Luminance";
+ break;
- case (ToneCurveParams::TC_MODE_PERCEPTUAL):
- method = "Perceptual";
- break;
+ case (ToneCurveParams::TC_MODE_PERCEPTUAL):
+ method = "Perceptual";
+ break;
}
- keyFile.set_string ("Exposure", "CurveMode2", method);
+ keyFile.set_string ("Exposure", "CurveMode2", method);
}
if (!pedited || pedited->toneCurve.curve) {
Glib::ArrayHandle tcurve = toneCurve.curve;
- keyFile.set_double_list("Exposure", "Curve", tcurve);
+ keyFile.set_double_list ("Exposure", "Curve", tcurve);
}
if (!pedited || pedited->toneCurve.curve2) {
Glib::ArrayHandle tcurve = toneCurve.curve2;
- keyFile.set_double_list("Exposure", "Curve2", tcurve);
+ keyFile.set_double_list ("Exposure", "Curve2", tcurve);
}
- //save retinex
+//save retinex
if (!pedited || pedited->retinex.enabled) {
keyFile.set_boolean ("Retinex", "Enabled", retinex.enabled);
}
if (!pedited || pedited->retinex.str) {
- keyFile.set_integer ("Retinex", "Str", retinex.str);
+ keyFile.set_integer ("Retinex", "Str", retinex.str);
}
if (!pedited || pedited->retinex.scal) {
- keyFile.set_integer ("Retinex", "Scal", retinex.scal);
+ keyFile.set_integer ("Retinex", "Scal", retinex.scal);
}
if (!pedited || pedited->retinex.iter) {
- keyFile.set_integer ("Retinex", "Iter", retinex.iter);
+ keyFile.set_integer ("Retinex", "Iter", retinex.iter);
}
if (!pedited || pedited->retinex.grad) {
- keyFile.set_integer ("Retinex", "Grad", retinex.grad);
+ keyFile.set_integer ("Retinex", "Grad", retinex.grad);
}
if (!pedited || pedited->retinex.grads) {
- keyFile.set_integer ("Retinex", "Grads", retinex.grads);
+ keyFile.set_integer ("Retinex", "Grads", retinex.grads);
}
if (!pedited || pedited->retinex.gam) {
- keyFile.set_double ("Retinex", "Gam", retinex.gam);
+ keyFile.set_double ("Retinex", "Gam", retinex.gam);
}
if (!pedited || pedited->retinex.slope) {
- keyFile.set_double ("Retinex", "Slope", retinex.slope);
+ keyFile.set_double ("Retinex", "Slope", retinex.slope);
}
if (!pedited || pedited->retinex.medianmap) {
@@ -1568,71 +1608,71 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
if (!pedited || pedited->retinex.neigh) {
- keyFile.set_integer ("Retinex", "Neigh", retinex.neigh);
+ keyFile.set_integer ("Retinex", "Neigh", retinex.neigh);
}
if (!pedited || pedited->retinex.offs) {
- keyFile.set_integer ("Retinex", "Offs", retinex.offs);
+ keyFile.set_integer ("Retinex", "Offs", retinex.offs);
}
if (!pedited || pedited->retinex.vart) {
- keyFile.set_integer ("Retinex", "Vart", retinex.vart);
+ keyFile.set_integer ("Retinex", "Vart", retinex.vart);
}
if (!pedited || pedited->retinex.limd) {
- keyFile.set_integer ("Retinex", "Limd", retinex.limd);
+ keyFile.set_integer ("Retinex", "Limd", retinex.limd);
}
if (!pedited || pedited->retinex.highl) {
- keyFile.set_integer ("Retinex", "highl", retinex.highl);
+ keyFile.set_integer ("Retinex", "highl", retinex.highl);
}
if (!pedited || pedited->retinex.skal) {
- keyFile.set_integer ("Retinex", "skal", retinex.skal);
+ keyFile.set_integer ("Retinex", "skal", retinex.skal);
}
if (!pedited || pedited->retinex.retinexMethod) {
- keyFile.set_string ("Retinex", "RetinexMethod", retinex.retinexMethod);
+ keyFile.set_string ("Retinex", "RetinexMethod", retinex.retinexMethod);
}
if (!pedited || pedited->retinex.mapMethod) {
- keyFile.set_string ("Retinex", "mapMethod", retinex.mapMethod);
+ keyFile.set_string ("Retinex", "mapMethod", retinex.mapMethod);
}
if (!pedited || pedited->retinex.viewMethod) {
- keyFile.set_string ("Retinex", "viewMethod", retinex.viewMethod);
+ keyFile.set_string ("Retinex", "viewMethod", retinex.viewMethod);
}
if (!pedited || pedited->retinex.retinexcolorspace) {
- keyFile.set_string ("Retinex", "Retinexcolorspace", retinex.retinexcolorspace);
+ keyFile.set_string ("Retinex", "Retinexcolorspace", retinex.retinexcolorspace);
}
if (!pedited || pedited->retinex.gammaretinex) {
- keyFile.set_string ("Retinex", "Gammaretinex", retinex.gammaretinex);
+ keyFile.set_string ("Retinex", "Gammaretinex", retinex.gammaretinex);
}
- if (!pedited || pedited->retinex.cdcurve) {
+ if (!pedited || pedited->retinex.cdcurve) {
Glib::ArrayHandle cdcurve = retinex.cdcurve;
- keyFile.set_double_list("Retinex", "CDCurve", cdcurve);
+ keyFile.set_double_list ("Retinex", "CDCurve", cdcurve);
}
- if (!pedited || pedited->retinex.mapcurve) {
+ if (!pedited || pedited->retinex.mapcurve) {
Glib::ArrayHandle mapcurve = retinex.mapcurve;
- keyFile.set_double_list("Retinex", "MAPCurve", mapcurve);
+ keyFile.set_double_list ("Retinex", "MAPCurve", mapcurve);
}
- if (!pedited || pedited->retinex.cdHcurve) {
+ if (!pedited || pedited->retinex.cdHcurve) {
Glib::ArrayHandle cdHcurve = retinex.cdHcurve;
- keyFile.set_double_list("Retinex", "CDHCurve", cdHcurve);
+ keyFile.set_double_list ("Retinex", "CDHCurve", cdHcurve);
}
- if (!pedited || pedited->retinex.lhcurve) {
+ if (!pedited || pedited->retinex.lhcurve) {
Glib::ArrayHandle lhcurve = retinex.lhcurve;
- keyFile.set_double_list("Retinex", "LHCurve", lhcurve);
+ keyFile.set_double_list ("Retinex", "LHCurve", lhcurve);
}
if (!pedited || pedited->retinex.highlights) {
- keyFile.set_integer ("Retinex", "Highlights", retinex.highlights);
+ keyFile.set_integer ("Retinex", "Highlights", retinex.highlights);
}
if (!pedited || pedited->retinex.htonalwidth) {
@@ -1640,54 +1680,54 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->retinex.shadows) {
- keyFile.set_integer ("Retinex", "Shadows", retinex.shadows);
+ keyFile.set_integer ("Retinex", "Shadows", retinex.shadows);
}
if (!pedited || pedited->retinex.stonalwidth) {
- keyFile.set_integer ("Retinex", "ShadowTonalWidth", retinex.stonalwidth);
+ keyFile.set_integer ("Retinex", "ShadowTonalWidth", retinex.stonalwidth);
}
if (!pedited || pedited->retinex.radius) {
- keyFile.set_integer ("Retinex", "Radius", retinex.radius);
+ keyFile.set_integer ("Retinex", "Radius", retinex.radius);
}
- if (!pedited || pedited->retinex.transmissionCurve) {
+ if (!pedited || pedited->retinex.transmissionCurve) {
Glib::ArrayHandle transmissionCurve = retinex.transmissionCurve;
- keyFile.set_double_list("Retinex", "TransmissionCurve", transmissionCurve);
+ keyFile.set_double_list ("Retinex", "TransmissionCurve", transmissionCurve);
}
- if (!pedited || pedited->retinex.gaintransmissionCurve) {
+ if (!pedited || pedited->retinex.gaintransmissionCurve) {
Glib::ArrayHandle gaintransmissionCurve = retinex.gaintransmissionCurve;
- keyFile.set_double_list("Retinex", "GainTransmissionCurve", gaintransmissionCurve);
+ keyFile.set_double_list ("Retinex", "GainTransmissionCurve", gaintransmissionCurve);
}
- // save channel mixer
+// save channel mixer
if (!pedited || pedited->chmixer.red[0] || pedited->chmixer.red[1] || pedited->chmixer.red[2]) {
Glib::ArrayHandle rmix (chmixer.red, 3, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Channel Mixer", "Red", rmix);
+ keyFile.set_integer_list ("Channel Mixer", "Red", rmix);
}
if (!pedited || pedited->chmixer.green[0] || pedited->chmixer.green[1] || pedited->chmixer.green[2]) {
Glib::ArrayHandle gmix (chmixer.green, 3, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Channel Mixer", "Green", gmix);
+ keyFile.set_integer_list ("Channel Mixer", "Green", gmix);
}
if (!pedited || pedited->chmixer.blue[0] || pedited->chmixer.blue[1] || pedited->chmixer.blue[2]) {
Glib::ArrayHandle bmix (chmixer.blue, 3, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Channel Mixer", "Blue", bmix);
+ keyFile.set_integer_list ("Channel Mixer", "Blue", bmix);
}
- //save Black & White
+//save Black & White
if (!pedited || pedited->blackwhite.enabled) {
- keyFile.set_boolean ("Black & White", "Enabled", blackwhite.enabled);
+ keyFile.set_boolean ("Black & White", "Enabled", blackwhite.enabled);
}
if (!pedited || pedited->blackwhite.method) {
- keyFile.set_string ("Black & White", "Method", blackwhite.method );
+ keyFile.set_string ("Black & White", "Method", blackwhite.method );
}
if (!pedited || pedited->blackwhite.autoc) {
- keyFile.set_boolean ("Black & White", "Auto", blackwhite.autoc);
+ keyFile.set_boolean ("Black & White", "Auto", blackwhite.autoc);
}
if (!pedited || pedited->blackwhite.enabledcc) {
@@ -1695,267 +1735,267 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->blackwhite.setting) {
- keyFile.set_string ("Black & White", "Setting", blackwhite.setting );
+ keyFile.set_string ("Black & White", "Setting", blackwhite.setting );
}
if (!pedited || pedited->blackwhite.filter) {
- keyFile.set_string ("Black & White", "Filter", blackwhite.filter );
+ keyFile.set_string ("Black & White", "Filter", blackwhite.filter );
}
if (!pedited || pedited->blackwhite.mixerRed) {
- keyFile.set_integer ("Black & White", "MixerRed", blackwhite.mixerRed);
+ keyFile.set_integer ("Black & White", "MixerRed", blackwhite.mixerRed);
}
if (!pedited || pedited->blackwhite.mixerOrange) {
- keyFile.set_integer ("Black & White", "MixerOrange", blackwhite.mixerOrange);
+ keyFile.set_integer ("Black & White", "MixerOrange", blackwhite.mixerOrange);
}
if (!pedited || pedited->blackwhite.mixerYellow) {
- keyFile.set_integer ("Black & White", "MixerYellow", blackwhite.mixerYellow);
+ keyFile.set_integer ("Black & White", "MixerYellow", blackwhite.mixerYellow);
}
if (!pedited || pedited->blackwhite.mixerGreen) {
- keyFile.set_integer ("Black & White", "MixerGreen", blackwhite.mixerGreen);
+ keyFile.set_integer ("Black & White", "MixerGreen", blackwhite.mixerGreen);
}
if (!pedited || pedited->blackwhite.mixerCyan) {
- keyFile.set_integer ("Black & White", "MixerCyan", blackwhite.mixerCyan);
+ keyFile.set_integer ("Black & White", "MixerCyan", blackwhite.mixerCyan);
}
if (!pedited || pedited->blackwhite.mixerBlue) {
- keyFile.set_integer ("Black & White", "MixerBlue", blackwhite.mixerBlue);
+ keyFile.set_integer ("Black & White", "MixerBlue", blackwhite.mixerBlue);
}
if (!pedited || pedited->blackwhite.mixerMagenta) {
- keyFile.set_integer ("Black & White", "MixerMagenta", blackwhite.mixerMagenta);
+ keyFile.set_integer ("Black & White", "MixerMagenta", blackwhite.mixerMagenta);
}
if (!pedited || pedited->blackwhite.mixerPurple) {
- keyFile.set_integer ("Black & White", "MixerPurple", blackwhite.mixerPurple);
+ keyFile.set_integer ("Black & White", "MixerPurple", blackwhite.mixerPurple);
}
if (!pedited || pedited->blackwhite.gammaRed) {
- keyFile.set_integer ("Black & White", "GammaRed", blackwhite.gammaRed);
+ keyFile.set_integer ("Black & White", "GammaRed", blackwhite.gammaRed);
}
if (!pedited || pedited->blackwhite.gammaGreen) {
- keyFile.set_integer ("Black & White", "GammaGreen", blackwhite.gammaGreen);
+ keyFile.set_integer ("Black & White", "GammaGreen", blackwhite.gammaGreen);
}
if (!pedited || pedited->blackwhite.gammaBlue) {
- keyFile.set_integer ("Black & White", "GammaBlue", blackwhite.gammaBlue);
+ keyFile.set_integer ("Black & White", "GammaBlue", blackwhite.gammaBlue);
}
if (!pedited || pedited->blackwhite.algo) {
- keyFile.set_string ("Black & White", "Algorithm", blackwhite.algo);
+ keyFile.set_string ("Black & White", "Algorithm", blackwhite.algo);
}
if (!pedited || pedited->blackwhite.luminanceCurve) {
Glib::ArrayHandle luminanceCurve = blackwhite.luminanceCurve;
- keyFile.set_double_list("Black & White", "LuminanceCurve", luminanceCurve);
+ keyFile.set_double_list ("Black & White", "LuminanceCurve", luminanceCurve);
}
if (!pedited || pedited->blackwhite.beforeCurveMode) {
Glib::ustring mode;
switch (blackwhite.beforeCurveMode) {
- case (BlackWhiteParams::TC_MODE_STD_BW):
- mode = "Standard";
- break;
+ case (BlackWhiteParams::TC_MODE_STD_BW):
+ mode = "Standard";
+ break;
- case (BlackWhiteParams::TC_MODE_FILMLIKE_BW):
- mode = "FilmLike";
- break;
+ case (BlackWhiteParams::TC_MODE_FILMLIKE_BW):
+ mode = "FilmLike";
+ break;
- case (BlackWhiteParams::TC_MODE_SATANDVALBLENDING_BW):
- mode = "SatAndValueBlending";
- break;
+ case (BlackWhiteParams::TC_MODE_SATANDVALBLENDING_BW):
+ mode = "SatAndValueBlending";
+ break;
- case (BlackWhiteParams::TC_MODE_WEIGHTEDSTD_BW):
- mode = "WeightedStd";
- break;
+ case (BlackWhiteParams::TC_MODE_WEIGHTEDSTD_BW):
+ mode = "WeightedStd";
+ break;
}
- keyFile.set_string ("Black & White", "BeforeCurveMode", mode);
+ keyFile.set_string ("Black & White", "BeforeCurveMode", mode);
}
if (!pedited || pedited->blackwhite.afterCurveMode) {
Glib::ustring mode;
switch (blackwhite.afterCurveMode) {
- case (BlackWhiteParams::TC_MODE_STD_BW):
- mode = "Standard";
- break;
+ case (BlackWhiteParams::TC_MODE_STD_BW):
+ mode = "Standard";
+ break;
- case (BlackWhiteParams::TC_MODE_WEIGHTEDSTD_BW):
- mode = "WeightedStd";
- break;
+ case (BlackWhiteParams::TC_MODE_WEIGHTEDSTD_BW):
+ mode = "WeightedStd";
+ break;
- default:
- break;
+ default:
+ break;
}
- keyFile.set_string ("Black & White", "AfterCurveMode", mode);
+ keyFile.set_string ("Black & White", "AfterCurveMode", mode);
}
if (!pedited || pedited->blackwhite.beforeCurve) {
Glib::ArrayHandle tcurvebw = blackwhite.beforeCurve;
- keyFile.set_double_list("Black & White", "BeforeCurve", tcurvebw);
+ keyFile.set_double_list ("Black & White", "BeforeCurve", tcurvebw);
}
if (!pedited || pedited->blackwhite.afterCurve) {
Glib::ArrayHandle tcurvebw = blackwhite.afterCurve;
- keyFile.set_double_list("Black & White", "AfterCurve", tcurvebw);
+ keyFile.set_double_list ("Black & White", "AfterCurve", tcurvebw);
}
- // save luma curve
+// save luma curve
if (!pedited || pedited->labCurve.brightness) {
- keyFile.set_integer ("Luminance Curve", "Brightness", labCurve.brightness);
+ keyFile.set_integer ("Luminance Curve", "Brightness", labCurve.brightness);
}
if (!pedited || pedited->labCurve.contrast) {
- keyFile.set_integer ("Luminance Curve", "Contrast", labCurve.contrast);
+ keyFile.set_integer ("Luminance Curve", "Contrast", labCurve.contrast);
}
if (!pedited || pedited->labCurve.chromaticity) {
- keyFile.set_integer ("Luminance Curve", "Chromaticity", labCurve.chromaticity);
+ keyFile.set_integer ("Luminance Curve", "Chromaticity", labCurve.chromaticity);
}
if (!pedited || pedited->labCurve.avoidcolorshift) {
- keyFile.set_boolean ("Luminance Curve", "AvoidColorShift", labCurve.avoidcolorshift);
+ keyFile.set_boolean ("Luminance Curve", "AvoidColorShift", labCurve.avoidcolorshift);
}
if (!pedited || pedited->labCurve.rstprotection) {
- keyFile.set_double ("Luminance Curve", "RedAndSkinTonesProtection", labCurve.rstprotection);
+ keyFile.set_double ("Luminance Curve", "RedAndSkinTonesProtection", labCurve.rstprotection);
}
if (!pedited || pedited->labCurve.lcredsk) {
- keyFile.set_boolean ("Luminance Curve", "LCredsk", labCurve.lcredsk);
+ keyFile.set_boolean ("Luminance Curve", "LCredsk", labCurve.lcredsk);
}
- if (!pedited || pedited->labCurve.lcurve) {
+ if (!pedited || pedited->labCurve.lcurve) {
Glib::ArrayHandle lcurve = labCurve.lcurve;
- keyFile.set_double_list("Luminance Curve", "LCurve", lcurve);
+ keyFile.set_double_list ("Luminance Curve", "LCurve", lcurve);
}
- if (!pedited || pedited->labCurve.acurve) {
+ if (!pedited || pedited->labCurve.acurve) {
Glib::ArrayHandle acurve = labCurve.acurve;
- keyFile.set_double_list("Luminance Curve", "aCurve", acurve);
+ keyFile.set_double_list ("Luminance Curve", "aCurve", acurve);
}
- if (!pedited || pedited->labCurve.bcurve) {
+ if (!pedited || pedited->labCurve.bcurve) {
Glib::ArrayHandle bcurve = labCurve.bcurve;
- keyFile.set_double_list("Luminance Curve", "bCurve", bcurve);
+ keyFile.set_double_list ("Luminance Curve", "bCurve", bcurve);
}
- if (!pedited || pedited->labCurve.cccurve) {
+ if (!pedited || pedited->labCurve.cccurve) {
Glib::ArrayHandle cccurve = labCurve.cccurve;
- keyFile.set_double_list("Luminance Curve", "ccCurve", cccurve);
+ keyFile.set_double_list ("Luminance Curve", "ccCurve", cccurve);
}
- if (!pedited || pedited->labCurve.chcurve) {
+ if (!pedited || pedited->labCurve.chcurve) {
Glib::ArrayHandle chcurve = labCurve.chcurve;
- keyFile.set_double_list("Luminance Curve", "chCurve", chcurve);
+ keyFile.set_double_list ("Luminance Curve", "chCurve", chcurve);
}
- if (!pedited || pedited->labCurve.lhcurve) {
+ if (!pedited || pedited->labCurve.lhcurve) {
Glib::ArrayHandle lhcurve = labCurve.lhcurve;
- keyFile.set_double_list("Luminance Curve", "lhCurve", lhcurve);
+ keyFile.set_double_list ("Luminance Curve", "lhCurve", lhcurve);
}
- if (!pedited || pedited->labCurve.hhcurve) {
+ if (!pedited || pedited->labCurve.hhcurve) {
Glib::ArrayHandle hhcurve = labCurve.hhcurve;
- keyFile.set_double_list("Luminance Curve", "hhCurve", hhcurve);
+ keyFile.set_double_list ("Luminance Curve", "hhCurve", hhcurve);
}
- if (!pedited || pedited->labCurve.lccurve) {
+ if (!pedited || pedited->labCurve.lccurve) {
Glib::ArrayHandle lccurve = labCurve.lccurve;
- keyFile.set_double_list("Luminance Curve", "LcCurve", lccurve);
+ keyFile.set_double_list ("Luminance Curve", "LcCurve", lccurve);
}
- if (!pedited || pedited->labCurve.clcurve) {
+ if (!pedited || pedited->labCurve.clcurve) {
Glib::ArrayHandle clcurve = labCurve.clcurve;
- keyFile.set_double_list("Luminance Curve", "ClCurve", clcurve);
+ keyFile.set_double_list ("Luminance Curve", "ClCurve", clcurve);
}
- // save sharpening
+// save sharpening
if (!pedited || pedited->sharpening.enabled) {
- keyFile.set_boolean ("Sharpening", "Enabled", sharpening.enabled);
+ keyFile.set_boolean ("Sharpening", "Enabled", sharpening.enabled);
}
if (!pedited || pedited->sharpening.method) {
- keyFile.set_string ("Sharpening", "Method", sharpening.method);
+ keyFile.set_string ("Sharpening", "Method", sharpening.method);
}
if (!pedited || pedited->sharpening.radius) {
- keyFile.set_double ("Sharpening", "Radius", sharpening.radius);
+ keyFile.set_double ("Sharpening", "Radius", sharpening.radius);
}
if (!pedited || pedited->sharpening.amount) {
- keyFile.set_integer ("Sharpening", "Amount", sharpening.amount);
+ keyFile.set_integer ("Sharpening", "Amount", sharpening.amount);
}
if (!pedited || pedited->sharpening.threshold) {
Glib::ArrayHandle thresh (sharpening.threshold.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Sharpening", "Threshold", thresh);
+ keyFile.set_integer_list ("Sharpening", "Threshold", thresh);
}
if (!pedited || pedited->sharpening.edgesonly) {
- keyFile.set_boolean ("Sharpening", "OnlyEdges", sharpening.edgesonly);
+ keyFile.set_boolean ("Sharpening", "OnlyEdges", sharpening.edgesonly);
}
if (!pedited || pedited->sharpening.edges_radius) {
- keyFile.set_double ("Sharpening", "EdgedetectionRadius", sharpening.edges_radius);
+ keyFile.set_double ("Sharpening", "EdgedetectionRadius", sharpening.edges_radius);
}
if (!pedited || pedited->sharpening.edges_tolerance) {
- keyFile.set_integer ("Sharpening", "EdgeTolerance", sharpening.edges_tolerance);
+ keyFile.set_integer ("Sharpening", "EdgeTolerance", sharpening.edges_tolerance);
}
if (!pedited || pedited->sharpening.halocontrol) {
- keyFile.set_boolean ("Sharpening", "HalocontrolEnabled", sharpening.halocontrol);
+ keyFile.set_boolean ("Sharpening", "HalocontrolEnabled", sharpening.halocontrol);
}
if (!pedited || pedited->sharpening.halocontrol_amount) {
- keyFile.set_integer ("Sharpening", "HalocontrolAmount", sharpening.halocontrol_amount);
+ keyFile.set_integer ("Sharpening", "HalocontrolAmount", sharpening.halocontrol_amount);
}
if (!pedited || pedited->sharpening.deconvradius) {
- keyFile.set_double ("Sharpening", "DeconvRadius", sharpening.deconvradius);
+ keyFile.set_double ("Sharpening", "DeconvRadius", sharpening.deconvradius);
}
if (!pedited || pedited->sharpening.deconvamount) {
- keyFile.set_integer ("Sharpening", "DeconvAmount", sharpening.deconvamount);
+ keyFile.set_integer ("Sharpening", "DeconvAmount", sharpening.deconvamount);
}
if (!pedited || pedited->sharpening.deconvdamping) {
- keyFile.set_integer ("Sharpening", "DeconvDamping", sharpening.deconvdamping);
+ keyFile.set_integer ("Sharpening", "DeconvDamping", sharpening.deconvdamping);
}
if (!pedited || pedited->sharpening.deconviter) {
- keyFile.set_integer ("Sharpening", "DeconvIterations", sharpening.deconviter);
+ keyFile.set_integer ("Sharpening", "DeconvIterations", sharpening.deconviter);
}
- // save vibrance
+// save vibrance
if (!pedited || pedited->vibrance.enabled) {
- keyFile.set_boolean ("Vibrance", "Enabled", vibrance.enabled);
+ keyFile.set_boolean ("Vibrance", "Enabled", vibrance.enabled);
}
if (!pedited || pedited->vibrance.pastels) {
- keyFile.set_integer ("Vibrance", "Pastels", vibrance.pastels);
+ keyFile.set_integer ("Vibrance", "Pastels", vibrance.pastels);
}
if (!pedited || pedited->vibrance.saturated) {
- keyFile.set_integer ("Vibrance", "Saturated", vibrance.saturated);
+ keyFile.set_integer ("Vibrance", "Saturated", vibrance.saturated);
}
if (!pedited || pedited->vibrance.psthreshold) {
Glib::ArrayHandle thresh (vibrance.psthreshold.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Vibrance", "PSThreshold", thresh);
+ keyFile.set_integer_list ("Vibrance", "PSThreshold", thresh);
}
if (!pedited || pedited->vibrance.protectskins) {
- keyFile.set_boolean ("Vibrance", "ProtectSkins", vibrance.protectskins);
+ keyFile.set_boolean ("Vibrance", "ProtectSkins", vibrance.protectskins);
}
if (!pedited || pedited->vibrance.avoidcolorshift) {
@@ -1963,46 +2003,46 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->vibrance.pastsattog) {
- keyFile.set_boolean ("Vibrance", "PastSatTog", vibrance.pastsattog);
+ keyFile.set_boolean ("Vibrance", "PastSatTog", vibrance.pastsattog);
}
- if (!pedited || pedited->vibrance.skintonescurve) {
+ if (!pedited || pedited->vibrance.skintonescurve) {
Glib::ArrayHandle skintonescurve = vibrance.skintonescurve;
- keyFile.set_double_list("Vibrance", "SkinTonesCurve", skintonescurve);
+ keyFile.set_double_list ("Vibrance", "SkinTonesCurve", skintonescurve);
}
- //save edge sharpening
+//save edge sharpening
if (!pedited || pedited->sharpenEdge.enabled) {
- keyFile.set_boolean ("SharpenEdge", "Enabled", sharpenEdge.enabled);
+ keyFile.set_boolean ("SharpenEdge", "Enabled", sharpenEdge.enabled);
}
if (!pedited || pedited->sharpenEdge.passes) {
- keyFile.set_integer ("SharpenEdge", "Passes", sharpenEdge.passes);
+ keyFile.set_integer ("SharpenEdge", "Passes", sharpenEdge.passes);
}
if (!pedited || pedited->sharpenEdge.amount) {
- keyFile.set_double ("SharpenEdge", "Strength", sharpenEdge.amount);
+ keyFile.set_double ("SharpenEdge", "Strength", sharpenEdge.amount);
}
if (!pedited || pedited->sharpenEdge.threechannels) {
keyFile.set_boolean ("SharpenEdge", "ThreeChannels", sharpenEdge.threechannels);
}
- //save micro-contrast sharpening
+//save micro-contrast sharpening
if (!pedited || pedited->sharpenMicro.enabled) {
- keyFile.set_boolean ("SharpenMicro", "Enabled", sharpenMicro.enabled);
+ keyFile.set_boolean ("SharpenMicro", "Enabled", sharpenMicro.enabled);
}
if (!pedited || pedited->sharpenMicro.matrix) {
- keyFile.set_boolean ("SharpenMicro", "Matrix", sharpenMicro.matrix);
+ keyFile.set_boolean ("SharpenMicro", "Matrix", sharpenMicro.matrix);
}
if (!pedited || pedited->sharpenMicro.amount) {
- keyFile.set_double ("SharpenMicro", "Strength", sharpenMicro.amount);
+ keyFile.set_double ("SharpenMicro", "Strength", sharpenMicro.amount);
}
if (!pedited || pedited->sharpenMicro.uniformity) {
- keyFile.set_double ("SharpenMicro", "Uniformity", sharpenMicro.uniformity);
+ keyFile.set_double ("SharpenMicro", "Uniformity", sharpenMicro.uniformity);
}
/*
@@ -2015,7 +2055,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
// save wb
if (!pedited || pedited->wb.method) {
- keyFile.set_string ("White Balance", "Setting", wb.method);
+ keyFile.set_string ("White Balance", "Setting", wb.method);
}
if (!pedited || pedited->wb.temperature) {
@@ -2023,216 +2063,228 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->wb.green) {
- keyFile.set_double ("White Balance", "Green", wb.green);
+ keyFile.set_double ("White Balance", "Green", wb.green);
}
if (!pedited || pedited->wb.equal) {
- keyFile.set_double ("White Balance", "Equal", wb.equal);
+ keyFile.set_double ("White Balance", "Equal", wb.equal);
}
if (!pedited || pedited->wb.tempBias) {
- keyFile.set_double ("White Balance", "TemperatureBias", wb.tempBias);
+ keyFile.set_double ("White Balance", "TemperatureBias", wb.tempBias);
}
/*
- // save colorShift
- if (!pedited || pedited->colorShift.a) keyFile.set_double ("Color Shift", "ChannelA", colorShift.a);
- if (!pedited || pedited->colorShift.b) keyFile.set_double ("Color Shift", "ChannelB", colorShift.b);
+ // save colorShift
+ if (!pedited || pedited->colorShift.a) keyFile.set_double ("Color Shift", "ChannelA", colorShift.a);
+ if (!pedited || pedited->colorShift.b) keyFile.set_double ("Color Shift", "ChannelB", colorShift.b);
*/
- // save colorappearance
+// save colorappearance
if (!pedited || pedited->colorappearance.enabled) {
- keyFile.set_boolean ("Color appearance", "Enabled", colorappearance.enabled);
+ keyFile.set_boolean ("Color appearance", "Enabled", colorappearance.enabled);
}
if (!pedited || pedited->colorappearance.degree) {
- keyFile.set_integer ("Color appearance", "Degree", colorappearance.degree);
+ keyFile.set_integer ("Color appearance", "Degree", colorappearance.degree);
}
if (!pedited || pedited->colorappearance.autodegree) {
- keyFile.set_boolean ("Color appearance", "AutoDegree", colorappearance.autodegree);
+ keyFile.set_boolean ("Color appearance", "AutoDegree", colorappearance.autodegree);
}
if (!pedited || pedited->colorappearance.surround) {
- keyFile.set_string ("Color appearance", "Surround", colorappearance.surround);
+ keyFile.set_string ("Color appearance", "Surround", colorappearance.surround);
}
-// if (!pedited || pedited->colorappearance.backgrd) keyFile.set_integer ("Color appearance", "Background", colorappearance.backgrd);
+// if (!pedited || pedited->colorappearance.backgrd) keyFile.set_integer ("Color appearance", "Background", colorappearance.backgrd);
if (!pedited || pedited->colorappearance.adaplum) {
- keyFile.set_double ("Color appearance", "AdaptLum", colorappearance.adaplum);
+ keyFile.set_double ("Color appearance", "AdaptLum", colorappearance.adaplum);
}
if (!pedited || pedited->colorappearance.badpixsl) {
- keyFile.set_integer ("Color appearance", "Badpixsl", colorappearance.badpixsl);
+ keyFile.set_integer ("Color appearance", "Badpixsl", colorappearance.badpixsl);
}
if (!pedited || pedited->colorappearance.wbmodel) {
- keyFile.set_string ("Color appearance", "Model", colorappearance.wbmodel);
+ keyFile.set_string ("Color appearance", "Model", colorappearance.wbmodel);
}
if (!pedited || pedited->colorappearance.algo) {
- keyFile.set_string ("Color appearance", "Algorithm", colorappearance.algo);
+ keyFile.set_string ("Color appearance", "Algorithm", colorappearance.algo);
}
if (!pedited || pedited->colorappearance.jlight) {
- keyFile.set_double ("Color appearance", "J-Light", colorappearance.jlight);
+ keyFile.set_double ("Color appearance", "J-Light", colorappearance.jlight);
}
if (!pedited || pedited->colorappearance.qbright) {
- keyFile.set_double ("Color appearance", "Q-Bright", colorappearance.qbright);
+ keyFile.set_double ("Color appearance", "Q-Bright", colorappearance.qbright);
}
if (!pedited || pedited->colorappearance.chroma) {
- keyFile.set_double ("Color appearance", "C-Chroma", colorappearance.chroma);
+ keyFile.set_double ("Color appearance", "C-Chroma", colorappearance.chroma);
}
if (!pedited || pedited->colorappearance.schroma) {
- keyFile.set_double ("Color appearance", "S-Chroma", colorappearance.schroma);
+ keyFile.set_double ("Color appearance", "S-Chroma", colorappearance.schroma);
}
if (!pedited || pedited->colorappearance.mchroma) {
- keyFile.set_double ("Color appearance", "M-Chroma", colorappearance.mchroma);
+ keyFile.set_double ("Color appearance", "M-Chroma", colorappearance.mchroma);
}
if (!pedited || pedited->colorappearance.contrast) {
- keyFile.set_double ("Color appearance", "J-Contrast", colorappearance.contrast);
+ keyFile.set_double ("Color appearance", "J-Contrast", colorappearance.contrast);
}
if (!pedited || pedited->colorappearance.qcontrast) {
- keyFile.set_double ("Color appearance", "Q-Contrast", colorappearance.qcontrast);
+ keyFile.set_double ("Color appearance", "Q-Contrast", colorappearance.qcontrast);
}
if (!pedited || pedited->colorappearance.colorh) {
- keyFile.set_double ("Color appearance", "H-Hue", colorappearance.colorh);
+ keyFile.set_double ("Color appearance", "H-Hue", colorappearance.colorh);
}
if (!pedited || pedited->colorappearance.rstprotection) {
- keyFile.set_double ("Color appearance", "RSTProtection", colorappearance.rstprotection);
+ keyFile.set_double ("Color appearance", "RSTProtection", colorappearance.rstprotection);
}
if (!pedited || pedited->colorappearance.adapscen) {
- keyFile.set_double ("Color appearance", "AdaptScene", colorappearance.adapscen);
+ keyFile.set_double ("Color appearance", "AdaptScene", colorappearance.adapscen);
}
if (!pedited || pedited->colorappearance.autoadapscen) {
- keyFile.set_boolean ("Color appearance", "AutoAdapscen", colorappearance.autoadapscen);
+ keyFile.set_boolean ("Color appearance", "AutoAdapscen", colorappearance.autoadapscen);
}
if (!pedited || pedited->colorappearance.surrsource) {
- keyFile.set_boolean ("Color appearance", "SurrSource", colorappearance.surrsource);
+ keyFile.set_boolean ("Color appearance", "SurrSource", colorappearance.surrsource);
}
if (!pedited || pedited->colorappearance.gamut) {
- keyFile.set_boolean ("Color appearance", "Gamut", colorappearance.gamut);
+ keyFile.set_boolean ("Color appearance", "Gamut", colorappearance.gamut);
}
-// if (!pedited || pedited->colorappearance.badpix) keyFile.set_boolean ("Color appearance", "Badpix", colorappearance.badpix);
+ if (!pedited || pedited->colorappearance.tempout) {
+ keyFile.set_integer ("Color appearance", "Tempout", colorappearance.tempout);
+ }
+
+ if (!pedited || pedited->colorappearance.greenout) {
+ keyFile.set_double ("Color appearance", "Greenout", colorappearance.greenout);
+ }
+
+ if (!pedited || pedited->colorappearance.ybout) {
+ keyFile.set_integer ("Color appearance", "Ybout", colorappearance.ybout);
+ }
+
+// if (!pedited || pedited->colorappearance.badpix) keyFile.set_boolean ("Color appearance", "Badpix", colorappearance.badpix);
if (!pedited || pedited->colorappearance.datacie) {
- keyFile.set_boolean ("Color appearance", "Datacie", colorappearance.datacie);
+ keyFile.set_boolean ("Color appearance", "Datacie", colorappearance.datacie);
}
if (!pedited || pedited->colorappearance.tonecie) {
- keyFile.set_boolean ("Color appearance", "Tonecie", colorappearance.tonecie);
+ keyFile.set_boolean ("Color appearance", "Tonecie", colorappearance.tonecie);
}
-// if (!pedited || pedited->colorappearance.sharpcie) keyFile.set_boolean ("Color appearance", "Sharpcie", colorappearance.sharpcie);
- if (!pedited || pedited->colorappearance.curveMode) {
+// if (!pedited || pedited->colorappearance.sharpcie) keyFile.set_boolean ("Color appearance", "Sharpcie", colorappearance.sharpcie);
+ if (!pedited || pedited->colorappearance.curveMode) {
Glib::ustring method;
switch (colorappearance.curveMode) {
- case (ColorAppearanceParams::TC_MODE_LIGHT):
- method = "Lightness";
- break;
+ case (ColorAppearanceParams::TC_MODE_LIGHT):
+ method = "Lightness";
+ break;
- case (ColorAppearanceParams::TC_MODE_BRIGHT):
- method = "Brightness";
- break;
+ case (ColorAppearanceParams::TC_MODE_BRIGHT):
+ method = "Brightness";
+ break;
}
- keyFile.set_string ("Color appearance", "CurveMode", method);
+ keyFile.set_string ("Color appearance", "CurveMode", method);
}
- if (!pedited || pedited->colorappearance.curveMode2) {
+ if (!pedited || pedited->colorappearance.curveMode2) {
Glib::ustring method;
switch (colorappearance.curveMode2) {
- case (ColorAppearanceParams::TC_MODE_LIGHT):
- method = "Lightness";
- break;
+ case (ColorAppearanceParams::TC_MODE_LIGHT):
+ method = "Lightness";
+ break;
- case (ColorAppearanceParams::TC_MODE_BRIGHT):
- method = "Brightness";
- break;
+ case (ColorAppearanceParams::TC_MODE_BRIGHT):
+ method = "Brightness";
+ break;
}
- keyFile.set_string ("Color appearance", "CurveMode2", method);
+ keyFile.set_string ("Color appearance", "CurveMode2", method);
}
- if (!pedited || pedited->colorappearance.curveMode3) {
+ if (!pedited || pedited->colorappearance.curveMode3) {
Glib::ustring method;
switch (colorappearance.curveMode3) {
- case (ColorAppearanceParams::TC_MODE_CHROMA):
- method = "Chroma";
- break;
+ case (ColorAppearanceParams::TC_MODE_CHROMA):
+ method = "Chroma";
+ break;
- case (ColorAppearanceParams::TC_MODE_SATUR):
- method = "Saturation";
- break;
+ case (ColorAppearanceParams::TC_MODE_SATUR):
+ method = "Saturation";
+ break;
- case (ColorAppearanceParams::TC_MODE_COLORF):
- method = "Colorfullness";
- break;
+ case (ColorAppearanceParams::TC_MODE_COLORF):
+ method = "Colorfullness";
+ break;
}
- keyFile.set_string ("Color appearance", "CurveMode3", method);
+ keyFile.set_string ("Color appearance", "CurveMode3", method);
}
if (!pedited || pedited->colorappearance.curve) {
Glib::ArrayHandle tcurve = colorappearance.curve;
- keyFile.set_double_list("Color appearance", "Curve", tcurve);
+ keyFile.set_double_list ("Color appearance", "Curve", tcurve);
}
if (!pedited || pedited->colorappearance.curve2) {
Glib::ArrayHandle tcurve = colorappearance.curve2;
- keyFile.set_double_list("Color appearance", "Curve2", tcurve);
+ keyFile.set_double_list ("Color appearance", "Curve2", tcurve);
}
if (!pedited || pedited->colorappearance.curve3) {
Glib::ArrayHandle tcurve = colorappearance.curve3;
- keyFile.set_double_list("Color appearance", "Curve3", tcurve);
+ keyFile.set_double_list ("Color appearance", "Curve3", tcurve);
}
- // save impulseDenoise
+// save impulseDenoise
if (!pedited || pedited->impulseDenoise.enabled) {
- keyFile.set_boolean ("Impulse Denoising", "Enabled", impulseDenoise.enabled);
+ keyFile.set_boolean ("Impulse Denoising", "Enabled", impulseDenoise.enabled);
}
if (!pedited || pedited->impulseDenoise.thresh) {
keyFile.set_integer ("Impulse Denoising", "Threshold", impulseDenoise.thresh);
}
- // save defringe
+// save defringe
if (!pedited || pedited->defringe.enabled) {
- keyFile.set_boolean ("Defringing", "Enabled", defringe.enabled);
+ keyFile.set_boolean ("Defringing", "Enabled", defringe.enabled);
}
if (!pedited || pedited->defringe.radius) {
- keyFile.set_double ("Defringing", "Radius", defringe.radius);
+ keyFile.set_double ("Defringing", "Radius", defringe.radius);
}
if (!pedited || pedited->defringe.threshold) {
keyFile.set_integer ("Defringing", "Threshold", defringe.threshold);
}
- if (!pedited || pedited->defringe.huecurve) {
+ if (!pedited || pedited->defringe.huecurve) {
Glib::ArrayHandle huecurve = defringe.huecurve;
- keyFile.set_double_list("Defringing", "HueCurve", huecurve);
+ keyFile.set_double_list ("Defringing", "HueCurve", huecurve);
}
- // save dirpyrDenoise
+// save dirpyrDenoise
if (!pedited || pedited->dirpyrDenoise.enabled) {
keyFile.set_boolean ("Directional Pyramid Denoising", "Enabled", dirpyrDenoise.enabled);
}
@@ -2245,9 +2297,9 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_boolean ("Directional Pyramid Denoising", "Median", dirpyrDenoise.median);
}
-// if (!pedited || pedited->dirpyrDenoise.perform) keyFile.set_boolean ("Directional Pyramid Denoising", "Perform", dirpyrDenoise.perform);
+// if (!pedited || pedited->dirpyrDenoise.perform) keyFile.set_boolean ("Directional Pyramid Denoising", "Perform", dirpyrDenoise.perform);
if (!pedited || pedited->dirpyrDenoise.luma) {
- keyFile.set_double ("Directional Pyramid Denoising", "Luma", dirpyrDenoise.luma);
+ keyFile.set_double ("Directional Pyramid Denoising", "Luma", dirpyrDenoise.luma);
}
if (!pedited || pedited->dirpyrDenoise.Ldetail) {
@@ -2255,95 +2307,95 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->dirpyrDenoise.chroma) {
- keyFile.set_double ("Directional Pyramid Denoising", "Chroma", dirpyrDenoise.chroma);
+ keyFile.set_double ("Directional Pyramid Denoising", "Chroma", dirpyrDenoise.chroma);
}
if (!pedited || pedited->dirpyrDenoise.dmethod) {
- keyFile.set_string ("Directional Pyramid Denoising", "Method", dirpyrDenoise.dmethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "Method", dirpyrDenoise.dmethod);
}
if (!pedited || pedited->dirpyrDenoise.Lmethod) {
- keyFile.set_string ("Directional Pyramid Denoising", "LMethod", dirpyrDenoise.Lmethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "LMethod", dirpyrDenoise.Lmethod);
}
- // never save 'auto chroma preview mode' to pp3
+// never save 'auto chroma preview mode' to pp3
if (!pedited || pedited->dirpyrDenoise.Cmethod) {
- if(dirpyrDenoise.Cmethod == "PRE") {
+ if (dirpyrDenoise.Cmethod == "PRE") {
dirpyrDenoise.Cmethod = "MAN";
}
- keyFile.set_string ("Directional Pyramid Denoising", "CMethod", dirpyrDenoise.Cmethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "CMethod", dirpyrDenoise.Cmethod);
}
if (!pedited || pedited->dirpyrDenoise.C2method) {
- if(dirpyrDenoise.C2method == "PREV") {
+ if (dirpyrDenoise.C2method == "PREV") {
dirpyrDenoise.C2method = "MANU";
}
- keyFile.set_string ("Directional Pyramid Denoising", "C2Method", dirpyrDenoise.C2method);
+ keyFile.set_string ("Directional Pyramid Denoising", "C2Method", dirpyrDenoise.C2method);
}
if (!pedited || pedited->dirpyrDenoise.smethod) {
- keyFile.set_string ("Directional Pyramid Denoising", "SMethod", dirpyrDenoise.smethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "SMethod", dirpyrDenoise.smethod);
}
if (!pedited || pedited->dirpyrDenoise.medmethod) {
- keyFile.set_string ("Directional Pyramid Denoising", "MedMethod", dirpyrDenoise.medmethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "MedMethod", dirpyrDenoise.medmethod);
}
if (!pedited || pedited->dirpyrDenoise.rgbmethod) {
- keyFile.set_string ("Directional Pyramid Denoising", "RGBMethod", dirpyrDenoise.rgbmethod);
+ keyFile.set_string ("Directional Pyramid Denoising", "RGBMethod", dirpyrDenoise.rgbmethod);
}
if (!pedited || pedited->dirpyrDenoise.methodmed) {
- keyFile.set_string ("Directional Pyramid Denoising", "MethodMed", dirpyrDenoise.methodmed);
+ keyFile.set_string ("Directional Pyramid Denoising", "MethodMed", dirpyrDenoise.methodmed);
}
if (!pedited || pedited->dirpyrDenoise.redchro) {
- keyFile.set_double ("Directional Pyramid Denoising", "Redchro", dirpyrDenoise.redchro);
+ keyFile.set_double ("Directional Pyramid Denoising", "Redchro", dirpyrDenoise.redchro);
}
if (!pedited || pedited->dirpyrDenoise.bluechro) {
- keyFile.set_double ("Directional Pyramid Denoising", "Bluechro", dirpyrDenoise.bluechro);
+ keyFile.set_double ("Directional Pyramid Denoising", "Bluechro", dirpyrDenoise.bluechro);
}
if (!pedited || pedited->dirpyrDenoise.gamma) {
- keyFile.set_double ("Directional Pyramid Denoising", "Gamma", dirpyrDenoise.gamma);
+ keyFile.set_double ("Directional Pyramid Denoising", "Gamma", dirpyrDenoise.gamma);
}
if (!pedited || pedited->dirpyrDenoise.passes) {
- keyFile.set_integer ("Directional Pyramid Denoising", "Passes", dirpyrDenoise.passes);
+ keyFile.set_integer ("Directional Pyramid Denoising", "Passes", dirpyrDenoise.passes);
}
- if (!pedited || pedited->dirpyrDenoise.lcurve) {
+ if (!pedited || pedited->dirpyrDenoise.lcurve) {
Glib::ArrayHandle lcurve = dirpyrDenoise.lcurve;
- keyFile.set_double_list("Directional Pyramid Denoising", "LCurve", lcurve);
+ keyFile.set_double_list ("Directional Pyramid Denoising", "LCurve", lcurve);
}
- if (!pedited || pedited->dirpyrDenoise.cccurve) {
+ if (!pedited || pedited->dirpyrDenoise.cccurve) {
Glib::ArrayHandle cccurve = dirpyrDenoise.cccurve;
- keyFile.set_double_list("Directional Pyramid Denoising", "CCCurve", cccurve);
+ keyFile.set_double_list ("Directional Pyramid Denoising", "CCCurve", cccurve);
}
- //Save epd.
+// save epd.
if (!pedited || pedited->epd.enabled) {
keyFile.set_boolean ("EPD", "Enabled", epd.enabled);
}
if (!pedited || pedited->epd.strength) {
- keyFile.set_double ("EPD", "Strength", epd.strength);
+ keyFile.set_double ("EPD", "Strength", epd.strength);
}
if (!pedited || pedited->epd.gamma) {
- keyFile.set_double ("EPD", "Gamma", epd.gamma);
+ keyFile.set_double ("EPD", "Gamma", epd.gamma);
}
if (!pedited || pedited->epd.edgeStopping) {
- keyFile.set_double ("EPD", "EdgeStopping", epd.edgeStopping);
+ keyFile.set_double ("EPD", "EdgeStopping", epd.edgeStopping);
}
if (!pedited || pedited->epd.scale) {
- keyFile.set_double ("EPD", "Scale", epd.scale);
+ keyFile.set_double ("EPD", "Scale", epd.scale);
}
if (!pedited || pedited->epd.reweightingIterates) {
@@ -2351,29 +2403,29 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
/*
- // save lumaDenoise
- if (!pedited || pedited->lumaDenoise.enabled) keyFile.set_boolean ("Luminance Denoising", "Enabled", lumaDenoise.enabled);
- if (!pedited || pedited->lumaDenoise.radius) keyFile.set_double ("Luminance Denoising", "Radius", lumaDenoise.radius);
- if (!pedited || pedited->lumaDenoise.edgetolerance) keyFile.set_integer ("Luminance Denoising", "EdgeTolerance", lumaDenoise.edgetolerance);
+ // save lumaDenoise
+ if (!pedited || pedited->lumaDenoise.enabled) keyFile.set_boolean ("Luminance Denoising", "Enabled", lumaDenoise.enabled);
+ if (!pedited || pedited->lumaDenoise.radius) keyFile.set_double ("Luminance Denoising", "Radius", lumaDenoise.radius);
+ if (!pedited || pedited->lumaDenoise.edgetolerance) keyFile.set_integer ("Luminance Denoising", "EdgeTolerance", lumaDenoise.edgetolerance);
*/
/*
- // save colorDenoise
- //if (!pedited || pedited->colorDenoise.enabled) keyFile.set_boolean ("Chrominance Denoising", "Enabled", colorDenoise.enabled);
- if (!pedited || pedited->colorDenoise.amount) keyFile.set_integer ("Chrominance Denoising", "Amount", colorDenoise.amount);
+ // save colorDenoise
+ //if (!pedited || pedited->colorDenoise.enabled) keyFile.set_boolean ("Chrominance Denoising", "Enabled", colorDenoise.enabled);
+ if (!pedited || pedited->colorDenoise.amount) keyFile.set_integer ("Chrominance Denoising", "Amount", colorDenoise.amount);
*/
- // save sh
+// save sh
if (!pedited || pedited->sh.enabled) {
- keyFile.set_boolean ("Shadows & Highlights", "Enabled", sh.enabled);
+ keyFile.set_boolean ("Shadows & Highlights", "Enabled", sh.enabled);
}
if (!pedited || pedited->sh.hq) {
- keyFile.set_boolean ("Shadows & Highlights", "HighQuality", sh.hq);
+ keyFile.set_boolean ("Shadows & Highlights", "HighQuality", sh.hq);
}
if (!pedited || pedited->sh.highlights) {
- keyFile.set_integer ("Shadows & Highlights", "Highlights", sh.highlights);
+ keyFile.set_integer ("Shadows & Highlights", "Highlights", sh.highlights);
}
if (!pedited || pedited->sh.htonalwidth) {
@@ -2381,61 +2433,61 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->sh.shadows) {
- keyFile.set_integer ("Shadows & Highlights", "Shadows", sh.shadows);
+ keyFile.set_integer ("Shadows & Highlights", "Shadows", sh.shadows);
}
if (!pedited || pedited->sh.stonalwidth) {
- keyFile.set_integer ("Shadows & Highlights", "ShadowTonalWidth", sh.stonalwidth);
+ keyFile.set_integer ("Shadows & Highlights", "ShadowTonalWidth", sh.stonalwidth);
}
if (!pedited || pedited->sh.localcontrast) {
- keyFile.set_integer ("Shadows & Highlights", "LocalContrast", sh.localcontrast);
+ keyFile.set_integer ("Shadows & Highlights", "LocalContrast", sh.localcontrast);
}
if (!pedited || pedited->sh.radius) {
- keyFile.set_integer ("Shadows & Highlights", "Radius", sh.radius);
+ keyFile.set_integer ("Shadows & Highlights", "Radius", sh.radius);
}
- // save crop
+// save crop
if (!pedited || pedited->crop.enabled) {
- keyFile.set_boolean ("Crop", "Enabled", crop.enabled);
+ keyFile.set_boolean ("Crop", "Enabled", crop.enabled);
}
if (!pedited || pedited->crop.x) {
- keyFile.set_integer ("Crop", "X", crop.x);
+ keyFile.set_integer ("Crop", "X", crop.x);
}
if (!pedited || pedited->crop.y) {
- keyFile.set_integer ("Crop", "Y", crop.y);
+ keyFile.set_integer ("Crop", "Y", crop.y);
}
if (!pedited || pedited->crop.w) {
- keyFile.set_integer ("Crop", "W", crop.w);
+ keyFile.set_integer ("Crop", "W", crop.w);
}
if (!pedited || pedited->crop.h) {
- keyFile.set_integer ("Crop", "H", crop.h);
+ keyFile.set_integer ("Crop", "H", crop.h);
}
if (!pedited || pedited->crop.fixratio) {
- keyFile.set_boolean ("Crop", "FixedRatio", crop.fixratio);
+ keyFile.set_boolean ("Crop", "FixedRatio", crop.fixratio);
}
if (!pedited || pedited->crop.ratio) {
- keyFile.set_string ("Crop", "Ratio", crop.ratio);
+ keyFile.set_string ("Crop", "Ratio", crop.ratio);
}
if (!pedited || pedited->crop.orientation) {
- keyFile.set_string ("Crop", "Orientation", crop.orientation);
+ keyFile.set_string ("Crop", "Orientation", crop.orientation);
}
if (!pedited || pedited->crop.guide) {
- keyFile.set_string ("Crop", "Guide", crop.guide);
+ keyFile.set_string ("Crop", "Guide", crop.guide);
}
- // save coarse
+// save coarse
if (!pedited || pedited->coarse.rotate) {
- keyFile.set_integer ("Coarse Transformation", "Rotate", coarse.rotate);
+ keyFile.set_integer ("Coarse Transformation", "Rotate", coarse.rotate);
}
if (!pedited || pedited->coarse.hflip) {
@@ -2443,57 +2495,57 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->coarse.vflip) {
- keyFile.set_boolean ("Coarse Transformation", "VerticalFlip", coarse.vflip);
+ keyFile.set_boolean ("Coarse Transformation", "VerticalFlip", coarse.vflip);
}
- // save commonTrans
+// save commonTrans
if (!pedited || pedited->commonTrans.autofill) {
keyFile.set_boolean ("Common Properties for Transformations", "AutoFill", commonTrans.autofill);
}
- // save rotate
+// save rotate
if (!pedited || pedited->rotate.degree) {
- keyFile.set_double ("Rotation", "Degree", rotate.degree);
+ keyFile.set_double ("Rotation", "Degree", rotate.degree);
}
- // save distortion
+// save distortion
if (!pedited || pedited->distortion.amount) {
- keyFile.set_double ("Distortion", "Amount", distortion.amount);
+ keyFile.set_double ("Distortion", "Amount", distortion.amount);
}
- // lens profile
+// lens profile
if (!pedited || pedited->lensProf.lcpFile) {
- keyFile.set_string ("LensProfile", "LCPFile", relativePathIfInside(fname, fnameAbsolute, lensProf.lcpFile));
+ keyFile.set_string ("LensProfile", "LCPFile", relativePathIfInside (fname, fnameAbsolute, lensProf.lcpFile));
}
if (!pedited || pedited->lensProf.useDist) {
- keyFile.set_boolean ("LensProfile", "UseDistortion", lensProf.useDist);
+ keyFile.set_boolean ("LensProfile", "UseDistortion", lensProf.useDist);
}
if (!pedited || pedited->lensProf.useVign) {
- keyFile.set_boolean ("LensProfile", "UseVignette", lensProf.useVign);
+ keyFile.set_boolean ("LensProfile", "UseVignette", lensProf.useVign);
}
if (!pedited || pedited->lensProf.useCA) {
- keyFile.set_boolean ("LensProfile", "UseCA", lensProf.useCA);
+ keyFile.set_boolean ("LensProfile", "UseCA", lensProf.useCA);
}
- // save perspective correction
+// save perspective correction
if (!pedited || pedited->perspective.horizontal) {
- keyFile.set_double ("Perspective", "Horizontal", perspective.horizontal);
+ keyFile.set_double ("Perspective", "Horizontal", perspective.horizontal);
}
if (!pedited || pedited->perspective.vertical) {
- keyFile.set_double ("Perspective", "Vertical", perspective.vertical);
+ keyFile.set_double ("Perspective", "Vertical", perspective.vertical);
}
- // save gradient
+// save gradient
if (!pedited || pedited->gradient.enabled) {
keyFile.set_boolean ("Gradient", "Enabled", gradient.enabled);
}
if (!pedited || pedited->gradient.degree) {
- keyFile.set_double ("Gradient", "Degree", gradient.degree);
+ keyFile.set_double ("Gradient", "Degree", gradient.degree);
}
if (!pedited || pedited->gradient.feather) {
@@ -2501,7 +2553,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->gradient.strength) {
- keyFile.set_double ("Gradient", "Strength", gradient.strength);
+ keyFile.set_double ("Gradient", "Strength", gradient.strength);
}
if (!pedited || pedited->gradient.centerX) {
@@ -2512,13 +2564,13 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_integer ("Gradient", "CenterY", gradient.centerY);
}
- // save post-crop vignette
+// save post-crop vignette
if (!pedited || pedited->pcvignette.enabled) {
keyFile.set_boolean ("PCVignette", "Enabled", pcvignette.enabled);
}
if (!pedited || pedited->pcvignette.strength) {
- keyFile.set_double ("PCVignette", "Strength", pcvignette.strength);
+ keyFile.set_double ("PCVignette", "Strength", pcvignette.strength);
}
if (!pedited || pedited->pcvignette.feather) {
@@ -2529,16 +2581,16 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_integer ("PCVignette", "Roundness", pcvignette.roundness);
}
- // save C/A correction
+// save C/A correction
if (!pedited || pedited->cacorrection.red) {
- keyFile.set_double ("CACorrection", "Red", cacorrection.red);
+ keyFile.set_double ("CACorrection", "Red", cacorrection.red);
}
if (!pedited || pedited->cacorrection.blue) {
- keyFile.set_double ("CACorrection", "Blue", cacorrection.blue);
+ keyFile.set_double ("CACorrection", "Blue", cacorrection.blue);
}
- // save vignetting correction
+// save vignetting correction
if (!pedited || pedited->vignetting.amount) {
keyFile.set_integer ("Vignetting Correction", "Amount", vignetting.amount);
}
@@ -2565,23 +2617,23 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->resize.scale) {
- keyFile.set_double ("Resize", "Scale", resize.scale);
+ keyFile.set_double ("Resize", "Scale", resize.scale);
}
if (!pedited || pedited->resize.appliesTo) {
- keyFile.set_string ("Resize", "AppliesTo", resize.appliesTo);
+ keyFile.set_string ("Resize", "AppliesTo", resize.appliesTo);
}
if (!pedited || pedited->resize.method) {
- keyFile.set_string ("Resize", "Method", resize.method);
+ keyFile.set_string ("Resize", "Method", resize.method);
}
if (!pedited || pedited->resize.dataspec) {
- keyFile.set_integer ("Resize", "DataSpecified", resize.dataspec);
+ keyFile.set_integer ("Resize", "DataSpecified", resize.dataspec);
}
if (!pedited || pedited->resize.width) {
- keyFile.set_integer ("Resize", "Width", resize.width);
+ keyFile.set_integer ("Resize", "Width", resize.width);
}
if (!pedited || pedited->resize.height) {
@@ -2589,144 +2641,144 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->prsharpening.enabled) {
- keyFile.set_boolean ("PostResizeSharpening", "Enabled", prsharpening.enabled);
+ keyFile.set_boolean ("PostResizeSharpening", "Enabled", prsharpening.enabled);
}
if (!pedited || pedited->prsharpening.method) {
- keyFile.set_string ("PostResizeSharpening", "Method", prsharpening.method);
+ keyFile.set_string ("PostResizeSharpening", "Method", prsharpening.method);
}
if (!pedited || pedited->prsharpening.radius) {
- keyFile.set_double ("PostResizeSharpening", "Radius", prsharpening.radius);
+ keyFile.set_double ("PostResizeSharpening", "Radius", prsharpening.radius);
}
if (!pedited || pedited->prsharpening.amount) {
- keyFile.set_integer ("PostResizeSharpening", "Amount", prsharpening.amount);
+ keyFile.set_integer ("PostResizeSharpening", "Amount", prsharpening.amount);
}
if (!pedited || pedited->prsharpening.threshold) {
Glib::ArrayHandle thresh (prsharpening.threshold.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("PostResizeSharpening", "Threshold", thresh);
+ keyFile.set_integer_list ("PostResizeSharpening", "Threshold", thresh);
}
if (!pedited || pedited->prsharpening.edgesonly) {
- keyFile.set_boolean ("PostResizeSharpening", "OnlyEdges", prsharpening.edgesonly);
+ keyFile.set_boolean ("PostResizeSharpening", "OnlyEdges", prsharpening.edgesonly);
}
if (!pedited || pedited->prsharpening.edges_radius) {
- keyFile.set_double ("PostResizeSharpening", "EdgedetectionRadius", prsharpening.edges_radius);
+ keyFile.set_double ("PostResizeSharpening", "EdgedetectionRadius", prsharpening.edges_radius);
}
if (!pedited || pedited->prsharpening.edges_tolerance) {
- keyFile.set_integer ("PostResizeSharpening", "EdgeTolerance", prsharpening.edges_tolerance);
+ keyFile.set_integer ("PostResizeSharpening", "EdgeTolerance", prsharpening.edges_tolerance);
}
if (!pedited || pedited->prsharpening.halocontrol) {
- keyFile.set_boolean ("PostResizeSharpening", "HalocontrolEnabled", prsharpening.halocontrol);
+ keyFile.set_boolean ("PostResizeSharpening", "HalocontrolEnabled", prsharpening.halocontrol);
}
if (!pedited || pedited->prsharpening.halocontrol_amount) {
- keyFile.set_integer ("PostResizeSharpening", "HalocontrolAmount", prsharpening.halocontrol_amount);
+ keyFile.set_integer ("PostResizeSharpening", "HalocontrolAmount", prsharpening.halocontrol_amount);
}
if (!pedited || pedited->prsharpening.deconvradius) {
- keyFile.set_double ("PostResizeSharpening", "DeconvRadius", prsharpening.deconvradius);
+ keyFile.set_double ("PostResizeSharpening", "DeconvRadius", prsharpening.deconvradius);
}
if (!pedited || pedited->prsharpening.deconvamount) {
- keyFile.set_integer ("PostResizeSharpening", "DeconvAmount", prsharpening.deconvamount);
+ keyFile.set_integer ("PostResizeSharpening", "DeconvAmount", prsharpening.deconvamount);
}
if (!pedited || pedited->prsharpening.deconvdamping) {
- keyFile.set_integer ("PostResizeSharpening", "DeconvDamping", prsharpening.deconvdamping);
+ keyFile.set_integer ("PostResizeSharpening", "DeconvDamping", prsharpening.deconvdamping);
}
if (!pedited || pedited->prsharpening.deconviter) {
- keyFile.set_integer ("PostResizeSharpening", "DeconvIterations", prsharpening.deconviter);
+ keyFile.set_integer ("PostResizeSharpening", "DeconvIterations", prsharpening.deconviter);
}
- // save color management settings
+// save color management settings
if (!pedited || pedited->icm.input) {
- keyFile.set_string ("Color Management", "InputProfile", relativePathIfInside(fname, fnameAbsolute, icm.input));
+ keyFile.set_string ("Color Management", "InputProfile", relativePathIfInside (fname, fnameAbsolute, icm.input));
}
if (!pedited || pedited->icm.toneCurve) {
- keyFile.set_boolean ("Color Management", "ToneCurve", icm.toneCurve);
+ keyFile.set_boolean ("Color Management", "ToneCurve", icm.toneCurve);
}
if (!pedited || pedited->icm.applyLookTable) {
- keyFile.set_boolean ("Color Management", "ApplyLookTable", icm.applyLookTable);
+ keyFile.set_boolean ("Color Management", "ApplyLookTable", icm.applyLookTable);
}
if (!pedited || pedited->icm.applyBaselineExposureOffset) {
- keyFile.set_boolean ("Color Management", "ApplyBaselineExposureOffset", icm.applyBaselineExposureOffset);
+ keyFile.set_boolean ("Color Management", "ApplyBaselineExposureOffset", icm.applyBaselineExposureOffset);
}
if (!pedited || pedited->icm.applyHueSatMap) {
- keyFile.set_boolean ("Color Management", "ApplyHueSatMap", icm.applyHueSatMap);
+ keyFile.set_boolean ("Color Management", "ApplyHueSatMap", icm.applyHueSatMap);
}
if (!pedited || pedited->icm.dcpIlluminant) {
- keyFile.set_integer ("Color Management", "DCPIlluminant", icm.dcpIlluminant);
+ keyFile.set_integer ("Color Management", "DCPIlluminant", icm.dcpIlluminant);
}
if (!pedited || pedited->icm.working) {
- keyFile.set_string ("Color Management", "WorkingProfile", icm.working);
+ keyFile.set_string ("Color Management", "WorkingProfile", icm.working);
}
if (!pedited || pedited->icm.output) {
- keyFile.set_string ("Color Management", "OutputProfile", icm.output);
+ keyFile.set_string ("Color Management", "OutputProfile", icm.output);
}
if (!pedited || pedited->icm.outputIntent) {
Glib::ustring intent;
switch (icm.outputIntent) {
- default:
- case RI_PERCEPTUAL:
- intent = "Perceptual";
- break;
+ default:
+ case RI_PERCEPTUAL:
+ intent = "Perceptual";
+ break;
- case RI_RELATIVE:
- intent = "Relative";
- break;
+ case RI_RELATIVE:
+ intent = "Relative";
+ break;
- case RI_SATURATION:
- intent = "Saturation";
- break;
+ case RI_SATURATION:
+ intent = "Saturation";
+ break;
- case RI_ABSOLUTE:
- intent = "Absolute";
- break;
+ case RI_ABSOLUTE:
+ intent = "Absolute";
+ break;
}
- keyFile.set_string ("Color Management", "OutputProfileIntent", intent);
+ keyFile.set_string ("Color Management", "OutputProfileIntent", intent);
}
if (!pedited || pedited->icm.outputBPC) {
- keyFile.set_boolean ("Color Management", "OutputBPC", icm.outputBPC);
+ keyFile.set_boolean ("Color Management", "OutputBPC", icm.outputBPC);
}
if (!pedited || pedited->icm.gamma) {
- keyFile.set_string ("Color Management", "Gammafree", icm.gamma);
+ keyFile.set_string ("Color Management", "Gammafree", icm.gamma);
}
if (!pedited || pedited->icm.freegamma) {
- keyFile.set_boolean ("Color Management", "Freegamma", icm.freegamma);
+ keyFile.set_boolean ("Color Management", "Freegamma", icm.freegamma);
}
if (!pedited || pedited->icm.gampos) {
- keyFile.set_double ("Color Management", "GammaValue", icm.gampos);
+ keyFile.set_double ("Color Management", "GammaValue", icm.gampos);
}
if (!pedited || pedited->icm.slpos) {
- keyFile.set_double ("Color Management", "GammaSlope", icm.slpos);
+ keyFile.set_double ("Color Management", "GammaSlope", icm.slpos);
}
- // save wavelet parameters
+// save wavelet parameters
if (!pedited || pedited->wavelet.enabled) {
keyFile.set_boolean ("Wavelet", "Enabled", wavelet.enabled);
}
@@ -2744,31 +2796,31 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->wavelet.thres) {
- keyFile.set_integer ("Wavelet", "MaxLev", wavelet.thres);
+ keyFile.set_integer ("Wavelet", "MaxLev", wavelet.thres);
}
if (!pedited || pedited->wavelet.Tilesmethod) {
- keyFile.set_string ("Wavelet", "TilesMethod", wavelet.Tilesmethod);
+ keyFile.set_string ("Wavelet", "TilesMethod", wavelet.Tilesmethod);
}
if (!pedited || pedited->wavelet.daubcoeffmethod) {
- keyFile.set_string ("Wavelet", "DaubMethod", wavelet.daubcoeffmethod);
+ keyFile.set_string ("Wavelet", "DaubMethod", wavelet.daubcoeffmethod);
}
if (!pedited || pedited->wavelet.CLmethod) {
- keyFile.set_string ("Wavelet", "ChoiceLevMethod", wavelet.CLmethod);
+ keyFile.set_string ("Wavelet", "ChoiceLevMethod", wavelet.CLmethod);
}
if (!pedited || pedited->wavelet.Backmethod) {
- keyFile.set_string ("Wavelet", "BackMethod", wavelet.Backmethod);
+ keyFile.set_string ("Wavelet", "BackMethod", wavelet.Backmethod);
}
if (!pedited || pedited->wavelet.Lmethod) {
- keyFile.set_string ("Wavelet", "LevMethod", wavelet.Lmethod);
+ keyFile.set_string ("Wavelet", "LevMethod", wavelet.Lmethod);
}
if (!pedited || pedited->wavelet.Dirmethod) {
- keyFile.set_string ("Wavelet", "DirMethod", wavelet.Dirmethod);
+ keyFile.set_string ("Wavelet", "DirMethod", wavelet.Dirmethod);
}
if (!pedited || pedited->wavelet.greenhigh) {
@@ -2823,180 +2875,180 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_boolean ("Wavelet", "Expnoise", wavelet.expnoise);
}
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
std::stringstream ss;
ss << "Contrast" << (i + 1);
if (!pedited || pedited->wavelet.c[i]) {
- keyFile.set_integer("Wavelet", ss.str(), wavelet.c[i]);
+ keyFile.set_integer ("Wavelet", ss.str(), wavelet.c[i]);
}
}
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
std::stringstream ss;
ss << "Chroma" << (i + 1);
if (!pedited || pedited->wavelet.ch[i]) {
- keyFile.set_integer("Wavelet", ss.str(), wavelet.ch[i]);
+ keyFile.set_integer ("Wavelet", ss.str(), wavelet.ch[i]);
}
}
if (!pedited || pedited->wavelet.sup) {
- keyFile.set_integer ("Wavelet", "ContExtra", wavelet.sup);
+ keyFile.set_integer ("Wavelet", "ContExtra", wavelet.sup);
}
if (!pedited || pedited->wavelet.HSmethod) {
- keyFile.set_string ("Wavelet", "HSMethod", wavelet.HSmethod);
+ keyFile.set_string ("Wavelet", "HSMethod", wavelet.HSmethod);
}
if (!pedited || pedited->wavelet.hllev) {
Glib::ArrayHandle thresh (wavelet.hllev.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "HLRange", thresh);
+ keyFile.set_integer_list ("Wavelet", "HLRange", thresh);
}
if (!pedited || pedited->wavelet.bllev) {
Glib::ArrayHandle thresh (wavelet.bllev.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "SHRange", thresh);
+ keyFile.set_integer_list ("Wavelet", "SHRange", thresh);
}
if (!pedited || pedited->wavelet.edgcont) {
Glib::ArrayHandle thresh (wavelet.edgcont.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "Edgcont", thresh);
+ keyFile.set_integer_list ("Wavelet", "Edgcont", thresh);
}
if (!pedited || pedited->wavelet.level0noise) {
Glib::ArrayHandle thresh (wavelet.level0noise.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_double_list("Wavelet", "Level0noise", thresh);
+ keyFile.set_double_list ("Wavelet", "Level0noise", thresh);
}
if (!pedited || pedited->wavelet.level1noise) {
Glib::ArrayHandle thresh (wavelet.level1noise.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_double_list("Wavelet", "Level1noise", thresh);
+ keyFile.set_double_list ("Wavelet", "Level1noise", thresh);
}
if (!pedited || pedited->wavelet.level2noise) {
Glib::ArrayHandle thresh (wavelet.level2noise.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_double_list("Wavelet", "Level2noise", thresh);
+ keyFile.set_double_list ("Wavelet", "Level2noise", thresh);
}
if (!pedited || pedited->wavelet.level3noise) {
Glib::ArrayHandle thresh (wavelet.level3noise.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_double_list("Wavelet", "Level3noise", thresh);
+ keyFile.set_double_list ("Wavelet", "Level3noise", thresh);
}
if (!pedited || pedited->wavelet.threshold) {
- keyFile.set_integer ("Wavelet", "ThresholdHighlight", wavelet.threshold);
+ keyFile.set_integer ("Wavelet", "ThresholdHighlight", wavelet.threshold);
}
if (!pedited || pedited->wavelet.threshold2) {
- keyFile.set_integer ("Wavelet", "ThresholdShadow", wavelet.threshold2);
+ keyFile.set_integer ("Wavelet", "ThresholdShadow", wavelet.threshold2);
}
if (!pedited || pedited->wavelet.edgedetect) {
- keyFile.set_integer ("Wavelet", "Edgedetect", wavelet.edgedetect);
+ keyFile.set_integer ("Wavelet", "Edgedetect", wavelet.edgedetect);
}
if (!pedited || pedited->wavelet.edgedetectthr) {
- keyFile.set_integer ("Wavelet", "Edgedetectthr", wavelet.edgedetectthr);
+ keyFile.set_integer ("Wavelet", "Edgedetectthr", wavelet.edgedetectthr);
}
if (!pedited || pedited->wavelet.edgedetectthr2) {
- keyFile.set_integer ("Wavelet", "EdgedetectthrHi", wavelet.edgedetectthr2);
+ keyFile.set_integer ("Wavelet", "EdgedetectthrHi", wavelet.edgedetectthr2);
}
if (!pedited || pedited->wavelet.edgesensi) {
- keyFile.set_integer ("Wavelet", "Edgesensi", wavelet.edgesensi);
+ keyFile.set_integer ("Wavelet", "Edgesensi", wavelet.edgesensi);
}
if (!pedited || pedited->wavelet.edgeampli) {
- keyFile.set_integer ("Wavelet", "Edgeampli", wavelet.edgeampli);
+ keyFile.set_integer ("Wavelet", "Edgeampli", wavelet.edgeampli);
}
if (!pedited || pedited->wavelet.chroma) {
- keyFile.set_integer ("Wavelet", "ThresholdChroma", wavelet.chroma);
+ keyFile.set_integer ("Wavelet", "ThresholdChroma", wavelet.chroma);
}
if (!pedited || pedited->wavelet.CHmethod) {
- keyFile.set_string ("Wavelet", "CHromaMethod", wavelet.CHmethod);
+ keyFile.set_string ("Wavelet", "CHromaMethod", wavelet.CHmethod);
}
if (!pedited || pedited->wavelet.Medgreinf) {
- keyFile.set_string ("Wavelet", "Medgreinf", wavelet.Medgreinf);
+ keyFile.set_string ("Wavelet", "Medgreinf", wavelet.Medgreinf);
}
if (!pedited || pedited->wavelet.CHSLmethod) {
- keyFile.set_string ("Wavelet", "CHSLromaMethod", wavelet.CHSLmethod);
+ keyFile.set_string ("Wavelet", "CHSLromaMethod", wavelet.CHSLmethod);
}
if (!pedited || pedited->wavelet.EDmethod) {
- keyFile.set_string ("Wavelet", "EDMethod", wavelet.EDmethod);
+ keyFile.set_string ("Wavelet", "EDMethod", wavelet.EDmethod);
}
if (!pedited || pedited->wavelet.NPmethod) {
- keyFile.set_string ("Wavelet", "NPMethod", wavelet.NPmethod);
+ keyFile.set_string ("Wavelet", "NPMethod", wavelet.NPmethod);
}
if (!pedited || pedited->wavelet.BAmethod) {
- keyFile.set_string ("Wavelet", "BAMethod", wavelet.BAmethod);
+ keyFile.set_string ("Wavelet", "BAMethod", wavelet.BAmethod);
}
if (!pedited || pedited->wavelet.TMmethod) {
- keyFile.set_string ("Wavelet", "TMMethod", wavelet.TMmethod);
+ keyFile.set_string ("Wavelet", "TMMethod", wavelet.TMmethod);
}
if (!pedited || pedited->wavelet.chro) {
- keyFile.set_integer ("Wavelet", "ChromaLink", wavelet.chro);
+ keyFile.set_integer ("Wavelet", "ChromaLink", wavelet.chro);
}
- if (!pedited || pedited->wavelet.ccwcurve) {
+ if (!pedited || pedited->wavelet.ccwcurve) {
Glib::ArrayHandle ccwcurve = wavelet.ccwcurve;
- keyFile.set_double_list("Wavelet", "ContrastCurve", ccwcurve);
+ keyFile.set_double_list ("Wavelet", "ContrastCurve", ccwcurve);
}
if (!pedited || pedited->wavelet.pastlev) {
Glib::ArrayHandle thresh (wavelet.pastlev.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "Pastlev", thresh);
+ keyFile.set_integer_list ("Wavelet", "Pastlev", thresh);
}
if (!pedited || pedited->wavelet.satlev) {
Glib::ArrayHandle thresh (wavelet.satlev.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "Satlev", thresh);
+ keyFile.set_integer_list ("Wavelet", "Satlev", thresh);
}
if (!pedited || pedited->wavelet.opacityCurveRG) {
Glib::ArrayHandle curve = wavelet.opacityCurveRG;
- keyFile.set_double_list("Wavelet", "OpacityCurveRG", curve);
+ keyFile.set_double_list ("Wavelet", "OpacityCurveRG", curve);
}
if (!pedited || pedited->wavelet.opacityCurveBY) {
Glib::ArrayHandle curve = wavelet.opacityCurveBY;
- keyFile.set_double_list("Wavelet", "OpacityCurveBY", curve);
+ keyFile.set_double_list ("Wavelet", "OpacityCurveBY", curve);
}
if (!pedited || pedited->wavelet.opacityCurveW) {
Glib::ArrayHandle curve = wavelet.opacityCurveW;
- keyFile.set_double_list("Wavelet", "OpacityCurveW", curve);
+ keyFile.set_double_list ("Wavelet", "OpacityCurveW", curve);
}
if (!pedited || pedited->wavelet.opacityCurveWL) {
Glib::ArrayHandle curve = wavelet.opacityCurveWL;
- keyFile.set_double_list("Wavelet", "OpacityCurveWL", curve);
+ keyFile.set_double_list ("Wavelet", "OpacityCurveWL", curve);
}
if (!pedited || pedited->wavelet.hhcurve) {
Glib::ArrayHandle curve = wavelet.hhcurve;
- keyFile.set_double_list("Wavelet", "HHcurve", curve);
+ keyFile.set_double_list ("Wavelet", "HHcurve", curve);
}
if (!pedited || pedited->wavelet.Chcurve) {
Glib::ArrayHandle curve = wavelet.Chcurve;
- keyFile.set_double_list("Wavelet", "CHcurve", curve);
+ keyFile.set_double_list ("Wavelet", "CHcurve", curve);
}
- if (!pedited || pedited->wavelet.wavclCurve) {
+ if (!pedited || pedited->wavelet.wavclCurve) {
Glib::ArrayHandle wavclCurve = wavelet.wavclCurve;
- keyFile.set_double_list("Wavelet", "WavclCurve", wavclCurve);
+ keyFile.set_double_list ("Wavelet", "WavclCurve", wavclCurve);
}
@@ -3020,30 +3072,30 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_boolean ("Wavelet", "Lipst", wavelet.lipst);
}
-// if (!pedited || pedited->wavelet.edgreinf) keyFile.set_boolean ("Wavelet", "Edgreinf", wavelet.edgreinf);
+// if (!pedited || pedited->wavelet.edgreinf) keyFile.set_boolean ("Wavelet", "Edgreinf", wavelet.edgreinf);
if (!pedited || pedited->wavelet.skinprotect) {
keyFile.set_double ("Wavelet", "Skinprotect", wavelet.skinprotect);
}
if (!pedited || pedited->wavelet.hueskin) {
Glib::ArrayHandle thresh (wavelet.hueskin.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "Hueskin", thresh);
+ keyFile.set_integer_list ("Wavelet", "Hueskin", thresh);
}
if (!pedited || pedited->wavelet.edgrad) {
- keyFile.set_integer ("Wavelet", "Edgrad", wavelet.edgrad);
+ keyFile.set_integer ("Wavelet", "Edgrad", wavelet.edgrad);
}
if (!pedited || pedited->wavelet.edgval) {
- keyFile.set_integer ("Wavelet", "Edgval", wavelet.edgval);
+ keyFile.set_integer ("Wavelet", "Edgval", wavelet.edgval);
}
if (!pedited || pedited->wavelet.edgthresh) {
- keyFile.set_integer ("Wavelet", "ThrEdg", wavelet.edgthresh);
+ keyFile.set_integer ("Wavelet", "ThrEdg", wavelet.edgthresh);
}
-// if (!pedited || pedited->wavelet.strength) keyFile.set_integer ("Wavelet", "Strength", wavelet.strength);
- // if (!pedited || pedited->wavelet.balance) keyFile.set_integer ("Wavelet", "Balance", wavelet.balance);
+// if (!pedited || pedited->wavelet.strength) keyFile.set_integer ("Wavelet", "Strength", wavelet.strength);
+// if (!pedited || pedited->wavelet.balance) keyFile.set_integer ("Wavelet", "Balance", wavelet.balance);
if (!pedited || pedited->wavelet.avoid) {
keyFile.set_boolean ("Wavelet", "AvoidColorShift", wavelet.avoid);
@@ -3054,48 +3106,48 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->wavelet.rescon) {
- keyFile.set_integer ("Wavelet", "ResidualcontShadow", wavelet.rescon);
+ keyFile.set_integer ("Wavelet", "ResidualcontShadow", wavelet.rescon);
}
if (!pedited || pedited->wavelet.resconH) {
- keyFile.set_integer ("Wavelet", "ResidualcontHighlight", wavelet.resconH);
+ keyFile.set_integer ("Wavelet", "ResidualcontHighlight", wavelet.resconH);
}
if (!pedited || pedited->wavelet.thr) {
- keyFile.set_integer ("Wavelet", "ThresholdResidShadow", wavelet.thr);
+ keyFile.set_integer ("Wavelet", "ThresholdResidShadow", wavelet.thr);
}
if (!pedited || pedited->wavelet.thrH) {
- keyFile.set_integer ("Wavelet", "ThresholdResidHighLight", wavelet.thrH);
+ keyFile.set_integer ("Wavelet", "ThresholdResidHighLight", wavelet.thrH);
}
if (!pedited || pedited->wavelet.reschro) {
- keyFile.set_integer ("Wavelet", "Residualchroma", wavelet.reschro);
+ keyFile.set_integer ("Wavelet", "Residualchroma", wavelet.reschro);
}
if (!pedited || pedited->wavelet.tmrs) {
- keyFile.set_double ("Wavelet", "ResidualTM", wavelet.tmrs);
+ keyFile.set_double ("Wavelet", "ResidualTM", wavelet.tmrs);
}
if (!pedited || pedited->wavelet.gamma) {
- keyFile.set_double ("Wavelet", "Residualgamma", wavelet.gamma);
+ keyFile.set_double ("Wavelet", "Residualgamma", wavelet.gamma);
}
if (!pedited || pedited->wavelet.sky) {
- keyFile.set_double ("Wavelet", "HueRangeResidual", wavelet.sky);
+ keyFile.set_double ("Wavelet", "HueRangeResidual", wavelet.sky);
}
if (!pedited || pedited->wavelet.hueskin2) {
Glib::ArrayHandle thresh (wavelet.hueskin2.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Wavelet", "HueRange", thresh);
+ keyFile.set_integer_list ("Wavelet", "HueRange", thresh);
}
if (!pedited || pedited->wavelet.contrast) {
- keyFile.set_integer ("Wavelet", "Contrast", wavelet.contrast);
+ keyFile.set_integer ("Wavelet", "Contrast", wavelet.contrast);
}
- // save directional pyramid wavelet parameters
+// save directional pyramid wavelet parameters
if (!pedited || pedited->dirpyrequalizer.enabled) {
keyFile.set_boolean ("Directional Pyramid Equalizer", "Enabled", dirpyrequalizer.enabled);
}
@@ -3105,15 +3157,15 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->dirpyrequalizer.cbdlMethod) {
- keyFile.set_string ("Directional Pyramid Equalizer", "cbdlMethod", dirpyrequalizer.cbdlMethod);
+ keyFile.set_string ("Directional Pyramid Equalizer", "cbdlMethod", dirpyrequalizer.cbdlMethod);
}
- for(int i = 0; i < 6; i++) {
+ for (int i = 0; i < 6; i++) {
std::stringstream ss;
ss << "Mult" << i;
if (!pedited || pedited->dirpyrequalizer.mult[i]) {
- keyFile.set_double("Directional Pyramid Equalizer", ss.str(), dirpyrequalizer.mult[i]);
+ keyFile.set_double ("Directional Pyramid Equalizer", ss.str(), dirpyrequalizer.mult[i]);
}
}
@@ -3125,31 +3177,31 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_double ("Directional Pyramid Equalizer", "Skinprotect", dirpyrequalizer.skinprotect);
}
- // if (!pedited || pedited->dirpyrequalizer.algo) keyFile.set_string ("Directional Pyramid Equalizer", "Algorithm", dirpyrequalizer.algo);
+// if (!pedited || pedited->dirpyrequalizer.algo) keyFile.set_string ("Directional Pyramid Equalizer", "Algorithm", dirpyrequalizer.algo);
if (!pedited || pedited->dirpyrequalizer.hueskin) {
Glib::ArrayHandle thresh (dirpyrequalizer.hueskin.value, 4, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("Directional Pyramid Equalizer", "Hueskin", thresh);
+ keyFile.set_integer_list ("Directional Pyramid Equalizer", "Hueskin", thresh);
}
- // save hsv wavelet parameters
+// save hsv wavelet parameters
if (!pedited || pedited->hsvequalizer.hcurve) {
Glib::ArrayHandle hcurve = hsvequalizer.hcurve;
- keyFile.set_double_list("HSV Equalizer", "HCurve", hcurve);
+ keyFile.set_double_list ("HSV Equalizer", "HCurve", hcurve);
}
if (!pedited || pedited->hsvequalizer.scurve) {
Glib::ArrayHandle scurve = hsvequalizer.scurve;
- keyFile.set_double_list("HSV Equalizer", "SCurve", scurve);
+ keyFile.set_double_list ("HSV Equalizer", "SCurve", scurve);
}
if (!pedited || pedited->hsvequalizer.vcurve) {
Glib::ArrayHandle vcurve = hsvequalizer.vcurve;
- keyFile.set_double_list("HSV Equalizer", "VCurve", vcurve);
+ keyFile.set_double_list ("HSV Equalizer", "VCurve", vcurve);
}
- //save film simulation parameters
+//save film simulation parameters
if ( !pedited || pedited->filmSimulation.enabled ) {
- keyFile.set_boolean( "Film Simulation", "Enabled", filmSimulation.enabled );
+ keyFile.set_boolean ( "Film Simulation", "Enabled", filmSimulation.enabled );
}
if ( !pedited || pedited->filmSimulation.clutFilename ) {
@@ -3157,36 +3209,36 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if ( !pedited || pedited->filmSimulation.strength ) {
- keyFile.set_integer( "Film Simulation", "Strength", filmSimulation.strength );
+ keyFile.set_integer ( "Film Simulation", "Strength", filmSimulation.strength );
}
if (!pedited || pedited->rgbCurves.lumamode) {
- keyFile.set_boolean ("RGB Curves", "LumaMode", rgbCurves.lumamode);
+ keyFile.set_boolean ("RGB Curves", "LumaMode", rgbCurves.lumamode);
}
if (!pedited || pedited->rgbCurves.rcurve) {
Glib::ArrayHandle RGBrcurve = rgbCurves.rcurve;
- keyFile.set_double_list("RGB Curves", "rCurve", RGBrcurve);
+ keyFile.set_double_list ("RGB Curves", "rCurve", RGBrcurve);
}
if (!pedited || pedited->rgbCurves.gcurve) {
Glib::ArrayHandle RGBgcurve = rgbCurves.gcurve;
- keyFile.set_double_list("RGB Curves", "gCurve", RGBgcurve);
+ keyFile.set_double_list ("RGB Curves", "gCurve", RGBgcurve);
}
if (!pedited || pedited->rgbCurves.bcurve) {
Glib::ArrayHandle RGBbcurve = rgbCurves.bcurve;
- keyFile.set_double_list("RGB Curves", "bCurve", RGBbcurve);
+ keyFile.set_double_list ("RGB Curves", "bCurve", RGBbcurve);
}
- // save Color Toning
+// save Color Toning
if (!pedited || pedited->colorToning.enabled) {
keyFile.set_boolean ("ColorToning", "Enabled", colorToning.enabled);
}
if (!pedited || pedited->colorToning.method) {
- keyFile.set_string ("ColorToning", "Method", colorToning.method);
+ keyFile.set_string ("ColorToning", "Method", colorToning.method);
}
if (!pedited || pedited->colorToning.lumamode) {
@@ -3194,23 +3246,23 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->colorToning.twocolor) {
- keyFile.set_string ("ColorToning", "Twocolor", colorToning.twocolor);
+ keyFile.set_string ("ColorToning", "Twocolor", colorToning.twocolor);
}
if (!pedited || pedited->colorToning.redlow) {
- keyFile.set_double ("ColorToning", "Redlow", colorToning.redlow);
+ keyFile.set_double ("ColorToning", "Redlow", colorToning.redlow);
}
if (!pedited || pedited->colorToning.greenlow) {
- keyFile.set_double ("ColorToning", "Greenlow", colorToning.greenlow);
+ keyFile.set_double ("ColorToning", "Greenlow", colorToning.greenlow);
}
if (!pedited || pedited->colorToning.bluelow) {
- keyFile.set_double ("ColorToning", "Bluelow", colorToning.bluelow);
+ keyFile.set_double ("ColorToning", "Bluelow", colorToning.bluelow);
}
if (!pedited || pedited->colorToning.satlow) {
- keyFile.set_double ("ColorToning", "Satlow", colorToning.satlow);
+ keyFile.set_double ("ColorToning", "Satlow", colorToning.satlow);
}
if (!pedited || pedited->colorToning.balance) {
@@ -3218,31 +3270,31 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->colorToning.sathigh) {
- keyFile.set_double ("ColorToning", "Sathigh", colorToning.sathigh);
+ keyFile.set_double ("ColorToning", "Sathigh", colorToning.sathigh);
}
if (!pedited || pedited->colorToning.redmed) {
- keyFile.set_double ("ColorToning", "Redmed", colorToning.redmed);
+ keyFile.set_double ("ColorToning", "Redmed", colorToning.redmed);
}
if (!pedited || pedited->colorToning.greenmed) {
- keyFile.set_double ("ColorToning", "Greenmed", colorToning.greenmed);
+ keyFile.set_double ("ColorToning", "Greenmed", colorToning.greenmed);
}
if (!pedited || pedited->colorToning.bluemed) {
- keyFile.set_double ("ColorToning", "Bluemed", colorToning.bluemed);
+ keyFile.set_double ("ColorToning", "Bluemed", colorToning.bluemed);
}
if (!pedited || pedited->colorToning.redhigh) {
- keyFile.set_double ("ColorToning", "Redhigh", colorToning.redhigh);
+ keyFile.set_double ("ColorToning", "Redhigh", colorToning.redhigh);
}
if (!pedited || pedited->colorToning.greenhigh) {
- keyFile.set_double ("ColorToning", "Greenhigh", colorToning.greenhigh);
+ keyFile.set_double ("ColorToning", "Greenhigh", colorToning.greenhigh);
}
if (!pedited || pedited->colorToning.bluehigh) {
- keyFile.set_double ("ColorToning", "Bluehigh", colorToning.bluehigh);
+ keyFile.set_double ("ColorToning", "Bluehigh", colorToning.bluehigh);
}
if (!pedited || pedited->colorToning.autosat) {
@@ -3251,12 +3303,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
if (!pedited || pedited->colorToning.opacityCurve) {
Glib::ArrayHandle curve = colorToning.opacityCurve;
- keyFile.set_double_list("ColorToning", "OpacityCurve", curve);
+ keyFile.set_double_list ("ColorToning", "OpacityCurve", curve);
}
if (!pedited || pedited->colorToning.colorCurve) {
Glib::ArrayHandle curve = colorToning.colorCurve;
- keyFile.set_double_list("ColorToning", "ColorCurve", curve);
+ keyFile.set_double_list ("ColorToning", "ColorCurve", curve);
}
if (!pedited || pedited->colorToning.satprotectionthreshold) {
@@ -3273,27 +3325,27 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
if (!pedited || pedited->colorToning.hlColSat) {
Glib::ArrayHandle thresh (colorToning.hlColSat.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("ColorToning", "HighlightsColorSaturation", thresh);
+ keyFile.set_integer_list ("ColorToning", "HighlightsColorSaturation", thresh);
}
if (!pedited || pedited->colorToning.shadowsColSat) {
Glib::ArrayHandle thresh (colorToning.shadowsColSat.value, 2, Glib::OWNERSHIP_NONE);
- keyFile.set_integer_list("ColorToning", "ShadowsColorSaturation", thresh);
+ keyFile.set_integer_list ("ColorToning", "ShadowsColorSaturation", thresh);
}
- if (!pedited || pedited->colorToning.clcurve) {
+ if (!pedited || pedited->colorToning.clcurve) {
Glib::ArrayHandle clcurve = colorToning.clcurve;
- keyFile.set_double_list("ColorToning", "ClCurve", clcurve);
+ keyFile.set_double_list ("ColorToning", "ClCurve", clcurve);
}
- if (!pedited || pedited->colorToning.cl2curve) {
+ if (!pedited || pedited->colorToning.cl2curve) {
Glib::ArrayHandle cl2curve = colorToning.cl2curve;
- keyFile.set_double_list("ColorToning", "Cl2Curve", cl2curve);
+ keyFile.set_double_list ("ColorToning", "Cl2Curve", cl2curve);
}
- // save raw parameters
+// save raw parameters
if (!pedited || pedited->raw.darkFrame) {
- keyFile.set_string ("RAW", "DarkFrame", relativePathIfInside(fname, fnameAbsolute, raw.dark_frame) );
+ keyFile.set_string ("RAW", "DarkFrame", relativePathIfInside (fname, fnameAbsolute, raw.dark_frame) );
}
if (!pedited || pedited->raw.dfAuto) {
@@ -3301,7 +3353,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.ff_file) {
- keyFile.set_string ("RAW", "FlatFieldFile", relativePathIfInside(fname, fnameAbsolute, raw.ff_file) );
+ keyFile.set_string ("RAW", "FlatFieldFile", relativePathIfInside (fname, fnameAbsolute, raw.ff_file) );
}
if (!pedited || pedited->raw.ff_AutoSelect) {
@@ -3313,7 +3365,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.ff_BlurType) {
- keyFile.set_string ("RAW", "FlatFieldBlurType", raw.ff_BlurType );
+ keyFile.set_string ("RAW", "FlatFieldBlurType", raw.ff_BlurType );
}
if (!pedited || pedited->raw.ff_AutoClipControl) {
@@ -3329,11 +3381,11 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.caRed) {
- keyFile.set_double ("RAW", "CARed", raw.cared );
+ keyFile.set_double ("RAW", "CARed", raw.cared );
}
if (!pedited || pedited->raw.caBlue) {
- keyFile.set_double ("RAW", "CABlue", raw.cablue );
+ keyFile.set_double ("RAW", "CABlue", raw.cablue );
}
if (!pedited || pedited->raw.hotPixelFilter) {
@@ -3349,7 +3401,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.bayersensor.method) {
- keyFile.set_string ("RAW Bayer", "Method", raw.bayersensor.method );
+ keyFile.set_string ("RAW Bayer", "Method", raw.bayersensor.method );
}
if (!pedited || pedited->raw.bayersensor.imageNum) {
@@ -3361,19 +3413,19 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.bayersensor.exBlack0) {
- keyFile.set_double ("RAW Bayer", "PreBlack0", raw.bayersensor.black0 );
+ keyFile.set_double ("RAW Bayer", "PreBlack0", raw.bayersensor.black0 );
}
if (!pedited || pedited->raw.bayersensor.exBlack1) {
- keyFile.set_double ("RAW Bayer", "PreBlack1", raw.bayersensor.black1 );
+ keyFile.set_double ("RAW Bayer", "PreBlack1", raw.bayersensor.black1 );
}
if (!pedited || pedited->raw.bayersensor.exBlack2) {
- keyFile.set_double ("RAW Bayer", "PreBlack2", raw.bayersensor.black2 );
+ keyFile.set_double ("RAW Bayer", "PreBlack2", raw.bayersensor.black2 );
}
if (!pedited || pedited->raw.bayersensor.exBlack3) {
- keyFile.set_double ("RAW Bayer", "PreBlack3", raw.bayersensor.black3 );
+ keyFile.set_double ("RAW Bayer", "PreBlack3", raw.bayersensor.black3 );
}
if (!pedited || pedited->raw.bayersensor.exTwoGreen) {
@@ -3521,7 +3573,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.xtranssensor.method) {
- keyFile.set_string ("RAW X-Trans", "Method", raw.xtranssensor.method );
+ keyFile.set_string ("RAW X-Trans", "Method", raw.xtranssensor.method );
}
if (!pedited || pedited->raw.xtranssensor.ccSteps) {
@@ -3529,35 +3581,35 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->raw.xtranssensor.exBlackRed) {
- keyFile.set_double ("RAW X-Trans", "PreBlackRed", raw.xtranssensor.blackred );
+ keyFile.set_double ("RAW X-Trans", "PreBlackRed", raw.xtranssensor.blackred );
}
if (!pedited || pedited->raw.xtranssensor.exBlackGreen) {
- keyFile.set_double ("RAW X-Trans", "PreBlackGreen", raw.xtranssensor.blackgreen );
+ keyFile.set_double ("RAW X-Trans", "PreBlackGreen", raw.xtranssensor.blackgreen );
}
if (!pedited || pedited->raw.xtranssensor.exBlackBlue) {
- keyFile.set_double ("RAW X-Trans", "PreBlackBlue", raw.xtranssensor.blackblue );
+ keyFile.set_double ("RAW X-Trans", "PreBlackBlue", raw.xtranssensor.blackblue );
}
- // save raw exposition
+// save raw exposition
if (!pedited || pedited->raw.exPos) {
- keyFile.set_double ("RAW", "PreExposure", raw.expos );
+ keyFile.set_double ("RAW", "PreExposure", raw.expos );
}
if (!pedited || pedited->raw.exPreser) {
- keyFile.set_double ("RAW", "PrePreserv", raw.preser );
+ keyFile.set_double ("RAW", "PrePreserv", raw.preser );
}
- // save exif change list
+// save exif change list
if (!pedited || pedited->exif) {
for (ExifPairs::const_iterator i = exif.begin(); i != exif.end(); ++i) {
keyFile.set_string ("Exif", i->first, i->second);
}
}
- // save iptc change list
+// save iptc change list
if (!pedited || pedited->iptc) {
for (IPTCPairs::const_iterator i = iptc.begin(); i != iptc.end(); ++i) {
Glib::ArrayHandle values = i->second;
@@ -3567,7 +3619,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
sPParams = keyFile.to_data();
- } catch(Glib::KeyFileError&) {}
+ } catch (Glib::KeyFileError&) {}
if (sPParams.empty ()) {
return 1;
@@ -3608,7 +3660,7 @@ int ProcParams::write (const Glib::ustring &fname, const Glib::ustring &content)
int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
{
- setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
+ setlocale (LC_NUMERIC, "C"); // to set decimal point to "."
if (fname.empty()) {
return 1;
@@ -3619,7 +3671,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
try {
if (pedited) {
- pedited->set(false);
+ pedited->set (false);
}
FILE* f = g_fopen (fname.c_str (), "rt");
@@ -3650,24 +3702,24 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_group ("Version")) {
if (keyFile.has_key ("Version", "AppVersion")) {
- appVersion = keyFile.get_string ("Version", "AppVersion");
+ appVersion = keyFile.get_string ("Version", "AppVersion");
}
if (keyFile.has_key ("Version", "Version")) {
- ppVersion = keyFile.get_integer ("Version", "Version");
+ ppVersion = keyFile.get_integer ("Version", "Version");
}
}
if (keyFile.has_group ("General")) {
- if (keyFile.has_key ("General", "Rank")) {
- rank = keyFile.get_integer ("General", "Rank");
+ if (keyFile.has_key ("General", "Rank")) {
+ rank = keyFile.get_integer ("General", "Rank");
if (pedited) {
pedited->general.rank = true;
}
}
- if (keyFile.has_key ("General", "ColorLabel")) {
+ if (keyFile.has_key ("General", "ColorLabel")) {
colorlabel = keyFile.get_integer ("General", "ColorLabel");
if (pedited) {
@@ -3675,8 +3727,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("General", "InTrash")) {
- inTrash = keyFile.get_boolean ("General", "InTrash");
+ if (keyFile.has_key ("General", "InTrash")) {
+ inTrash = keyFile.get_boolean ("General", "InTrash");
if (pedited) {
pedited->general.intrash = true;
@@ -3686,57 +3738,57 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_group ("Exposure")) {
if (ppVersion < PPVERSION_AEXP) {
- toneCurve.autoexp = false; // prevent execution of autoexp when opening file created with earlier verions of autoexp algorithm
- } else if (keyFile.has_key ("Exposure", "Auto")) {
- toneCurve.autoexp = keyFile.get_boolean ("Exposure", "Auto");
+ toneCurve.autoexp = false; // prevent execution of autoexp when opening file created with earlier verions of autoexp algorithm
+ } else if (keyFile.has_key ("Exposure", "Auto")) {
+ toneCurve.autoexp = keyFile.get_boolean ("Exposure", "Auto");
if (pedited) {
pedited->toneCurve.autoexp = true;
}
}
- if (keyFile.has_key ("Exposure", "Clip")) {
- toneCurve.clip = keyFile.get_double ("Exposure", "Clip");
+ if (keyFile.has_key ("Exposure", "Clip")) {
+ toneCurve.clip = keyFile.get_double ("Exposure", "Clip");
if (pedited) {
pedited->toneCurve.clip = true;
}
}
- if (keyFile.has_key ("Exposure", "Compensation")) {
- toneCurve.expcomp = keyFile.get_double ("Exposure", "Compensation");
+ if (keyFile.has_key ("Exposure", "Compensation")) {
+ toneCurve.expcomp = keyFile.get_double ("Exposure", "Compensation");
if (pedited) {
pedited->toneCurve.expcomp = true;
}
}
- if (keyFile.has_key ("Exposure", "Brightness")) {
- toneCurve.brightness = keyFile.get_integer ("Exposure", "Brightness");
+ if (keyFile.has_key ("Exposure", "Brightness")) {
+ toneCurve.brightness = keyFile.get_integer ("Exposure", "Brightness");
if (pedited) {
pedited->toneCurve.brightness = true;
}
}
- if (keyFile.has_key ("Exposure", "Contrast")) {
- toneCurve.contrast = keyFile.get_integer ("Exposure", "Contrast");
+ if (keyFile.has_key ("Exposure", "Contrast")) {
+ toneCurve.contrast = keyFile.get_integer ("Exposure", "Contrast");
if (pedited) {
pedited->toneCurve.contrast = true;
}
}
- if (keyFile.has_key ("Exposure", "Saturation")) {
- toneCurve.saturation = keyFile.get_integer ("Exposure", "Saturation");
+ if (keyFile.has_key ("Exposure", "Saturation")) {
+ toneCurve.saturation = keyFile.get_integer ("Exposure", "Saturation");
if (pedited) {
pedited->toneCurve.saturation = true;
}
}
- if (keyFile.has_key ("Exposure", "Black")) {
- toneCurve.black = keyFile.get_integer ("Exposure", "Black");
+ if (keyFile.has_key ("Exposure", "Black")) {
+ toneCurve.black = keyFile.get_integer ("Exposure", "Black");
if (pedited) {
pedited->toneCurve.black = true;
@@ -3744,7 +3796,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Exposure", "HighlightCompr")) {
- toneCurve.hlcompr = keyFile.get_integer ("Exposure", "HighlightCompr");
+ toneCurve.hlcompr = keyFile.get_integer ("Exposure", "HighlightCompr");
if (pedited) {
pedited->toneCurve.hlcompr = true;
@@ -3759,23 +3811,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Exposure", "ShadowCompr")) {
- toneCurve.shcompr = keyFile.get_integer ("Exposure", "ShadowCompr");
+ if (keyFile.has_key ("Exposure", "ShadowCompr")) {
+ toneCurve.shcompr = keyFile.get_integer ("Exposure", "ShadowCompr");
if (pedited) {
pedited->toneCurve.shcompr = true;
}
}
- // load highlight recovery settings
+// load highlight recovery settings
if (toneCurve.shcompr > 100) {
- toneCurve.shcompr = 100; // older pp3 files can have values above 100.
+ toneCurve.shcompr = 100; // older pp3 files can have values above 100.
}
- if (keyFile.has_key ("Exposure", "CurveMode")) {
+ if (keyFile.has_key ("Exposure", "CurveMode")) {
Glib::ustring sMode = keyFile.get_string ("Exposure", "CurveMode");
- if (sMode == "Standard") {
+ if (sMode == "Standard") {
toneCurve.curveMode = ToneCurveParams::TC_MODE_STD;
} else if (sMode == "FilmLike") {
toneCurve.curveMode = ToneCurveParams::TC_MODE_FILMLIKE;
@@ -3794,10 +3846,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Exposure", "CurveMode2")) {
+ if (keyFile.has_key ("Exposure", "CurveMode2")) {
Glib::ustring sMode = keyFile.get_string ("Exposure", "CurveMode2");
- if (sMode == "Standard") {
+ if (sMode == "Standard") {
toneCurve.curveMode2 = ToneCurveParams::TC_MODE_STD;
} else if (sMode == "FilmLike") {
toneCurve.curveMode2 = ToneCurveParams::TC_MODE_FILMLIKE;
@@ -3817,17 +3869,19 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion > 200) {
- if (keyFile.has_key ("Exposure", "Curve")) {
- toneCurve.curve = keyFile.get_double_list ("Exposure", "Curve");
- avoidEmptyCurve(toneCurve.curve);
+ if (keyFile.has_key ("Exposure", "Curve")) {
+ toneCurve.curve = keyFile.get_double_list ("Exposure", "Curve");
+ avoidEmptyCurve (toneCurve.curve);
+
if (pedited) {
pedited->toneCurve.curve = true;
}
}
- if (keyFile.has_key ("Exposure", "Curve2")) {
- toneCurve.curve2 = keyFile.get_double_list ("Exposure", "Curve2");
- avoidEmptyCurve(toneCurve.curve2);
+ if (keyFile.has_key ("Exposure", "Curve2")) {
+ toneCurve.curve2 = keyFile.get_double_list ("Exposure", "Curve2");
+ avoidEmptyCurve (toneCurve.curve2);
+
if (pedited) {
pedited->toneCurve.curve2 = true;
}
@@ -3836,16 +3890,16 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_group ("HLRecovery")) {
- if (keyFile.has_key ("HLRecovery", "Enabled")) {
- toneCurve.hrenabled = keyFile.get_boolean ("HLRecovery", "Enabled");
+ if (keyFile.has_key ("HLRecovery", "Enabled")) {
+ toneCurve.hrenabled = keyFile.get_boolean ("HLRecovery", "Enabled");
if (pedited) {
pedited->toneCurve.hrenabled = true;
}
}
- if (keyFile.has_key ("HLRecovery", "Method")) {
- toneCurve.method = keyFile.get_string ("HLRecovery", "Method");
+ if (keyFile.has_key ("HLRecovery", "Method")) {
+ toneCurve.method = keyFile.get_string ("HLRecovery", "Method");
if (pedited) {
pedited->toneCurve.method = true;
@@ -3859,40 +3913,41 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
const std::vector rmix = keyFile.get_integer_list ("Channel Mixer", "Red");
const std::vector gmix = keyFile.get_integer_list ("Channel Mixer", "Green");
const std::vector bmix = keyFile.get_integer_list ("Channel Mixer", "Blue");
- if(rmix.size() == 3 && gmix.size() == 3 && bmix.size() == 3) {
- memcpy (chmixer.red, rmix.data(), 3 * sizeof(int));
- memcpy (chmixer.green, gmix.data(), 3 * sizeof(int));
- memcpy (chmixer.blue, bmix.data(), 3 * sizeof(int));
+
+ if (rmix.size() == 3 && gmix.size() == 3 && bmix.size() == 3) {
+ memcpy (chmixer.red, rmix.data(), 3 * sizeof (int));
+ memcpy (chmixer.green, gmix.data(), 3 * sizeof (int));
+ memcpy (chmixer.blue, bmix.data(), 3 * sizeof (int));
}
if (pedited) {
- pedited->chmixer.red[0] = pedited->chmixer.red[1] = pedited->chmixer.red[2] = true;
+ pedited->chmixer.red[0] = pedited->chmixer.red[1] = pedited->chmixer.red[2] = true;
pedited->chmixer.green[0] = pedited->chmixer.green[1] = pedited->chmixer.green[2] = true;
- pedited->chmixer.blue[0] = pedited->chmixer.blue[1] = pedited->chmixer.blue[2] = true;
+ pedited->chmixer.blue[0] = pedited->chmixer.blue[1] = pedited->chmixer.blue[2] = true;
}
}
}
- // load black & white
+// load black & white
if (keyFile.has_group ("Black & White")) {
- if (keyFile.has_key ("Black & White", "Enabled")) {
- blackwhite.enabled = keyFile.get_boolean ("Black & White", "Enabled");
+ if (keyFile.has_key ("Black & White", "Enabled")) {
+ blackwhite.enabled = keyFile.get_boolean ("Black & White", "Enabled");
if (pedited) {
pedited->blackwhite.enabled = true;
}
}
- if (keyFile.has_key ("Black & White", "Method")) {
- blackwhite.method = keyFile.get_string ("Black & White", "Method");
+ if (keyFile.has_key ("Black & White", "Method")) {
+ blackwhite.method = keyFile.get_string ("Black & White", "Method");
if (pedited) {
pedited->blackwhite.method = true;
}
}
- if (keyFile.has_key ("Black & White", "Auto")) {
- blackwhite.autoc = keyFile.get_boolean ("Black & White", "Auto");
+ if (keyFile.has_key ("Black & White", "Auto")) {
+ blackwhite.autoc = keyFile.get_boolean ("Black & White", "Auto");
if (pedited) {
pedited->blackwhite.autoc = true;
@@ -3900,62 +3955,62 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Black & White", "ComplementaryColors")) {
- blackwhite.enabledcc = keyFile.get_boolean ("Black & White", "ComplementaryColors");
+ blackwhite.enabledcc = keyFile.get_boolean ("Black & White", "ComplementaryColors");
if (pedited) {
pedited->blackwhite.enabledcc = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerRed")) {
- blackwhite.mixerRed = keyFile.get_integer ("Black & White", "MixerRed");
+ if (keyFile.has_key ("Black & White", "MixerRed")) {
+ blackwhite.mixerRed = keyFile.get_integer ("Black & White", "MixerRed");
if (pedited) {
pedited->blackwhite.mixerRed = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerOrange")) {
- blackwhite.mixerOrange = keyFile.get_integer ("Black & White", "MixerOrange");
+ if (keyFile.has_key ("Black & White", "MixerOrange")) {
+ blackwhite.mixerOrange = keyFile.get_integer ("Black & White", "MixerOrange");
if (pedited) {
pedited->blackwhite.mixerOrange = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerYellow")) {
- blackwhite.mixerYellow = keyFile.get_integer ("Black & White", "MixerYellow");
+ if (keyFile.has_key ("Black & White", "MixerYellow")) {
+ blackwhite.mixerYellow = keyFile.get_integer ("Black & White", "MixerYellow");
if (pedited) {
pedited->blackwhite.mixerYellow = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerGreen")) {
- blackwhite.mixerGreen = keyFile.get_integer ("Black & White", "MixerGreen");
+ if (keyFile.has_key ("Black & White", "MixerGreen")) {
+ blackwhite.mixerGreen = keyFile.get_integer ("Black & White", "MixerGreen");
if (pedited) {
pedited->blackwhite.mixerGreen = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerCyan")) {
- blackwhite.mixerCyan = keyFile.get_integer ("Black & White", "MixerCyan");
+ if (keyFile.has_key ("Black & White", "MixerCyan")) {
+ blackwhite.mixerCyan = keyFile.get_integer ("Black & White", "MixerCyan");
if (pedited) {
pedited->blackwhite.mixerCyan = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerBlue")) {
- blackwhite.mixerBlue = keyFile.get_integer ("Black & White", "MixerBlue");
+ if (keyFile.has_key ("Black & White", "MixerBlue")) {
+ blackwhite.mixerBlue = keyFile.get_integer ("Black & White", "MixerBlue");
if (pedited) {
pedited->blackwhite.mixerBlue = true;
}
}
- if (keyFile.has_key ("Black & White", "MixerMagenta")) {
+ if (keyFile.has_key ("Black & White", "MixerMagenta")) {
blackwhite.mixerMagenta = keyFile.get_integer ("Black & White", "MixerMagenta");
if (pedited) {
@@ -3963,72 +4018,74 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Black & White", "MixerPurple")) {
- blackwhite.mixerPurple = keyFile.get_integer ("Black & White", "MixerPurple");
+ if (keyFile.has_key ("Black & White", "MixerPurple")) {
+ blackwhite.mixerPurple = keyFile.get_integer ("Black & White", "MixerPurple");
if (pedited) {
pedited->blackwhite.mixerPurple = true;
}
}
- if (keyFile.has_key ("Black & White", "GammaRed")) {
- blackwhite.gammaRed = keyFile.get_integer ("Black & White", "GammaRed");
+ if (keyFile.has_key ("Black & White", "GammaRed")) {
+ blackwhite.gammaRed = keyFile.get_integer ("Black & White", "GammaRed");
if (pedited) {
pedited->blackwhite.gammaRed = true;
}
}
- if (keyFile.has_key ("Black & White", "GammaGreen")) {
- blackwhite.gammaGreen = keyFile.get_integer ("Black & White", "GammaGreen");
+ if (keyFile.has_key ("Black & White", "GammaGreen")) {
+ blackwhite.gammaGreen = keyFile.get_integer ("Black & White", "GammaGreen");
if (pedited) {
pedited->blackwhite.gammaGreen = true;
}
}
- if (keyFile.has_key ("Black & White", "GammaBlue")) {
- blackwhite.gammaBlue = keyFile.get_integer ("Black & White", "GammaBlue");
+ if (keyFile.has_key ("Black & White", "GammaBlue")) {
+ blackwhite.gammaBlue = keyFile.get_integer ("Black & White", "GammaBlue");
if (pedited) {
pedited->blackwhite.gammaBlue = true;
}
}
- if (keyFile.has_key ("Black & White", "Filter")) {
- blackwhite.filter = keyFile.get_string ("Black & White", "Filter");
+ if (keyFile.has_key ("Black & White", "Filter")) {
+ blackwhite.filter = keyFile.get_string ("Black & White", "Filter");
if (pedited) {
pedited->blackwhite.filter = true;
}
}
- if (keyFile.has_key ("Black & White", "Setting")) {
- blackwhite.setting = keyFile.get_string ("Black & White", "Setting");
+ if (keyFile.has_key ("Black & White", "Setting")) {
+ blackwhite.setting = keyFile.get_string ("Black & White", "Setting");
if (pedited) {
pedited->blackwhite.setting = true;
}
}
- if (keyFile.has_key ("Black & White", "LuminanceCurve")) {
+ if (keyFile.has_key ("Black & White", "LuminanceCurve")) {
blackwhite.luminanceCurve = keyFile.get_double_list ("Black & White", "LuminanceCurve");
- avoidEmptyCurve(blackwhite.luminanceCurve);
+ avoidEmptyCurve (blackwhite.luminanceCurve);
+
if (pedited) {
pedited->blackwhite.luminanceCurve = true;
}
}
- if (keyFile.has_key ("Black & White", "BeforeCurve")) {
- blackwhite.beforeCurve = keyFile.get_double_list ("Black & White", "BeforeCurve");
- avoidEmptyCurve(blackwhite.beforeCurve);
+ if (keyFile.has_key ("Black & White", "BeforeCurve")) {
+ blackwhite.beforeCurve = keyFile.get_double_list ("Black & White", "BeforeCurve");
+ avoidEmptyCurve (blackwhite.beforeCurve);
+
if (pedited) {
pedited->blackwhite.beforeCurve = true;
}
}
- if (keyFile.has_key ("Black & White", "Algorithm")) {
- blackwhite.algo = keyFile.get_string ("Black & White", "Algorithm");
+ if (keyFile.has_key ("Black & White", "Algorithm")) {
+ blackwhite.algo = keyFile.get_string ("Black & White", "Algorithm");
if (pedited) {
pedited->blackwhite.algo = true;
@@ -4038,7 +4095,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Black & White", "BeforeCurveMode")) {
Glib::ustring sMode = keyFile.get_string ("Black & White", "BeforeCurveMode");
- if (sMode == "Standard") {
+ if (sMode == "Standard") {
blackwhite.beforeCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
} else if (sMode == "FilmLike") {
blackwhite.beforeCurveMode = BlackWhiteParams::TC_MODE_FILMLIKE_BW;
@@ -4053,18 +4110,19 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Black & White", "AfterCurve")) {
- blackwhite.afterCurve = keyFile.get_double_list ("Black & White", "AfterCurve");
- avoidEmptyCurve(blackwhite.afterCurve);
+ if (keyFile.has_key ("Black & White", "AfterCurve")) {
+ blackwhite.afterCurve = keyFile.get_double_list ("Black & White", "AfterCurve");
+ avoidEmptyCurve (blackwhite.afterCurve);
+
if (pedited) {
pedited->blackwhite.afterCurve = true;
}
}
- if (keyFile.has_key ("Black & White", "AfterCurveMode")) {
+ if (keyFile.has_key ("Black & White", "AfterCurveMode")) {
Glib::ustring sMode2 = keyFile.get_string ("Black & White", "AfterCurveMode");
- if (sMode2 == "Standard") {
+ if (sMode2 == "Standard") {
blackwhite.afterCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
} else if (sMode2 == "WeightedStd") {
blackwhite.afterCurveMode = BlackWhiteParams::TC_MODE_WEIGHTEDSTD_BW;
@@ -4076,10 +4134,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- //load retinex
+//load retinex
if (keyFile.has_group ("Retinex")) {
- if (keyFile.has_key ("Retinex", "Median")) {
+ if (keyFile.has_key ("Retinex", "Median")) {
retinex.medianmap = keyFile.get_boolean ("Retinex", "Median");
if (pedited) {
@@ -4087,24 +4145,24 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Retinex", "RetinexMethod")) {
- retinex.retinexMethod = keyFile.get_string ("Retinex", "RetinexMethod");
+ if (keyFile.has_key ("Retinex", "RetinexMethod")) {
+ retinex.retinexMethod = keyFile.get_string ("Retinex", "RetinexMethod");
if (pedited) {
pedited->retinex.retinexMethod = true;
}
}
- if (keyFile.has_key ("Retinex", "mapMethod")) {
- retinex.mapMethod = keyFile.get_string ("Retinex", "mapMethod");
+ if (keyFile.has_key ("Retinex", "mapMethod")) {
+ retinex.mapMethod = keyFile.get_string ("Retinex", "mapMethod");
if (pedited) {
pedited->retinex.mapMethod = true;
}
}
- if (keyFile.has_key ("Retinex", "viewMethod")) {
- retinex.viewMethod = keyFile.get_string ("Retinex", "viewMethod");
+ if (keyFile.has_key ("Retinex", "viewMethod")) {
+ retinex.viewMethod = keyFile.get_string ("Retinex", "viewMethod");
if (pedited) {
pedited->retinex.viewMethod = true;
@@ -4112,23 +4170,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if (keyFile.has_key ("Retinex", "Retinexcolorspace")) {
- retinex.retinexcolorspace = keyFile.get_string ("Retinex", "Retinexcolorspace");
+ if (keyFile.has_key ("Retinex", "Retinexcolorspace")) {
+ retinex.retinexcolorspace = keyFile.get_string ("Retinex", "Retinexcolorspace");
if (pedited) {
pedited->retinex.retinexcolorspace = true;
}
}
- if (keyFile.has_key ("Retinex", "Gammaretinex")) {
- retinex.gammaretinex = keyFile.get_string ("Retinex", "Gammaretinex");
+ if (keyFile.has_key ("Retinex", "Gammaretinex")) {
+ retinex.gammaretinex = keyFile.get_string ("Retinex", "Gammaretinex");
if (pedited) {
pedited->retinex.gammaretinex = true;
}
}
- if (keyFile.has_key ("Retinex", "Enabled")) {
+ if (keyFile.has_key ("Retinex", "Enabled")) {
retinex.enabled = keyFile.get_boolean ("Retinex", "Enabled");
if (pedited) {
@@ -4136,168 +4194,172 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Retinex", "Neigh")) {
- retinex.neigh = keyFile.get_integer ("Retinex", "Neigh");
+ if (keyFile.has_key ("Retinex", "Neigh")) {
+ retinex.neigh = keyFile.get_integer ("Retinex", "Neigh");
if (pedited) {
pedited->retinex.neigh = true;
}
}
- if (keyFile.has_key ("Retinex", "Str")) {
- retinex.str = keyFile.get_integer ("Retinex", "Str");
+ if (keyFile.has_key ("Retinex", "Str")) {
+ retinex.str = keyFile.get_integer ("Retinex", "Str");
if (pedited) {
pedited->retinex.str = true;
}
}
- if (keyFile.has_key ("Retinex", "Scal")) {
- retinex.scal = keyFile.get_integer ("Retinex", "Scal");
+ if (keyFile.has_key ("Retinex", "Scal")) {
+ retinex.scal = keyFile.get_integer ("Retinex", "Scal");
if (pedited) {
pedited->retinex.scal = true;
}
}
- if (keyFile.has_key ("Retinex", "Iter")) {
- retinex.iter = keyFile.get_integer ("Retinex", "Iter");
+ if (keyFile.has_key ("Retinex", "Iter")) {
+ retinex.iter = keyFile.get_integer ("Retinex", "Iter");
if (pedited) {
pedited->retinex.iter = true;
}
}
- if (keyFile.has_key ("Retinex", "Grad")) {
- retinex.grad = keyFile.get_integer ("Retinex", "Grad");
+ if (keyFile.has_key ("Retinex", "Grad")) {
+ retinex.grad = keyFile.get_integer ("Retinex", "Grad");
if (pedited) {
pedited->retinex.grad = true;
}
}
- if (keyFile.has_key ("Retinex", "Grads")) {
- retinex.grads = keyFile.get_integer ("Retinex", "Grads");
+ if (keyFile.has_key ("Retinex", "Grads")) {
+ retinex.grads = keyFile.get_integer ("Retinex", "Grads");
if (pedited) {
pedited->retinex.grads = true;
}
}
- if (keyFile.has_key ("Retinex", "Gam")) {
- retinex.gam = keyFile.get_double ("Retinex", "Gam");
+ if (keyFile.has_key ("Retinex", "Gam")) {
+ retinex.gam = keyFile.get_double ("Retinex", "Gam");
if (pedited) {
pedited->retinex.gam = true;
}
}
- if (keyFile.has_key ("Retinex", "Slope")) {
- retinex.slope = keyFile.get_double ("Retinex", "Slope");
+ if (keyFile.has_key ("Retinex", "Slope")) {
+ retinex.slope = keyFile.get_double ("Retinex", "Slope");
if (pedited) {
pedited->retinex.slope = true;
}
}
- if (keyFile.has_key ("Retinex", "Offs")) {
- retinex.offs = keyFile.get_integer ("Retinex", "Offs");
+ if (keyFile.has_key ("Retinex", "Offs")) {
+ retinex.offs = keyFile.get_integer ("Retinex", "Offs");
if (pedited) {
pedited->retinex.offs = true;
}
}
- if (keyFile.has_key ("Retinex", "Vart")) {
- retinex.vart = keyFile.get_integer ("Retinex", "Vart");
+ if (keyFile.has_key ("Retinex", "Vart")) {
+ retinex.vart = keyFile.get_integer ("Retinex", "Vart");
if (pedited) {
pedited->retinex.vart = true;
}
}
- if (keyFile.has_key ("Retinex", "Limd")) {
- retinex.limd = keyFile.get_integer ("Retinex", "Limd");
+ if (keyFile.has_key ("Retinex", "Limd")) {
+ retinex.limd = keyFile.get_integer ("Retinex", "Limd");
if (pedited) {
pedited->retinex.limd = true;
}
}
- if (keyFile.has_key ("Retinex", "highl")) {
- retinex.highl = keyFile.get_integer ("Retinex", "highl");
+ if (keyFile.has_key ("Retinex", "highl")) {
+ retinex.highl = keyFile.get_integer ("Retinex", "highl");
if (pedited) {
pedited->retinex.highl = true;
}
}
- if (keyFile.has_key ("Retinex", "skal")) {
- retinex.skal = keyFile.get_integer ("Retinex", "skal");
+ if (keyFile.has_key ("Retinex", "skal")) {
+ retinex.skal = keyFile.get_integer ("Retinex", "skal");
if (pedited) {
pedited->retinex.skal = true;
}
}
- if (keyFile.has_key ("Retinex", "CDCurve")) {
- retinex.cdcurve = keyFile.get_double_list ("Retinex", "CDCurve");
- avoidEmptyCurve(retinex.cdcurve);
+ if (keyFile.has_key ("Retinex", "CDCurve")) {
+ retinex.cdcurve = keyFile.get_double_list ("Retinex", "CDCurve");
+ avoidEmptyCurve (retinex.cdcurve);
+
if (pedited) {
pedited->retinex.cdcurve = true;
}
}
- if (keyFile.has_key ("Retinex", "MAPCurve")) {
- retinex.mapcurve = keyFile.get_double_list ("Retinex", "MAPCurve");
- avoidEmptyCurve(retinex.mapcurve);
+ if (keyFile.has_key ("Retinex", "MAPCurve")) {
+ retinex.mapcurve = keyFile.get_double_list ("Retinex", "MAPCurve");
+ avoidEmptyCurve (retinex.mapcurve);
+
if (pedited) {
pedited->retinex.mapcurve = true;
}
}
- if (keyFile.has_key ("Retinex", "CDHCurve")) {
- retinex.cdHcurve = keyFile.get_double_list ("Retinex", "CDHCurve");
- avoidEmptyCurve(retinex.cdHcurve);
+ if (keyFile.has_key ("Retinex", "CDHCurve")) {
+ retinex.cdHcurve = keyFile.get_double_list ("Retinex", "CDHCurve");
+ avoidEmptyCurve (retinex.cdHcurve);
+
if (pedited) {
pedited->retinex.cdHcurve = true;
}
}
- if (keyFile.has_key ("Retinex", "LHCurve")) {
- retinex.lhcurve = keyFile.get_double_list ("Retinex", "LHCurve");
- avoidEmptyCurve(retinex.lhcurve);
+ if (keyFile.has_key ("Retinex", "LHCurve")) {
+ retinex.lhcurve = keyFile.get_double_list ("Retinex", "LHCurve");
+ avoidEmptyCurve (retinex.lhcurve);
+
if (pedited) {
pedited->retinex.lhcurve = true;
}
}
- if (keyFile.has_key ("Retinex", "Highlights")) {
- retinex.highlights = keyFile.get_integer ("Retinex", "Highlights");
+ if (keyFile.has_key ("Retinex", "Highlights")) {
+ retinex.highlights = keyFile.get_integer ("Retinex", "Highlights");
if (pedited) {
pedited->retinex.highlights = true;
}
}
- if (keyFile.has_key ("Retinex", "HighlightTonalWidth")) {
- retinex.htonalwidth = keyFile.get_integer ("Retinex", "HighlightTonalWidth");
+ if (keyFile.has_key ("Retinex", "HighlightTonalWidth")) {
+ retinex.htonalwidth = keyFile.get_integer ("Retinex", "HighlightTonalWidth");
if (pedited) {
pedited->retinex.htonalwidth = true;
}
}
- if (keyFile.has_key ("Retinex", "Shadows")) {
- retinex.shadows = keyFile.get_integer ("Retinex", "Shadows");
+ if (keyFile.has_key ("Retinex", "Shadows")) {
+ retinex.shadows = keyFile.get_integer ("Retinex", "Shadows");
if (pedited) {
pedited->retinex.shadows = true;
}
}
- if (keyFile.has_key ("Retinex", "ShadowTonalWidth")) {
- retinex.stonalwidth = keyFile.get_integer ("Retinex", "ShadowTonalWidth");
+ if (keyFile.has_key ("Retinex", "ShadowTonalWidth")) {
+ retinex.stonalwidth = keyFile.get_integer ("Retinex", "ShadowTonalWidth");
if (pedited) {
pedited->retinex.stonalwidth = true;
@@ -4305,8 +4367,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if (keyFile.has_key ("Retinex", "Radius")) {
- retinex.radius = keyFile.get_integer ("Retinex", "Radius");
+ if (keyFile.has_key ("Retinex", "Radius")) {
+ retinex.radius = keyFile.get_integer ("Retinex", "Radius");
if (pedited) {
pedited->retinex.radius = true;
@@ -4314,18 +4376,20 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if (keyFile.has_key ("Retinex", "TransmissionCurve")) {
- retinex.transmissionCurve = keyFile.get_double_list ("Retinex", "TransmissionCurve");
- avoidEmptyCurve(retinex.transmissionCurve);
+ if (keyFile.has_key ("Retinex", "TransmissionCurve")) {
+ retinex.transmissionCurve = keyFile.get_double_list ("Retinex", "TransmissionCurve");
+ avoidEmptyCurve (retinex.transmissionCurve);
+
if (pedited) {
pedited->retinex.transmissionCurve = true;
}
}
- if (keyFile.has_key ("Retinex", "GainTransmissionCurve")) {
- retinex.gaintransmissionCurve = keyFile.get_double_list ("Retinex", "GainTransmissionCurve");
- avoidEmptyCurve(retinex.gaintransmissionCurve);
+ if (keyFile.has_key ("Retinex", "GainTransmissionCurve")) {
+ retinex.gaintransmissionCurve = keyFile.get_double_list ("Retinex", "GainTransmissionCurve");
+ avoidEmptyCurve (retinex.gaintransmissionCurve);
+
if (pedited) {
pedited->retinex.gaintransmissionCurve = true;
}
@@ -4334,18 +4398,18 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- // load luma curve
+// load luma curve
if (keyFile.has_group ("Luminance Curve")) {
- if (keyFile.has_key ("Luminance Curve", "Brightness")) {
- labCurve.brightness = keyFile.get_integer ("Luminance Curve", "Brightness");
+ if (keyFile.has_key ("Luminance Curve", "Brightness")) {
+ labCurve.brightness = keyFile.get_integer ("Luminance Curve", "Brightness");
if (pedited) {
pedited->labCurve.brightness = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "Contrast")) {
- labCurve.contrast = keyFile.get_integer ("Luminance Curve", "Contrast");
+ if (keyFile.has_key ("Luminance Curve", "Contrast")) {
+ labCurve.contrast = keyFile.get_integer ("Luminance Curve", "Contrast");
if (pedited) {
pedited->labCurve.contrast = true;
@@ -4353,18 +4417,18 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion < 303) {
- // transform Saturation into Chromaticity
- // if Saturation == 0, should we set BWToning on?
- if (keyFile.has_key ("Luminance Curve", "Saturation")) {
- labCurve.chromaticity = keyFile.get_integer ("Luminance Curve", "Saturation");
+// transform Saturation into Chromaticity
+// if Saturation == 0, should we set BWToning on?
+ if (keyFile.has_key ("Luminance Curve", "Saturation")) {
+ labCurve.chromaticity = keyFile.get_integer ("Luminance Curve", "Saturation");
if (pedited) {
pedited->labCurve.chromaticity = true;
}
}
- // transform AvoidColorClipping into AvoidColorShift
- if (keyFile.has_key ("Luminance Curve", "AvoidColorClipping")) {
+// transform AvoidColorClipping into AvoidColorShift
+ if (keyFile.has_key ("Luminance Curve", "AvoidColorClipping")) {
labCurve.avoidcolorshift = keyFile.get_boolean ("Luminance Curve", "AvoidColorClipping");
if (pedited) {
@@ -4372,10 +4436,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
} else {
- if (keyFile.has_key ("Luminance Curve", "Chromaticity")) {
- labCurve.chromaticity = keyFile.get_integer ("Luminance Curve", "Chromaticity");
+ if (keyFile.has_key ("Luminance Curve", "Chromaticity")) {
+ labCurve.chromaticity = keyFile.get_integer ("Luminance Curve", "Chromaticity");
- if (ppVersion >= 303 && ppVersion < 314 && labCurve.chromaticity == -100) {
+ if (ppVersion >= 303 && ppVersion < 314 && labCurve.chromaticity == -100) {
blackwhite.enabled = true;
}
@@ -4384,7 +4448,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Luminance Curve", "AvoidColorShift")) {
+ if (keyFile.has_key ("Luminance Curve", "AvoidColorShift")) {
labCurve.avoidcolorshift = keyFile.get_boolean ("Luminance Curve", "AvoidColorShift");
if (pedited) {
@@ -4393,7 +4457,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Luminance Curve", "RedAndSkinTonesProtection")) {
- labCurve.rstprotection = keyFile.get_double ("Luminance Curve", "RedAndSkinTonesProtection");
+ labCurve.rstprotection = keyFile.get_double ("Luminance Curve", "RedAndSkinTonesProtection");
if (pedited) {
pedited->labCurve.rstprotection = true;
@@ -4401,8 +4465,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Luminance Curve", "LCredsk")) {
- labCurve.lcredsk = keyFile.get_boolean ("Luminance Curve", "LCredsk");
+ if (keyFile.has_key ("Luminance Curve", "LCredsk")) {
+ labCurve.lcredsk = keyFile.get_boolean ("Luminance Curve", "LCredsk");
if (pedited) {
pedited->labCurve.lcredsk = true;
@@ -4411,10 +4475,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (ppVersion < 314)
- // Backward compatibility: If BWtoning is true, Chromaticity has to be set to -100, which will produce the same effect
- // and will enable the b&w toning mode ('a' & 'b' curves)
+// Backward compatibility: If BWtoning is true, Chromaticity has to be set to -100, which will produce the same effect
+// and will enable the b&w toning mode ('a' & 'b' curves)
if (keyFile.has_key ("Luminance Curve", "BWtoning")) {
- if ( keyFile.get_boolean ("Luminance Curve", "BWtoning")) {
+ if ( keyFile.get_boolean ("Luminance Curve", "BWtoning")) {
labCurve.chromaticity = -100;
if (pedited) {
@@ -4423,73 +4487,82 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Luminance Curve", "LCurve")) {
- labCurve.lcurve = keyFile.get_double_list ("Luminance Curve", "LCurve");
- avoidEmptyCurve(labCurve.lcurve);
+ if (keyFile.has_key ("Luminance Curve", "LCurve")) {
+ labCurve.lcurve = keyFile.get_double_list ("Luminance Curve", "LCurve");
+ avoidEmptyCurve (labCurve.lcurve);
+
if (pedited) {
pedited->labCurve.lcurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "aCurve")) {
- labCurve.acurve = keyFile.get_double_list ("Luminance Curve", "aCurve");
- avoidEmptyCurve(labCurve.acurve);
+ if (keyFile.has_key ("Luminance Curve", "aCurve")) {
+ labCurve.acurve = keyFile.get_double_list ("Luminance Curve", "aCurve");
+ avoidEmptyCurve (labCurve.acurve);
+
if (pedited) {
pedited->labCurve.acurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "bCurve")) {
- labCurve.bcurve = keyFile.get_double_list ("Luminance Curve", "bCurve");
- avoidEmptyCurve(labCurve.bcurve);
+ if (keyFile.has_key ("Luminance Curve", "bCurve")) {
+ labCurve.bcurve = keyFile.get_double_list ("Luminance Curve", "bCurve");
+ avoidEmptyCurve (labCurve.bcurve);
+
if (pedited) {
pedited->labCurve.bcurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "ccCurve")) {
- labCurve.cccurve = keyFile.get_double_list ("Luminance Curve", "ccCurve");
- avoidEmptyCurve(labCurve.cccurve);
+ if (keyFile.has_key ("Luminance Curve", "ccCurve")) {
+ labCurve.cccurve = keyFile.get_double_list ("Luminance Curve", "ccCurve");
+ avoidEmptyCurve (labCurve.cccurve);
+
if (pedited) {
pedited->labCurve.cccurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "chCurve")) {
- labCurve.chcurve = keyFile.get_double_list ("Luminance Curve", "chCurve");
- avoidEmptyCurve(labCurve.chcurve);
+ if (keyFile.has_key ("Luminance Curve", "chCurve")) {
+ labCurve.chcurve = keyFile.get_double_list ("Luminance Curve", "chCurve");
+ avoidEmptyCurve (labCurve.chcurve);
+
if (pedited) {
pedited->labCurve.chcurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "lhCurve")) {
- labCurve.lhcurve = keyFile.get_double_list ("Luminance Curve", "lhCurve");
- avoidEmptyCurve(labCurve.lhcurve);
+ if (keyFile.has_key ("Luminance Curve", "lhCurve")) {
+ labCurve.lhcurve = keyFile.get_double_list ("Luminance Curve", "lhCurve");
+ avoidEmptyCurve (labCurve.lhcurve);
+
if (pedited) {
pedited->labCurve.lhcurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "hhCurve")) {
- labCurve.hhcurve = keyFile.get_double_list ("Luminance Curve", "hhCurve");
- avoidEmptyCurve(labCurve.hhcurve);
+ if (keyFile.has_key ("Luminance Curve", "hhCurve")) {
+ labCurve.hhcurve = keyFile.get_double_list ("Luminance Curve", "hhCurve");
+ avoidEmptyCurve (labCurve.hhcurve);
+
if (pedited) {
pedited->labCurve.hhcurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "LcCurve")) {
- labCurve.lccurve = keyFile.get_double_list ("Luminance Curve", "LcCurve");
- avoidEmptyCurve(labCurve.lccurve);
+ if (keyFile.has_key ("Luminance Curve", "LcCurve")) {
+ labCurve.lccurve = keyFile.get_double_list ("Luminance Curve", "LcCurve");
+ avoidEmptyCurve (labCurve.lccurve);
+
if (pedited) {
pedited->labCurve.lccurve = true;
}
}
- if (keyFile.has_key ("Luminance Curve", "ClCurve")) {
- labCurve.clcurve = keyFile.get_double_list ("Luminance Curve", "ClCurve");
- avoidEmptyCurve(labCurve.clcurve);
+ if (keyFile.has_key ("Luminance Curve", "ClCurve")) {
+ labCurve.clcurve = keyFile.get_double_list ("Luminance Curve", "ClCurve");
+ avoidEmptyCurve (labCurve.clcurve);
+
if (pedited) {
pedited->labCurve.clcurve = true;
}
@@ -4497,40 +4570,41 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- // load sharpening
+// load sharpening
if (keyFile.has_group ("Sharpening")) {
- if (keyFile.has_key ("Sharpening", "Enabled")) {
- sharpening.enabled = keyFile.get_boolean ("Sharpening", "Enabled");
+ if (keyFile.has_key ("Sharpening", "Enabled")) {
+ sharpening.enabled = keyFile.get_boolean ("Sharpening", "Enabled");
if (pedited) {
pedited->sharpening.enabled = true;
}
}
- if (keyFile.has_key ("Sharpening", "Radius")) {
- sharpening.radius = keyFile.get_double ("Sharpening", "Radius");
+ if (keyFile.has_key ("Sharpening", "Radius")) {
+ sharpening.radius = keyFile.get_double ("Sharpening", "Radius");
if (pedited) {
pedited->sharpening.radius = true;
}
}
- if (keyFile.has_key ("Sharpening", "Amount")) {
- sharpening.amount = keyFile.get_integer ("Sharpening", "Amount");
+ if (keyFile.has_key ("Sharpening", "Amount")) {
+ sharpening.amount = keyFile.get_integer ("Sharpening", "Amount");
if (pedited) {
pedited->sharpening.amount = true;
}
}
- if (keyFile.has_key ("Sharpening", "Threshold")) {
+ if (keyFile.has_key ("Sharpening", "Threshold")) {
if (ppVersion < 302) {
- int thresh = min(keyFile.get_integer ("Sharpening", "Threshold"), 2000);
- sharpening.threshold.setValues(thresh, thresh, 2000, 2000); // TODO: 2000 is the maximum value and is taken of rtgui/sharpening.cc ; should be changed by the tool modularization
+ int thresh = min (keyFile.get_integer ("Sharpening", "Threshold"), 2000);
+ sharpening.threshold.setValues (thresh, thresh, 2000, 2000); // TODO: 2000 is the maximum value and is taken of rtgui/sharpening.cc ; should be changed by the tool modularization
} else {
const std::vector thresh = keyFile.get_integer_list ("Sharpening", "Threshold");
- if(thresh.size() >= 4) {
- sharpening.threshold.setValues(thresh[0], thresh[1], min(thresh[2], 2000), min(thresh[3], 2000));
+
+ if (thresh.size() >= 4) {
+ sharpening.threshold.setValues (thresh[0], thresh[1], min (thresh[2], 2000), min (thresh[3], 2000));
}
}
@@ -4539,39 +4613,39 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Sharpening", "OnlyEdges")) {
- sharpening.edgesonly = keyFile.get_boolean ("Sharpening", "OnlyEdges");
+ if (keyFile.has_key ("Sharpening", "OnlyEdges")) {
+ sharpening.edgesonly = keyFile.get_boolean ("Sharpening", "OnlyEdges");
if (pedited) {
pedited->sharpening.edgesonly = true;
}
}
- if (keyFile.has_key ("Sharpening", "EdgedetectionRadius")) {
- sharpening.edges_radius = keyFile.get_double ("Sharpening", "EdgedetectionRadius");
+ if (keyFile.has_key ("Sharpening", "EdgedetectionRadius")) {
+ sharpening.edges_radius = keyFile.get_double ("Sharpening", "EdgedetectionRadius");
if (pedited) {
pedited->sharpening.edges_radius = true;
}
}
- if (keyFile.has_key ("Sharpening", "EdgeTolerance")) {
- sharpening.edges_tolerance = keyFile.get_integer ("Sharpening", "EdgeTolerance");
+ if (keyFile.has_key ("Sharpening", "EdgeTolerance")) {
+ sharpening.edges_tolerance = keyFile.get_integer ("Sharpening", "EdgeTolerance");
if (pedited) {
pedited->sharpening.edges_tolerance = true;
}
}
- if (keyFile.has_key ("Sharpening", "HalocontrolEnabled")) {
- sharpening.halocontrol = keyFile.get_boolean ("Sharpening", "HalocontrolEnabled");
+ if (keyFile.has_key ("Sharpening", "HalocontrolEnabled")) {
+ sharpening.halocontrol = keyFile.get_boolean ("Sharpening", "HalocontrolEnabled");
if (pedited) {
pedited->sharpening.halocontrol = true;
}
}
- if (keyFile.has_key ("Sharpening", "HalocontrolAmount")) {
+ if (keyFile.has_key ("Sharpening", "HalocontrolAmount")) {
sharpening.halocontrol_amount = keyFile.get_integer ("Sharpening", "HalocontrolAmount");
if (pedited) {
@@ -4579,40 +4653,40 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Sharpening", "Method")) {
- sharpening.method = keyFile.get_string ("Sharpening", "Method");
+ if (keyFile.has_key ("Sharpening", "Method")) {
+ sharpening.method = keyFile.get_string ("Sharpening", "Method");
if (pedited) {
pedited->sharpening.method = true;
}
}
- if (keyFile.has_key ("Sharpening", "DeconvRadius")) {
- sharpening.deconvradius = keyFile.get_double ("Sharpening", "DeconvRadius");
+ if (keyFile.has_key ("Sharpening", "DeconvRadius")) {
+ sharpening.deconvradius = keyFile.get_double ("Sharpening", "DeconvRadius");
if (pedited) {
pedited->sharpening.deconvradius = true;
}
}
- if (keyFile.has_key ("Sharpening", "DeconvAmount")) {
- sharpening.deconvamount = keyFile.get_integer ("Sharpening", "DeconvAmount");
+ if (keyFile.has_key ("Sharpening", "DeconvAmount")) {
+ sharpening.deconvamount = keyFile.get_integer ("Sharpening", "DeconvAmount");
if (pedited) {
pedited->sharpening.deconvamount = true;
}
}
- if (keyFile.has_key ("Sharpening", "DeconvDamping")) {
- sharpening.deconvdamping = keyFile.get_integer ("Sharpening", "DeconvDamping");
+ if (keyFile.has_key ("Sharpening", "DeconvDamping")) {
+ sharpening.deconvdamping = keyFile.get_integer ("Sharpening", "DeconvDamping");
if (pedited) {
pedited->sharpening.deconvdamping = true;
}
}
- if (keyFile.has_key ("Sharpening", "DeconvIterations")) {
- sharpening.deconviter = keyFile.get_integer ("Sharpening", "DeconvIterations");
+ if (keyFile.has_key ("Sharpening", "DeconvIterations")) {
+ sharpening.deconviter = keyFile.get_integer ("Sharpening", "DeconvIterations");
if (pedited) {
pedited->sharpening.deconviter = true;
@@ -4620,34 +4694,34 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load edge sharpening
+// load edge sharpening
if (keyFile.has_group ("SharpenEdge")) {
- if (keyFile.has_key ("SharpenEdge", "Enabled")) {
- sharpenEdge.enabled = keyFile.get_boolean ("SharpenEdge", "Enabled");
+ if (keyFile.has_key ("SharpenEdge", "Enabled")) {
+ sharpenEdge.enabled = keyFile.get_boolean ("SharpenEdge", "Enabled");
if (pedited) {
pedited->sharpenEdge.enabled = true;
}
}
- if (keyFile.has_key ("SharpenEdge", "Passes")) {
- sharpenEdge.passes = keyFile.get_integer ("SharpenEdge", "Passes");
+ if (keyFile.has_key ("SharpenEdge", "Passes")) {
+ sharpenEdge.passes = keyFile.get_integer ("SharpenEdge", "Passes");
if (pedited) {
pedited->sharpenEdge.passes = true;
}
}
- if (keyFile.has_key ("SharpenEdge", "Strength")) {
- sharpenEdge.amount = keyFile.get_double ("SharpenEdge", "Strength");
+ if (keyFile.has_key ("SharpenEdge", "Strength")) {
+ sharpenEdge.amount = keyFile.get_double ("SharpenEdge", "Strength");
if (pedited) {
pedited->sharpenEdge.amount = true;
}
}
- if (keyFile.has_key ("SharpenEdge", "ThreeChannels")) {
- sharpenEdge.threechannels = keyFile.get_boolean ("SharpenEdge", "ThreeChannels");
+ if (keyFile.has_key ("SharpenEdge", "ThreeChannels")) {
+ sharpenEdge.threechannels = keyFile.get_boolean ("SharpenEdge", "ThreeChannels");
if (pedited) {
pedited->sharpenEdge.threechannels = true;
@@ -4655,34 +4729,34 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load micro-contrast sharpening
+// load micro-contrast sharpening
if (keyFile.has_group ("SharpenMicro")) {
- if (keyFile.has_key ("SharpenMicro", "Enabled")) {
- sharpenMicro.enabled = keyFile.get_boolean ("SharpenMicro", "Enabled");
+ if (keyFile.has_key ("SharpenMicro", "Enabled")) {
+ sharpenMicro.enabled = keyFile.get_boolean ("SharpenMicro", "Enabled");
if (pedited) {
pedited->sharpenMicro.enabled = true;
}
}
- if (keyFile.has_key ("SharpenMicro", "Matrix")) {
- sharpenMicro.matrix = keyFile.get_boolean ("SharpenMicro", "Matrix");
+ if (keyFile.has_key ("SharpenMicro", "Matrix")) {
+ sharpenMicro.matrix = keyFile.get_boolean ("SharpenMicro", "Matrix");
if (pedited) {
pedited->sharpenMicro.matrix = true;
}
}
- if (keyFile.has_key ("SharpenMicro", "Strength")) {
- sharpenMicro.amount = keyFile.get_double ("SharpenMicro", "Strength");
+ if (keyFile.has_key ("SharpenMicro", "Strength")) {
+ sharpenMicro.amount = keyFile.get_double ("SharpenMicro", "Strength");
if (pedited) {
pedited->sharpenMicro.amount = true;
}
}
- if (keyFile.has_key ("SharpenMicro", "Uniformity")) {
- sharpenMicro.uniformity = keyFile.get_double ("SharpenMicro", "Uniformity");
+ if (keyFile.has_key ("SharpenMicro", "Uniformity")) {
+ sharpenMicro.uniformity = keyFile.get_double ("SharpenMicro", "Uniformity");
if (pedited) {
pedited->sharpenMicro.uniformity = true;
@@ -4690,40 +4764,41 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load vibrance
+// load vibrance
if (keyFile.has_group ("Vibrance")) {
- if (keyFile.has_key ("Vibrance", "Enabled")) {
- vibrance.enabled = keyFile.get_boolean ("Vibrance", "Enabled");
+ if (keyFile.has_key ("Vibrance", "Enabled")) {
+ vibrance.enabled = keyFile.get_boolean ("Vibrance", "Enabled");
if (pedited) {
pedited->vibrance.enabled = true;
}
}
- if (keyFile.has_key ("Vibrance", "Pastels")) {
- vibrance.pastels = keyFile.get_integer ("Vibrance", "Pastels");
+ if (keyFile.has_key ("Vibrance", "Pastels")) {
+ vibrance.pastels = keyFile.get_integer ("Vibrance", "Pastels");
if (pedited) {
pedited->vibrance.pastels = true;
}
}
- if (keyFile.has_key ("Vibrance", "Saturated")) {
- vibrance.saturated = keyFile.get_integer ("Vibrance", "Saturated");
+ if (keyFile.has_key ("Vibrance", "Saturated")) {
+ vibrance.saturated = keyFile.get_integer ("Vibrance", "Saturated");
if (pedited) {
pedited->vibrance.saturated = true;
}
}
- if (keyFile.has_key ("Vibrance", "PSThreshold")) {
+ if (keyFile.has_key ("Vibrance", "PSThreshold")) {
if (ppVersion < 302) {
int thresh = keyFile.get_integer ("Vibrance", "PSThreshold");
- vibrance.psthreshold.setValues(thresh, thresh);
+ vibrance.psthreshold.setValues (thresh, thresh);
} else {
const std::vector thresh = keyFile.get_integer_list ("Vibrance", "PSThreshold");
- if(thresh.size() >= 2 ) {
- vibrance.psthreshold.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2 ) {
+ vibrance.psthreshold.setValues (thresh[0], thresh[1]);
}
}
@@ -4732,33 +4807,34 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Vibrance", "ProtectSkins")) {
- vibrance.protectskins = keyFile.get_boolean ("Vibrance", "ProtectSkins");
+ if (keyFile.has_key ("Vibrance", "ProtectSkins")) {
+ vibrance.protectskins = keyFile.get_boolean ("Vibrance", "ProtectSkins");
if (pedited) {
pedited->vibrance.protectskins = true;
}
}
- if (keyFile.has_key ("Vibrance", "AvoidColorShift")) {
- vibrance.avoidcolorshift = keyFile.get_boolean ("Vibrance", "AvoidColorShift");
+ if (keyFile.has_key ("Vibrance", "AvoidColorShift")) {
+ vibrance.avoidcolorshift = keyFile.get_boolean ("Vibrance", "AvoidColorShift");
if (pedited) {
pedited->vibrance.avoidcolorshift = true;
}
}
- if (keyFile.has_key ("Vibrance", "PastSatTog")) {
- vibrance.pastsattog = keyFile.get_boolean ("Vibrance", "PastSatTog");
+ if (keyFile.has_key ("Vibrance", "PastSatTog")) {
+ vibrance.pastsattog = keyFile.get_boolean ("Vibrance", "PastSatTog");
if (pedited) {
pedited->vibrance.pastsattog = true;
}
}
- if (keyFile.has_key ("Vibrance", "SkinTonesCurve")) {
- vibrance.skintonescurve = keyFile.get_double_list ("Vibrance", "SkinTonesCurve");
- avoidEmptyCurve(vibrance.skintonescurve);
+ if (keyFile.has_key ("Vibrance", "SkinTonesCurve")) {
+ vibrance.skintonescurve = keyFile.get_double_list ("Vibrance", "SkinTonesCurve");
+ avoidEmptyCurve (vibrance.skintonescurve);
+
if (pedited) {
pedited->vibrance.skintonescurve = true;
}
@@ -4782,8 +4858,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load wb
if (keyFile.has_group ("White Balance")) {
- if (keyFile.has_key ("White Balance", "Setting")) {
- wb.method = keyFile.get_string ("White Balance", "Setting");
+ if (keyFile.has_key ("White Balance", "Setting")) {
+ wb.method = keyFile.get_string ("White Balance", "Setting");
if (pedited) {
pedited->wb.method = true;
@@ -4791,30 +4867,30 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("White Balance", "Temperature")) {
- wb.temperature = keyFile.get_integer ("White Balance", "Temperature");
+ wb.temperature = keyFile.get_integer ("White Balance", "Temperature");
if (pedited) {
pedited->wb.temperature = true;
}
}
- if (keyFile.has_key ("White Balance", "Green")) {
- wb.green = keyFile.get_double ("White Balance", "Green");
+ if (keyFile.has_key ("White Balance", "Green")) {
+ wb.green = keyFile.get_double ("White Balance", "Green");
if (pedited) {
pedited->wb.green = true;
}
}
- if (keyFile.has_key ("White Balance", "Equal")) {
- wb.equal = keyFile.get_double ("White Balance", "Equal");
+ if (keyFile.has_key ("White Balance", "Equal")) {
+ wb.equal = keyFile.get_double ("White Balance", "Equal");
if (pedited) {
pedited->wb.equal = true;
}
}
- if (keyFile.has_key ("White Balance", "TemperatureBias")) {
+ if (keyFile.has_key ("White Balance", "TemperatureBias")) {
wb.tempBias = keyFile.get_double ("White Balance", "TemperatureBias");
if (pedited) {
@@ -4831,23 +4907,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load defringe
if (keyFile.has_group ("Defringing")) {
- if (keyFile.has_key ("Defringing", "Enabled")) {
- defringe.enabled = keyFile.get_boolean ("Defringing", "Enabled");
+ if (keyFile.has_key ("Defringing", "Enabled")) {
+ defringe.enabled = keyFile.get_boolean ("Defringing", "Enabled");
if (pedited) {
pedited->defringe.enabled = true;
}
}
- if (keyFile.has_key ("Defringing", "Radius")) {
- defringe.radius = keyFile.get_double ("Defringing", "Radius");
+ if (keyFile.has_key ("Defringing", "Radius")) {
+ defringe.radius = keyFile.get_double ("Defringing", "Radius");
if (pedited) {
pedited->defringe.radius = true;
}
}
- if (keyFile.has_key ("Defringing", "Threshold")) {
+ if (keyFile.has_key ("Defringing", "Threshold")) {
defringe.threshold = (float)keyFile.get_integer ("Defringing", "Threshold");
if (pedited) {
@@ -4856,119 +4932,120 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion < 310) {
- defringe.threshold = sqrt(defringe.threshold * 33.f / 5.f);
+ defringe.threshold = sqrt (defringe.threshold * 33.f / 5.f);
}
- if (keyFile.has_key ("Defringing", "HueCurve")) {
- defringe.huecurve = keyFile.get_double_list ("Defringing", "HueCurve");
- avoidEmptyCurve(defringe.huecurve);
+ if (keyFile.has_key ("Defringing", "HueCurve")) {
+ defringe.huecurve = keyFile.get_double_list ("Defringing", "HueCurve");
+ avoidEmptyCurve (defringe.huecurve);
+
if (pedited) {
pedited->defringe.huecurve = true;
}
}
}
- // load colorappearance
+// load colorappearance
if (keyFile.has_group ("Color appearance")) {
- if (keyFile.has_key ("Color appearance", "Enabled")) {
- colorappearance.enabled = keyFile.get_boolean ("Color appearance", "Enabled");
+ if (keyFile.has_key ("Color appearance", "Enabled")) {
+ colorappearance.enabled = keyFile.get_boolean ("Color appearance", "Enabled");
if (pedited) {
pedited->colorappearance.enabled = true;
}
}
- if (keyFile.has_key ("Color appearance", "Degree")) {
- colorappearance.degree = keyFile.get_integer ("Color appearance", "Degree");
+ if (keyFile.has_key ("Color appearance", "Degree")) {
+ colorappearance.degree = keyFile.get_integer ("Color appearance", "Degree");
if (pedited) {
pedited->colorappearance.degree = true;
}
}
- if (keyFile.has_key ("Color appearance", "AutoDegree")) {
- colorappearance.autodegree = keyFile.get_boolean ("Color appearance", "AutoDegree");
+ if (keyFile.has_key ("Color appearance", "AutoDegree")) {
+ colorappearance.autodegree = keyFile.get_boolean ("Color appearance", "AutoDegree");
if (pedited) {
pedited->colorappearance.autodegree = true;
}
}
- if (keyFile.has_key ("Color appearance", "Surround")) {
- colorappearance.surround = keyFile.get_string ("Color appearance", "Surround");
+ if (keyFile.has_key ("Color appearance", "Surround")) {
+ colorappearance.surround = keyFile.get_string ("Color appearance", "Surround");
if (pedited) {
pedited->colorappearance.surround = true;
}
}
-// if (keyFile.has_key ("Color appearance", "Background")) {colorappearance.backgrd = keyFile.get_integer ("Color appearance", "Background"); if (pedited) pedited->colorappearance.backgrd = true; }
- if (keyFile.has_key ("Color appearance", "AdaptLum")) {
- colorappearance.adaplum = keyFile.get_double ("Color appearance", "AdaptLum");
+// if (keyFile.has_key ("Color appearance", "Background")) {colorappearance.backgrd = keyFile.get_integer ("Color appearance", "Background"); if (pedited) pedited->colorappearance.backgrd = true; }
+ if (keyFile.has_key ("Color appearance", "AdaptLum")) {
+ colorappearance.adaplum = keyFile.get_double ("Color appearance", "AdaptLum");
if (pedited) {
pedited->colorappearance.adaplum = true;
}
}
- if (keyFile.has_key ("Color appearance", "Badpixsl")) {
- colorappearance.badpixsl = keyFile.get_integer ("Color appearance", "Badpixsl");
+ if (keyFile.has_key ("Color appearance", "Badpixsl")) {
+ colorappearance.badpixsl = keyFile.get_integer ("Color appearance", "Badpixsl");
if (pedited) {
pedited->colorappearance.badpixsl = true;
}
}
- if (keyFile.has_key ("Color appearance", "Model")) {
- colorappearance.wbmodel = keyFile.get_string ("Color appearance", "Model");
+ if (keyFile.has_key ("Color appearance", "Model")) {
+ colorappearance.wbmodel = keyFile.get_string ("Color appearance", "Model");
if (pedited) {
pedited->colorappearance.wbmodel = true;
}
}
- if (keyFile.has_key ("Color appearance", "Algorithm")) {
- colorappearance.algo = keyFile.get_string ("Color appearance", "Algorithm");
+ if (keyFile.has_key ("Color appearance", "Algorithm")) {
+ colorappearance.algo = keyFile.get_string ("Color appearance", "Algorithm");
if (pedited) {
pedited->colorappearance.algo = true;
}
}
- if (keyFile.has_key ("Color appearance", "J-Light")) {
- colorappearance.jlight = keyFile.get_double ("Color appearance", "J-Light");
+ if (keyFile.has_key ("Color appearance", "J-Light")) {
+ colorappearance.jlight = keyFile.get_double ("Color appearance", "J-Light");
if (pedited) {
pedited->colorappearance.jlight = true;
}
}
- if (keyFile.has_key ("Color appearance", "Q-Bright")) {
- colorappearance.qbright = keyFile.get_double ("Color appearance", "Q-Bright");
+ if (keyFile.has_key ("Color appearance", "Q-Bright")) {
+ colorappearance.qbright = keyFile.get_double ("Color appearance", "Q-Bright");
if (pedited) {
pedited->colorappearance.qbright = true;
}
}
- if (keyFile.has_key ("Color appearance", "C-Chroma")) {
- colorappearance.chroma = keyFile.get_double ("Color appearance", "C-Chroma");
+ if (keyFile.has_key ("Color appearance", "C-Chroma")) {
+ colorappearance.chroma = keyFile.get_double ("Color appearance", "C-Chroma");
if (pedited) {
pedited->colorappearance.chroma = true;
}
}
- if (keyFile.has_key ("Color appearance", "S-Chroma")) {
- colorappearance.schroma = keyFile.get_double ("Color appearance", "S-Chroma");
+ if (keyFile.has_key ("Color appearance", "S-Chroma")) {
+ colorappearance.schroma = keyFile.get_double ("Color appearance", "S-Chroma");
if (pedited) {
pedited->colorappearance.schroma = true;
}
}
- if (keyFile.has_key ("Color appearance", "M-Chroma")) {
- colorappearance.mchroma = keyFile.get_double ("Color appearance", "M-Chroma");
+ if (keyFile.has_key ("Color appearance", "M-Chroma")) {
+ colorappearance.mchroma = keyFile.get_double ("Color appearance", "M-Chroma");
if (pedited) {
pedited->colorappearance.mchroma = true;
@@ -4976,91 +5053,115 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Color appearance", "RSTProtection")) {
- colorappearance.rstprotection = keyFile.get_double ("Color appearance", "RSTProtection");
+ colorappearance.rstprotection = keyFile.get_double ("Color appearance", "RSTProtection");
if (pedited) {
pedited->colorappearance.rstprotection = true;
}
}
- if (keyFile.has_key ("Color appearance", "J-Contrast")) {
- colorappearance.contrast = keyFile.get_double ("Color appearance", "J-Contrast");
+ if (keyFile.has_key ("Color appearance", "J-Contrast")) {
+ colorappearance.contrast = keyFile.get_double ("Color appearance", "J-Contrast");
if (pedited) {
pedited->colorappearance.contrast = true;
}
}
- if (keyFile.has_key ("Color appearance", "Q-Contrast")) {
- colorappearance.qcontrast = keyFile.get_double ("Color appearance", "Q-Contrast");
+ if (keyFile.has_key ("Color appearance", "Q-Contrast")) {
+ colorappearance.qcontrast = keyFile.get_double ("Color appearance", "Q-Contrast");
if (pedited) {
pedited->colorappearance.qcontrast = true;
}
}
- if (keyFile.has_key ("Color appearance", "H-Hue")) {
- colorappearance.colorh = keyFile.get_double ("Color appearance", "H-Hue");
+ if (keyFile.has_key ("Color appearance", "H-Hue")) {
+ colorappearance.colorh = keyFile.get_double ("Color appearance", "H-Hue");
if (pedited) {
pedited->colorappearance.colorh = true;
}
}
- if (keyFile.has_key ("Color appearance", "AdaptScene")) {
- colorappearance.adapscen = keyFile.get_double ("Color appearance", "AdaptScene");
+ if (keyFile.has_key ("Color appearance", "AdaptScene")) {
+ colorappearance.adapscen = keyFile.get_double ("Color appearance", "AdaptScene");
if (pedited) {
pedited->colorappearance.adapscen = true;
}
}
- if (keyFile.has_key ("Color appearance", "AutoAdapscen")) {
- colorappearance.autoadapscen = keyFile.get_boolean ("Color appearance", "AutoAdapscen");
+ if (keyFile.has_key ("Color appearance", "AutoAdapscen")) {
+ colorappearance.autoadapscen = keyFile.get_boolean ("Color appearance", "AutoAdapscen");
if (pedited) {
pedited->colorappearance.autoadapscen = true;
}
}
- if (keyFile.has_key ("Color appearance", "SurrSource")) {
- colorappearance.surrsource = keyFile.get_boolean ("Color appearance", "SurrSource");
+ if (keyFile.has_key ("Color appearance", "SurrSource")) {
+ colorappearance.surrsource = keyFile.get_boolean ("Color appearance", "SurrSource");
if (pedited) {
pedited->colorappearance.surrsource = true;
}
}
- if (keyFile.has_key ("Color appearance", "Gamut")) {
- colorappearance.gamut = keyFile.get_boolean ("Color appearance", "Gamut");
+ if (keyFile.has_key ("Color appearance", "Gamut")) {
+ colorappearance.gamut = keyFile.get_boolean ("Color appearance", "Gamut");
if (pedited) {
pedited->colorappearance.gamut = true;
}
}
-// if (keyFile.has_key ("Color appearance", "Badpix")) {colorappearance.badpix = keyFile.get_boolean ("Color appearance", "Badpix"); if (pedited) pedited->colorappearance.badpix = true; }
- if (keyFile.has_key ("Color appearance", "Datacie")) {
- colorappearance.datacie = keyFile.get_boolean ("Color appearance", "Datacie");
+ if (keyFile.has_key ("Color appearance", "Tempout")) {
+ colorappearance.tempout = keyFile.get_integer ("Color appearance", "Tempout");
+
+ if (pedited) {
+ pedited->colorappearance.tempout = true;
+ }
+ }
+
+ if (keyFile.has_key ("Color appearance", "Greenout")) {
+ colorappearance.greenout = keyFile.get_double ("Color appearance", "Greenout");
+
+ if (pedited) {
+ pedited->colorappearance.greenout = true;
+ }
+ }
+
+ if (keyFile.has_key ("Color appearance", "Ybout")) {
+ colorappearance.ybout = keyFile.get_integer ("Color appearance", "Ybout");
+
+ if (pedited) {
+ pedited->colorappearance.ybout = true;
+ }
+ }
+
+// if (keyFile.has_key ("Color appearance", "Badpix")) {colorappearance.badpix = keyFile.get_boolean ("Color appearance", "Badpix"); if (pedited) pedited->colorappearance.badpix = true; }
+ if (keyFile.has_key ("Color appearance", "Datacie")) {
+ colorappearance.datacie = keyFile.get_boolean ("Color appearance", "Datacie");
if (pedited) {
pedited->colorappearance.datacie = true;
}
}
- if (keyFile.has_key ("Color appearance", "Tonecie")) {
- colorappearance.tonecie = keyFile.get_boolean ("Color appearance", "Tonecie");
+ if (keyFile.has_key ("Color appearance", "Tonecie")) {
+ colorappearance.tonecie = keyFile.get_boolean ("Color appearance", "Tonecie");
if (pedited) {
pedited->colorappearance.tonecie = true;
}
}
-// if (keyFile.has_key ("Color appearance", "Sharpcie")) {colorappearance.sharpcie = keyFile.get_boolean ("Color appearance", "Sharpcie"); if (pedited) pedited->colorappearance.sharpcie = true; }
- if (keyFile.has_key ("Color appearance", "CurveMode")) {
+// if (keyFile.has_key ("Color appearance", "Sharpcie")) {colorappearance.sharpcie = keyFile.get_boolean ("Color appearance", "Sharpcie"); if (pedited) pedited->colorappearance.sharpcie = true; }
+ if (keyFile.has_key ("Color appearance", "CurveMode")) {
Glib::ustring sMode = keyFile.get_string ("Color appearance", "CurveMode");
- if (sMode == "Lightness") {
+ if (sMode == "Lightness") {
colorappearance.curveMode = ColorAppearanceParams::TC_MODE_LIGHT;
} else if (sMode == "Brightness") {
colorappearance.curveMode = ColorAppearanceParams::TC_MODE_BRIGHT;
@@ -5071,10 +5172,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Color appearance", "CurveMode2")) {
+ if (keyFile.has_key ("Color appearance", "CurveMode2")) {
Glib::ustring sMode = keyFile.get_string ("Color appearance", "CurveMode2");
- if (sMode == "Lightness") {
+ if (sMode == "Lightness") {
colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_LIGHT;
} else if (sMode == "Brightness") {
colorappearance.curveMode2 = ColorAppearanceParams::TC_MODE_BRIGHT;
@@ -5085,10 +5186,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Color appearance", "CurveMode3")) {
+ if (keyFile.has_key ("Color appearance", "CurveMode3")) {
Glib::ustring sMode = keyFile.get_string ("Color appearance", "CurveMode3");
- if (sMode == "Chroma") {
+ if (sMode == "Chroma") {
colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_CHROMA;
} else if (sMode == "Saturation") {
colorappearance.curveMode3 = ColorAppearanceParams::TC_MODE_SATUR;
@@ -5102,25 +5203,28 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion > 200) {
- if (keyFile.has_key ("Color appearance", "Curve")) {
- colorappearance.curve = keyFile.get_double_list ("Color appearance", "Curve");
- avoidEmptyCurve(colorappearance.curve);
+ if (keyFile.has_key ("Color appearance", "Curve")) {
+ colorappearance.curve = keyFile.get_double_list ("Color appearance", "Curve");
+ avoidEmptyCurve (colorappearance.curve);
+
if (pedited) {
pedited->colorappearance.curve = true;
}
}
- if (keyFile.has_key ("Color appearance", "Curve2")) {
- colorappearance.curve2 = keyFile.get_double_list ("Color appearance", "Curve2");
- avoidEmptyCurve(colorappearance.curve2);
+ if (keyFile.has_key ("Color appearance", "Curve2")) {
+ colorappearance.curve2 = keyFile.get_double_list ("Color appearance", "Curve2");
+ avoidEmptyCurve (colorappearance.curve2);
+
if (pedited) {
pedited->colorappearance.curve2 = true;
}
}
- if (keyFile.has_key ("Color appearance", "Curve3")) {
- colorappearance.curve3 = keyFile.get_double_list ("Color appearance", "Curve3");
- avoidEmptyCurve(colorappearance.curve3);
+ if (keyFile.has_key ("Color appearance", "Curve3")) {
+ colorappearance.curve3 = keyFile.get_double_list ("Color appearance", "Curve3");
+ avoidEmptyCurve (colorappearance.curve3);
+
if (pedited) {
pedited->colorappearance.curve3 = true;
}
@@ -5129,9 +5233,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- // load impulseDenoise
+// load impulseDenoise
if (keyFile.has_group ("Impulse Denoising")) {
- if (keyFile.has_key ("Impulse Denoising", "Enabled")) {
+ if (keyFile.has_key ("Impulse Denoising", "Enabled")) {
impulseDenoise.enabled = keyFile.get_boolean ("Impulse Denoising", "Enabled");
if (pedited) {
@@ -5140,7 +5244,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Impulse Denoising", "Threshold")) {
- impulseDenoise.thresh = keyFile.get_integer ("Impulse Denoising", "Threshold");
+ impulseDenoise.thresh = keyFile.get_integer ("Impulse Denoising", "Threshold");
if (pedited) {
pedited->impulseDenoise.thresh = true;
@@ -5148,9 +5252,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load dirpyrDenoise
+// load dirpyrDenoise
if (keyFile.has_group ("Directional Pyramid Denoising")) {//TODO: No longer an accurate description for FT denoise
- if (keyFile.has_key ("Directional Pyramid Denoising", "Enabled")) {
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Enabled")) {
dirpyrDenoise.enabled = keyFile.get_boolean ("Directional Pyramid Denoising", "Enabled");
if (pedited) {
@@ -5158,7 +5262,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Enhance")) {
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Enhance")) {
dirpyrDenoise.enhance = keyFile.get_boolean ("Directional Pyramid Denoising", "Enhance");
if (pedited) {
@@ -5166,7 +5270,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Median")) {
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Median")) {
dirpyrDenoise.median = keyFile.get_boolean ("Directional Pyramid Denoising", "Median");
if (pedited) {
@@ -5174,16 +5278,16 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
-// if (keyFile.has_key ("Directional Pyramid Denoising", "Perform")) { dirpyrDenoise.perform = keyFile.get_boolean ("Directional Pyramid Denoising", "Perform"); if (pedited) pedited->dirpyrDenoise.perform = true; }
- if (keyFile.has_key ("Directional Pyramid Denoising", "Luma")) {
- dirpyrDenoise.luma = keyFile.get_double ("Directional Pyramid Denoising", "Luma");
+// if (keyFile.has_key ("Directional Pyramid Denoising", "Perform")) { dirpyrDenoise.perform = keyFile.get_boolean ("Directional Pyramid Denoising", "Perform"); if (pedited) pedited->dirpyrDenoise.perform = true; }
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Luma")) {
+ dirpyrDenoise.luma = keyFile.get_double ("Directional Pyramid Denoising", "Luma");
if (pedited) {
pedited->dirpyrDenoise.luma = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Ldetail")) {
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Ldetail")) {
dirpyrDenoise.Ldetail = keyFile.get_double ("Directional Pyramid Denoising", "Ldetail");
if (pedited) {
@@ -5191,129 +5295,131 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Chroma")) {
- dirpyrDenoise.chroma = keyFile.get_double ("Directional Pyramid Denoising", "Chroma");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Chroma")) {
+ dirpyrDenoise.chroma = keyFile.get_double ("Directional Pyramid Denoising", "Chroma");
if (pedited) {
pedited->dirpyrDenoise.chroma = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Method")) {
- dirpyrDenoise.dmethod = keyFile.get_string ("Directional Pyramid Denoising", "Method");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Method")) {
+ dirpyrDenoise.dmethod = keyFile.get_string ("Directional Pyramid Denoising", "Method");
if (pedited) {
pedited->dirpyrDenoise.dmethod = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "LMethod")) {
- dirpyrDenoise.Lmethod = keyFile.get_string ("Directional Pyramid Denoising", "LMethod");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "LMethod")) {
+ dirpyrDenoise.Lmethod = keyFile.get_string ("Directional Pyramid Denoising", "LMethod");
if (pedited) {
pedited->dirpyrDenoise.Lmethod = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "CMethod")) {
- dirpyrDenoise.Cmethod = keyFile.get_string ("Directional Pyramid Denoising", "CMethod");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "CMethod")) {
+ dirpyrDenoise.Cmethod = keyFile.get_string ("Directional Pyramid Denoising", "CMethod");
if (pedited) {
pedited->dirpyrDenoise.Cmethod = true;
}
}
- // never load 'auto chroma preview mode' from pp3
- if(dirpyrDenoise.Cmethod == "PRE") {
+// never load 'auto chroma preview mode' from pp3
+ if (dirpyrDenoise.Cmethod == "PRE") {
dirpyrDenoise.Cmethod = "MAN";
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "C2Method")) {
- dirpyrDenoise.C2method = keyFile.get_string ("Directional Pyramid Denoising", "C2Method");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "C2Method")) {
+ dirpyrDenoise.C2method = keyFile.get_string ("Directional Pyramid Denoising", "C2Method");
if (pedited) {
pedited->dirpyrDenoise.C2method = true;
}
}
- if(dirpyrDenoise.C2method == "PREV") {
+ if (dirpyrDenoise.C2method == "PREV") {
dirpyrDenoise.C2method = "MANU";
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "SMethod")) {
- dirpyrDenoise.smethod = keyFile.get_string ("Directional Pyramid Denoising", "SMethod");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "SMethod")) {
+ dirpyrDenoise.smethod = keyFile.get_string ("Directional Pyramid Denoising", "SMethod");
if (pedited) {
pedited->dirpyrDenoise.smethod = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "MedMethod")) {
- dirpyrDenoise.medmethod = keyFile.get_string ("Directional Pyramid Denoising", "MedMethod");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "MedMethod")) {
+ dirpyrDenoise.medmethod = keyFile.get_string ("Directional Pyramid Denoising", "MedMethod");
if (pedited) {
pedited->dirpyrDenoise.medmethod = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "MethodMed")) {
- dirpyrDenoise.methodmed = keyFile.get_string ("Directional Pyramid Denoising", "MethodMed");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "MethodMed")) {
+ dirpyrDenoise.methodmed = keyFile.get_string ("Directional Pyramid Denoising", "MethodMed");
if (pedited) {
pedited->dirpyrDenoise.methodmed = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "RGBMethod")) {
- dirpyrDenoise.rgbmethod = keyFile.get_string ("Directional Pyramid Denoising", "RGBMethod");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "RGBMethod")) {
+ dirpyrDenoise.rgbmethod = keyFile.get_string ("Directional Pyramid Denoising", "RGBMethod");
if (pedited) {
pedited->dirpyrDenoise.rgbmethod = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "LCurve")) {
- dirpyrDenoise.lcurve = keyFile.get_double_list ("Directional Pyramid Denoising", "LCurve");
- avoidEmptyCurve(dirpyrDenoise.lcurve);
+ if (keyFile.has_key ("Directional Pyramid Denoising", "LCurve")) {
+ dirpyrDenoise.lcurve = keyFile.get_double_list ("Directional Pyramid Denoising", "LCurve");
+ avoidEmptyCurve (dirpyrDenoise.lcurve);
+
if (pedited) {
pedited->dirpyrDenoise.lcurve = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "CCCurve")) {
- dirpyrDenoise.cccurve = keyFile.get_double_list ("Directional Pyramid Denoising", "CCCurve");
- avoidEmptyCurve(dirpyrDenoise.cccurve);
+ if (keyFile.has_key ("Directional Pyramid Denoising", "CCCurve")) {
+ dirpyrDenoise.cccurve = keyFile.get_double_list ("Directional Pyramid Denoising", "CCCurve");
+ avoidEmptyCurve (dirpyrDenoise.cccurve);
+
if (pedited) {
pedited->dirpyrDenoise.cccurve = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Redchro")) {
- dirpyrDenoise.redchro = keyFile.get_double ("Directional Pyramid Denoising", "Redchro");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Redchro")) {
+ dirpyrDenoise.redchro = keyFile.get_double ("Directional Pyramid Denoising", "Redchro");
if (pedited) {
pedited->dirpyrDenoise.redchro = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Bluechro")) {
- dirpyrDenoise.bluechro = keyFile.get_double ("Directional Pyramid Denoising", "Bluechro");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Bluechro")) {
+ dirpyrDenoise.bluechro = keyFile.get_double ("Directional Pyramid Denoising", "Bluechro");
if (pedited) {
pedited->dirpyrDenoise.bluechro = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Gamma")) {
- dirpyrDenoise.gamma = keyFile.get_double ("Directional Pyramid Denoising", "Gamma");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Gamma")) {
+ dirpyrDenoise.gamma = keyFile.get_double ("Directional Pyramid Denoising", "Gamma");
if (pedited) {
pedited->dirpyrDenoise.gamma = true;
}
}
- if (keyFile.has_key ("Directional Pyramid Denoising", "Passes")) {
- dirpyrDenoise.passes = keyFile.get_integer ("Directional Pyramid Denoising", "Passes");
+ if (keyFile.has_key ("Directional Pyramid Denoising", "Passes")) {
+ dirpyrDenoise.passes = keyFile.get_integer ("Directional Pyramid Denoising", "Passes");
if (pedited) {
pedited->dirpyrDenoise.passes = true;
@@ -5321,9 +5427,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- //Load EPD.
+//Load EPD.
if (keyFile.has_group ("EPD")) {
- if(keyFile.has_key("EPD", "Enabled")) {
+ if (keyFile.has_key ("EPD", "Enabled")) {
epd.enabled = keyFile.get_boolean ("EPD", "Enabled");
if (pedited) {
@@ -5331,7 +5437,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key("EPD", "Strength")) {
+ if (keyFile.has_key ("EPD", "Strength")) {
epd.strength = keyFile.get_double ("EPD", "Strength");
if (pedited) {
@@ -5339,7 +5445,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key("EPD", "Gamma")) {
+ if (keyFile.has_key ("EPD", "Gamma")) {
epd.gamma = keyFile.get_double ("EPD", "Gamma");
if (pedited) {
@@ -5347,7 +5453,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key("EPD", "EdgeStopping")) {
+ if (keyFile.has_key ("EPD", "EdgeStopping")) {
epd.edgeStopping = keyFile.get_double ("EPD", "EdgeStopping");
if (pedited) {
@@ -5355,7 +5461,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key("EPD", "Scale")) {
+ if (keyFile.has_key ("EPD", "Scale")) {
epd.scale = keyFile.get_double ("EPD", "Scale");
if (pedited) {
@@ -5363,7 +5469,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key("EPD", "ReweightingIterates")) {
+ if (keyFile.has_key ("EPD", "ReweightingIterates")) {
epd.reweightingIterates = keyFile.get_integer ("EPD", "ReweightingIterates");
if (pedited) {
@@ -5389,55 +5495,55 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load sh
if (keyFile.has_group ("Shadows & Highlights")) {
- if (keyFile.has_key ("Shadows & Highlights", "Enabled")) {
- sh.enabled = keyFile.get_boolean ("Shadows & Highlights", "Enabled");
+ if (keyFile.has_key ("Shadows & Highlights", "Enabled")) {
+ sh.enabled = keyFile.get_boolean ("Shadows & Highlights", "Enabled");
if (pedited) {
pedited->sh.enabled = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "HighQuality")) {
- sh.hq = keyFile.get_boolean ("Shadows & Highlights", "HighQuality");
+ if (keyFile.has_key ("Shadows & Highlights", "HighQuality")) {
+ sh.hq = keyFile.get_boolean ("Shadows & Highlights", "HighQuality");
if (pedited) {
pedited->sh.hq = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "Highlights")) {
- sh.highlights = keyFile.get_integer ("Shadows & Highlights", "Highlights");
+ if (keyFile.has_key ("Shadows & Highlights", "Highlights")) {
+ sh.highlights = keyFile.get_integer ("Shadows & Highlights", "Highlights");
if (pedited) {
pedited->sh.highlights = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "HighlightTonalWidth")) {
- sh.htonalwidth = keyFile.get_integer ("Shadows & Highlights", "HighlightTonalWidth");
+ if (keyFile.has_key ("Shadows & Highlights", "HighlightTonalWidth")) {
+ sh.htonalwidth = keyFile.get_integer ("Shadows & Highlights", "HighlightTonalWidth");
if (pedited) {
pedited->sh.htonalwidth = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "Shadows")) {
- sh.shadows = keyFile.get_integer ("Shadows & Highlights", "Shadows");
+ if (keyFile.has_key ("Shadows & Highlights", "Shadows")) {
+ sh.shadows = keyFile.get_integer ("Shadows & Highlights", "Shadows");
if (pedited) {
pedited->sh.shadows = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "ShadowTonalWidth")) {
- sh.stonalwidth = keyFile.get_integer ("Shadows & Highlights", "ShadowTonalWidth");
+ if (keyFile.has_key ("Shadows & Highlights", "ShadowTonalWidth")) {
+ sh.stonalwidth = keyFile.get_integer ("Shadows & Highlights", "ShadowTonalWidth");
if (pedited) {
pedited->sh.stonalwidth = true;
}
}
- if (keyFile.has_key ("Shadows & Highlights", "LocalContrast")) {
+ if (keyFile.has_key ("Shadows & Highlights", "LocalContrast")) {
sh.localcontrast = keyFile.get_integer ("Shadows & Highlights", "LocalContrast");
if (pedited) {
@@ -5445,8 +5551,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Shadows & Highlights", "Radius")) {
- sh.radius = keyFile.get_integer ("Shadows & Highlights", "Radius");
+ if (keyFile.has_key ("Shadows & Highlights", "Radius")) {
+ sh.radius = keyFile.get_integer ("Shadows & Highlights", "Radius");
if (pedited) {
pedited->sh.radius = true;
@@ -5454,42 +5560,42 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load crop
+// load crop
if (keyFile.has_group ("Crop")) {
- if (keyFile.has_key ("Crop", "Enabled")) {
- crop.enabled = keyFile.get_boolean ("Crop", "Enabled");
+ if (keyFile.has_key ("Crop", "Enabled")) {
+ crop.enabled = keyFile.get_boolean ("Crop", "Enabled");
if (pedited) {
pedited->crop.enabled = true;
}
}
- if (keyFile.has_key ("Crop", "X")) {
- crop.x = keyFile.get_integer ("Crop", "X");
+ if (keyFile.has_key ("Crop", "X")) {
+ crop.x = keyFile.get_integer ("Crop", "X");
if (pedited) {
pedited->crop.x = true;
}
}
- if (keyFile.has_key ("Crop", "Y")) {
- crop.y = keyFile.get_integer ("Crop", "Y");
+ if (keyFile.has_key ("Crop", "Y")) {
+ crop.y = keyFile.get_integer ("Crop", "Y");
if (pedited) {
pedited->crop.y = true;
}
}
- if (keyFile.has_key ("Crop", "W")) {
- crop.w = std::max(keyFile.get_integer("Crop", "W"), 1);
+ if (keyFile.has_key ("Crop", "W")) {
+ crop.w = std::max (keyFile.get_integer ("Crop", "W"), 1);
if (pedited) {
pedited->crop.w = true;
}
}
- if (keyFile.has_key ("Crop", "H")) {
- crop.h = std::max(keyFile.get_integer("Crop", "H"), 1);
+ if (keyFile.has_key ("Crop", "H")) {
+ crop.h = std::max (keyFile.get_integer ("Crop", "H"), 1);
if (pedited) {
pedited->crop.h = true;
@@ -5497,7 +5603,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "FixedRatio")) {
- crop.fixratio = keyFile.get_boolean ("Crop", "FixedRatio");
+ crop.fixratio = keyFile.get_boolean ("Crop", "FixedRatio");
if (pedited) {
pedited->crop.fixratio = true;
@@ -5505,13 +5611,13 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "Ratio")) {
- crop.ratio = keyFile.get_string ("Crop", "Ratio");
+ crop.ratio = keyFile.get_string ("Crop", "Ratio");
if (pedited) {
pedited->crop.ratio = true;
}
- //backwards compatibility for crop.ratio
+//backwards compatibility for crop.ratio
if (crop.ratio == "DIN") {
crop.ratio = "1.414 - DIN EN ISO 216";
}
@@ -5525,16 +5631,16 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Crop", "Orientation")) {
- crop.orientation = keyFile.get_string ("Crop", "Orientation");
+ if (keyFile.has_key ("Crop", "Orientation")) {
+ crop.orientation = keyFile.get_string ("Crop", "Orientation");
if (pedited) {
pedited->crop.orientation = true;
}
}
- if (keyFile.has_key ("Crop", "Guide")) {
- crop.guide = keyFile.get_string ("Crop", "Guide");
+ if (keyFile.has_key ("Crop", "Guide")) {
+ crop.guide = keyFile.get_string ("Crop", "Guide");
if (pedited) {
pedited->crop.guide = true;
@@ -5542,9 +5648,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load coarse
+// load coarse
if (keyFile.has_group ("Coarse Transformation")) {
- if (keyFile.has_key ("Coarse Transformation", "Rotate")) {
+ if (keyFile.has_key ("Coarse Transformation", "Rotate")) {
coarse.rotate = keyFile.get_integer ("Coarse Transformation", "Rotate");
if (pedited) {
@@ -5552,16 +5658,16 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Coarse Transformation", "HorizontalFlip")) {
- coarse.hflip = keyFile.get_boolean ("Coarse Transformation", "HorizontalFlip");
+ if (keyFile.has_key ("Coarse Transformation", "HorizontalFlip")) {
+ coarse.hflip = keyFile.get_boolean ("Coarse Transformation", "HorizontalFlip");
if (pedited) {
pedited->coarse.hflip = true;
}
}
- if (keyFile.has_key ("Coarse Transformation", "VerticalFlip")) {
- coarse.vflip = keyFile.get_boolean ("Coarse Transformation", "VerticalFlip");
+ if (keyFile.has_key ("Coarse Transformation", "VerticalFlip")) {
+ coarse.vflip = keyFile.get_boolean ("Coarse Transformation", "VerticalFlip");
if (pedited) {
pedited->coarse.vflip = true;
@@ -5569,9 +5675,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load rotate
+// load rotate
if (keyFile.has_group ("Rotation")) {
- if (keyFile.has_key ("Rotation", "Degree")) {
+ if (keyFile.has_key ("Rotation", "Degree")) {
rotate.degree = keyFile.get_double ("Rotation", "Degree");
if (pedited) {
@@ -5580,9 +5686,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load commonTrans
+// load commonTrans
if (keyFile.has_group ("Common Properties for Transformations")) {
- if (keyFile.has_key ("Common Properties for Transformations", "AutoFill")) {
+ if (keyFile.has_key ("Common Properties for Transformations", "AutoFill")) {
commonTrans.autofill = keyFile.get_boolean ("Common Properties for Transformations", "AutoFill");
if (pedited) {
@@ -5591,10 +5697,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load distortion
+// load distortion
if (keyFile.has_group ("Distortion")) {
- if (keyFile.has_key ("Distortion", "Amount")) {
- distortion.amount = keyFile.get_double ("Distortion", "Amount");
+ if (keyFile.has_key ("Distortion", "Amount")) {
+ distortion.amount = keyFile.get_double ("Distortion", "Amount");
if (pedited) {
pedited->distortion.amount = true;
@@ -5602,10 +5708,10 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // lens profile
+// lens profile
if (keyFile.has_group ("LensProfile")) {
if (keyFile.has_key ("LensProfile", "LCPFile")) {
- lensProf.lcpFile = expandRelativePath(fname, "", keyFile.get_string ("LensProfile", "LCPFile"));
+ lensProf.lcpFile = expandRelativePath (fname, "", keyFile.get_string ("LensProfile", "LCPFile"));
if (pedited) {
pedited->lensProf.lcpFile = true;
@@ -5637,9 +5743,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load perspective correction
+// load perspective correction
if (keyFile.has_group ("Perspective")) {
- if (keyFile.has_key ("Perspective", "Horizontal")) {
+ if (keyFile.has_key ("Perspective", "Horizontal")) {
perspective.horizontal = keyFile.get_double ("Perspective", "Horizontal");
if (pedited) {
@@ -5647,8 +5753,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Perspective", "Vertical")) {
- perspective.vertical = keyFile.get_double ("Perspective", "Vertical");
+ if (keyFile.has_key ("Perspective", "Vertical")) {
+ perspective.vertical = keyFile.get_double ("Perspective", "Vertical");
if (pedited) {
pedited->perspective.vertical = true;
@@ -5656,26 +5762,26 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load gradient
+// load gradient
if (keyFile.has_group ("Gradient")) {
- if (keyFile.has_key ("Gradient", "Enabled")) {
- gradient.enabled = keyFile.get_boolean ("Gradient", "Enabled");
+ if (keyFile.has_key ("Gradient", "Enabled")) {
+ gradient.enabled = keyFile.get_boolean ("Gradient", "Enabled");
if (pedited) {
pedited->gradient.enabled = true;
}
}
- if (keyFile.has_key ("Gradient", "Degree")) {
- gradient.degree = keyFile.get_double ("Gradient", "Degree");
+ if (keyFile.has_key ("Gradient", "Degree")) {
+ gradient.degree = keyFile.get_double ("Gradient", "Degree");
if (pedited) {
pedited->gradient.degree = true;
}
}
- if (keyFile.has_key ("Gradient", "Feather")) {
- gradient.feather = keyFile.get_integer ("Gradient", "Feather");
+ if (keyFile.has_key ("Gradient", "Feather")) {
+ gradient.feather = keyFile.get_integer ("Gradient", "Feather");
if (pedited) {
pedited->gradient.feather = true;
@@ -5683,23 +5789,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Gradient", "Strength")) {
- gradient.strength = keyFile.get_double ("Gradient", "Strength");
+ gradient.strength = keyFile.get_double ("Gradient", "Strength");
if (pedited) {
pedited->gradient.strength = true;
}
}
- if (keyFile.has_key ("Gradient", "CenterX")) {
- gradient.centerX = keyFile.get_integer ("Gradient", "CenterX");
+ if (keyFile.has_key ("Gradient", "CenterX")) {
+ gradient.centerX = keyFile.get_integer ("Gradient", "CenterX");
if (pedited) {
pedited->gradient.centerX = true;
}
}
- if (keyFile.has_key ("Gradient", "CenterY")) {
- gradient.centerY = keyFile.get_integer ("Gradient", "CenterY");
+ if (keyFile.has_key ("Gradient", "CenterY")) {
+ gradient.centerY = keyFile.get_integer ("Gradient", "CenterY");
if (pedited) {
pedited->gradient.centerY = true;
@@ -5708,8 +5814,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_group ("PCVignette")) {
- if (keyFile.has_key ("PCVignette", "Enabled")) {
- pcvignette.enabled = keyFile.get_boolean ("PCVignette", "Enabled");
+ if (keyFile.has_key ("PCVignette", "Enabled")) {
+ pcvignette.enabled = keyFile.get_boolean ("PCVignette", "Enabled");
if (pedited) {
pedited->pcvignette.enabled = true;
@@ -5717,23 +5823,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("PCVignette", "Strength")) {
- pcvignette.strength = keyFile.get_double ("PCVignette", "Strength");
+ pcvignette.strength = keyFile.get_double ("PCVignette", "Strength");
if (pedited) {
pedited->pcvignette.strength = true;
}
}
- if (keyFile.has_key ("PCVignette", "Feather")) {
- pcvignette.feather = keyFile.get_integer ("PCVignette", "Feather");
+ if (keyFile.has_key ("PCVignette", "Feather")) {
+ pcvignette.feather = keyFile.get_integer ("PCVignette", "Feather");
if (pedited) {
pedited->pcvignette.feather = true;
}
}
- if (keyFile.has_key ("PCVignette", "Roundness")) {
- pcvignette.roundness = keyFile.get_integer ("PCVignette", "Roundness");
+ if (keyFile.has_key ("PCVignette", "Roundness")) {
+ pcvignette.roundness = keyFile.get_integer ("PCVignette", "Roundness");
if (pedited) {
pedited->pcvignette.roundness = true;
@@ -5743,8 +5849,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load c/a correction
if (keyFile.has_group ("CACorrection")) {
- if (keyFile.has_key ("CACorrection", "Red")) {
- cacorrection.red = keyFile.get_double ("CACorrection", "Red");
+ if (keyFile.has_key ("CACorrection", "Red")) {
+ cacorrection.red = keyFile.get_double ("CACorrection", "Red");
if (pedited) {
pedited->cacorrection.red = true;
@@ -5760,9 +5866,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load vignetting correction
+// load vignetting correction
if (keyFile.has_group ("Vignetting Correction")) {
- if (keyFile.has_key ("Vignetting Correction", "Amount")) {
+ if (keyFile.has_key ("Vignetting Correction", "Amount")) {
vignetting.amount = keyFile.get_integer ("Vignetting Correction", "Amount");
if (pedited) {
@@ -5770,7 +5876,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Vignetting Correction", "Radius")) {
+ if (keyFile.has_key ("Vignetting Correction", "Radius")) {
vignetting.radius = keyFile.get_integer ("Vignetting Correction", "Radius");
if (pedited) {
@@ -5786,7 +5892,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Vignetting Correction", "CenterX")) {
+ if (keyFile.has_key ("Vignetting Correction", "CenterX")) {
vignetting.centerX = keyFile.get_integer ("Vignetting Correction", "CenterX");
if (pedited) {
@@ -5794,7 +5900,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Vignetting Correction", "CenterY")) {
+ if (keyFile.has_key ("Vignetting Correction", "CenterY")) {
vignetting.centerY = keyFile.get_integer ("Vignetting Correction", "CenterY");
if (pedited) {
@@ -5803,25 +5909,25 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load resize settings
+// load resize settings
if (keyFile.has_group ("Resize")) {
- if (keyFile.has_key ("Resize", "Enabled")) {
- resize.enabled = keyFile.get_boolean ("Resize", "Enabled");
+ if (keyFile.has_key ("Resize", "Enabled")) {
+ resize.enabled = keyFile.get_boolean ("Resize", "Enabled");
if (pedited) {
pedited->resize.enabled = true;
}
}
- if (keyFile.has_key ("Resize", "Scale")) {
- resize.scale = keyFile.get_double ("Resize", "Scale");
+ if (keyFile.has_key ("Resize", "Scale")) {
+ resize.scale = keyFile.get_double ("Resize", "Scale");
if (pedited) {
pedited->resize.scale = true;
}
}
- if (keyFile.has_key ("Resize", "AppliesTo")) {
+ if (keyFile.has_key ("Resize", "AppliesTo")) {
resize.appliesTo = keyFile.get_string ("Resize", "AppliesTo");
if (pedited) {
@@ -5829,8 +5935,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Resize", "Method")) {
- resize.method = keyFile.get_string ("Resize", "Method");
+ if (keyFile.has_key ("Resize", "Method")) {
+ resize.method = keyFile.get_string ("Resize", "Method");
if (pedited) {
pedited->resize.method = true;
@@ -5838,23 +5944,23 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Resize", "DataSpecified")) {
- resize.dataspec = keyFile.get_integer ("Resize", "DataSpecified");
+ resize.dataspec = keyFile.get_integer ("Resize", "DataSpecified");
if (pedited) {
pedited->resize.dataspec = true;
}
}
- if (keyFile.has_key ("Resize", "Width")) {
- resize.width = keyFile.get_integer ("Resize", "Width");
+ if (keyFile.has_key ("Resize", "Width")) {
+ resize.width = keyFile.get_integer ("Resize", "Width");
if (pedited) {
pedited->resize.width = true;
}
}
- if (keyFile.has_key ("Resize", "Height")) {
- resize.height = keyFile.get_integer ("Resize", "Height");
+ if (keyFile.has_key ("Resize", "Height")) {
+ resize.height = keyFile.get_integer ("Resize", "Height");
if (pedited) {
pedited->resize.height = true;
@@ -5862,40 +5968,41 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load post resize sharpening
+// load post resize sharpening
if (keyFile.has_group ("PostResizeSharpening")) {
- if (keyFile.has_key ("PostResizeSharpening", "Enabled")) {
- prsharpening.enabled = keyFile.get_boolean ("PostResizeSharpening", "Enabled");
+ if (keyFile.has_key ("PostResizeSharpening", "Enabled")) {
+ prsharpening.enabled = keyFile.get_boolean ("PostResizeSharpening", "Enabled");
if (pedited) {
pedited->prsharpening.enabled = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "Radius")) {
- prsharpening.radius = keyFile.get_double ("PostResizeSharpening", "Radius");
+ if (keyFile.has_key ("PostResizeSharpening", "Radius")) {
+ prsharpening.radius = keyFile.get_double ("PostResizeSharpening", "Radius");
if (pedited) {
pedited->prsharpening.radius = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "Amount")) {
- prsharpening.amount = keyFile.get_integer ("PostResizeSharpening", "Amount");
+ if (keyFile.has_key ("PostResizeSharpening", "Amount")) {
+ prsharpening.amount = keyFile.get_integer ("PostResizeSharpening", "Amount");
if (pedited) {
pedited->prsharpening.amount = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "Threshold")) {
+ if (keyFile.has_key ("PostResizeSharpening", "Threshold")) {
if (ppVersion < 302) {
- int thresh = min(keyFile.get_integer ("PostResizeSharpening", "Threshold"), 2000);
- prsharpening.threshold.setValues(thresh, thresh, 2000, 2000); // TODO: 2000 is the maximum value and is taken of rtgui/sharpening.cc ; should be changed by the tool modularization
+ int thresh = min (keyFile.get_integer ("PostResizeSharpening", "Threshold"), 2000);
+ prsharpening.threshold.setValues (thresh, thresh, 2000, 2000); // TODO: 2000 is the maximum value and is taken of rtgui/sharpening.cc ; should be changed by the tool modularization
} else {
const std::vector thresh = keyFile.get_integer_list ("PostResizeSharpening", "Threshold");
- if(thresh.size() >= 4) {
- prsharpening.threshold.setValues(thresh[0], thresh[1], min(thresh[2], 2000), min(thresh[3], 2000));
+
+ if (thresh.size() >= 4) {
+ prsharpening.threshold.setValues (thresh[0], thresh[1], min (thresh[2], 2000), min (thresh[3], 2000));
}
}
@@ -5904,39 +6011,39 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("PostResizeSharpening", "OnlyEdges")) {
- prsharpening.edgesonly = keyFile.get_boolean ("PostResizeSharpening", "OnlyEdges");
+ if (keyFile.has_key ("PostResizeSharpening", "OnlyEdges")) {
+ prsharpening.edgesonly = keyFile.get_boolean ("PostResizeSharpening", "OnlyEdges");
if (pedited) {
pedited->prsharpening.edgesonly = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "EdgedetectionRadius")) {
- prsharpening.edges_radius = keyFile.get_double ("PostResizeSharpening", "EdgedetectionRadius");
+ if (keyFile.has_key ("PostResizeSharpening", "EdgedetectionRadius")) {
+ prsharpening.edges_radius = keyFile.get_double ("PostResizeSharpening", "EdgedetectionRadius");
if (pedited) {
pedited->prsharpening.edges_radius = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "EdgeTolerance")) {
- prsharpening.edges_tolerance = keyFile.get_integer ("PostResizeSharpening", "EdgeTolerance");
+ if (keyFile.has_key ("PostResizeSharpening", "EdgeTolerance")) {
+ prsharpening.edges_tolerance = keyFile.get_integer ("PostResizeSharpening", "EdgeTolerance");
if (pedited) {
pedited->prsharpening.edges_tolerance = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "HalocontrolEnabled")) {
- prsharpening.halocontrol = keyFile.get_boolean ("PostResizeSharpening", "HalocontrolEnabled");
+ if (keyFile.has_key ("PostResizeSharpening", "HalocontrolEnabled")) {
+ prsharpening.halocontrol = keyFile.get_boolean ("PostResizeSharpening", "HalocontrolEnabled");
if (pedited) {
pedited->prsharpening.halocontrol = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "HalocontrolAmount")) {
+ if (keyFile.has_key ("PostResizeSharpening", "HalocontrolAmount")) {
prsharpening.halocontrol_amount = keyFile.get_integer ("PostResizeSharpening", "HalocontrolAmount");
if (pedited) {
@@ -5944,40 +6051,40 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("PostResizeSharpening", "Method")) {
- prsharpening.method = keyFile.get_string ("PostResizeSharpening", "Method");
+ if (keyFile.has_key ("PostResizeSharpening", "Method")) {
+ prsharpening.method = keyFile.get_string ("PostResizeSharpening", "Method");
if (pedited) {
pedited->prsharpening.method = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "DeconvRadius")) {
- prsharpening.deconvradius = keyFile.get_double ("PostResizeSharpening", "DeconvRadius");
+ if (keyFile.has_key ("PostResizeSharpening", "DeconvRadius")) {
+ prsharpening.deconvradius = keyFile.get_double ("PostResizeSharpening", "DeconvRadius");
if (pedited) {
pedited->prsharpening.deconvradius = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "DeconvAmount")) {
- prsharpening.deconvamount = keyFile.get_integer ("PostResizeSharpening", "DeconvAmount");
+ if (keyFile.has_key ("PostResizeSharpening", "DeconvAmount")) {
+ prsharpening.deconvamount = keyFile.get_integer ("PostResizeSharpening", "DeconvAmount");
if (pedited) {
pedited->prsharpening.deconvamount = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "DeconvDamping")) {
- prsharpening.deconvdamping = keyFile.get_integer ("PostResizeSharpening", "DeconvDamping");
+ if (keyFile.has_key ("PostResizeSharpening", "DeconvDamping")) {
+ prsharpening.deconvdamping = keyFile.get_integer ("PostResizeSharpening", "DeconvDamping");
if (pedited) {
pedited->prsharpening.deconvdamping = true;
}
}
- if (keyFile.has_key ("PostResizeSharpening", "DeconvIterations")) {
- prsharpening.deconviter = keyFile.get_integer ("PostResizeSharpening", "DeconvIterations");
+ if (keyFile.has_key ("PostResizeSharpening", "DeconvIterations")) {
+ prsharpening.deconviter = keyFile.get_integer ("PostResizeSharpening", "DeconvIterations");
if (pedited) {
pedited->prsharpening.deconviter = true;
@@ -5985,50 +6092,50 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load color management settings
+// load color management settings
if (keyFile.has_group ("Color Management")) {
- if (keyFile.has_key ("Color Management", "InputProfile")) {
- icm.input = expandRelativePath(fname, "file:", keyFile.get_string ("Color Management", "InputProfile"));
+ if (keyFile.has_key ("Color Management", "InputProfile")) {
+ icm.input = expandRelativePath (fname, "file:", keyFile.get_string ("Color Management", "InputProfile"));
if (pedited) {
pedited->icm.input = true;
}
}
- if (keyFile.has_key ("Color Management", "ToneCurve")) {
- icm.toneCurve = keyFile.get_boolean ("Color Management", "ToneCurve");
+ if (keyFile.has_key ("Color Management", "ToneCurve")) {
+ icm.toneCurve = keyFile.get_boolean ("Color Management", "ToneCurve");
if (pedited) {
pedited->icm.toneCurve = true;
}
}
- if (keyFile.has_key ("Color Management", "ApplyLookTable")) {
- icm.applyLookTable = keyFile.get_boolean ("Color Management", "ApplyLookTable");
+ if (keyFile.has_key ("Color Management", "ApplyLookTable")) {
+ icm.applyLookTable = keyFile.get_boolean ("Color Management", "ApplyLookTable");
if (pedited) {
pedited->icm.applyLookTable = true;
}
}
- if (keyFile.has_key ("Color Management", "ApplyBaselineExposureOffset")) {
- icm.applyBaselineExposureOffset = keyFile.get_boolean ("Color Management", "ApplyBaselineExposureOffset");
+ if (keyFile.has_key ("Color Management", "ApplyBaselineExposureOffset")) {
+ icm.applyBaselineExposureOffset = keyFile.get_boolean ("Color Management", "ApplyBaselineExposureOffset");
if (pedited) {
pedited->icm.applyBaselineExposureOffset = true;
}
}
- if (keyFile.has_key ("Color Management", "ApplyHueSatMap")) {
- icm.applyHueSatMap = keyFile.get_boolean ("Color Management", "ApplyHueSatMap");
+ if (keyFile.has_key ("Color Management", "ApplyHueSatMap")) {
+ icm.applyHueSatMap = keyFile.get_boolean ("Color Management", "ApplyHueSatMap");
if (pedited) {
pedited->icm.applyHueSatMap = true;
}
}
- if (keyFile.has_key ("Color Management", "DCPIlluminant")) {
- icm.dcpIlluminant = keyFile.get_integer ("Color Management", "DCPIlluminant");
+ if (keyFile.has_key ("Color Management", "DCPIlluminant")) {
+ icm.dcpIlluminant = keyFile.get_integer ("Color Management", "DCPIlluminant");
if (pedited) {
pedited->icm.dcpIlluminant = true;
@@ -6036,22 +6143,22 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Color Management", "WorkingProfile")) {
- icm.working = keyFile.get_string ("Color Management", "WorkingProfile");
+ icm.working = keyFile.get_string ("Color Management", "WorkingProfile");
if (pedited) {
pedited->icm.working = true;
}
}
- if (keyFile.has_key ("Color Management", "OutputProfile")) {
- icm.output = keyFile.get_string ("Color Management", "OutputProfile");
+ if (keyFile.has_key ("Color Management", "OutputProfile")) {
+ icm.output = keyFile.get_string ("Color Management", "OutputProfile");
if (pedited) {
pedited->icm.output = true;
}
}
- if (keyFile.has_key ("Color Management", "OutputProfileIntent")) {
+ if (keyFile.has_key ("Color Management", "OutputProfileIntent")) {
Glib::ustring intent = keyFile.get_string ("Color Management", "OutputProfileIntent");
if (intent == "Perceptual") {
@@ -6069,40 +6176,40 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Color Management", "OutputBPC")) {
- icm.outputBPC = keyFile.get_boolean ("Color Management", "OutputBPC");
+ if (keyFile.has_key ("Color Management", "OutputBPC")) {
+ icm.outputBPC = keyFile.get_boolean ("Color Management", "OutputBPC");
if (pedited) {
pedited->icm.outputBPC = true;
}
}
- if (keyFile.has_key ("Color Management", "Gammafree")) {
- icm.gamma = keyFile.get_string ("Color Management", "Gammafree");
+ if (keyFile.has_key ("Color Management", "Gammafree")) {
+ icm.gamma = keyFile.get_string ("Color Management", "Gammafree");
if (pedited) {
pedited->icm.gamfree = true;
}
}
- if (keyFile.has_key ("Color Management", "Freegamma")) {
- icm.freegamma = keyFile.get_boolean ("Color Management", "Freegamma");
+ if (keyFile.has_key ("Color Management", "Freegamma")) {
+ icm.freegamma = keyFile.get_boolean ("Color Management", "Freegamma");
if (pedited) {
pedited->icm.freegamma = true;
}
}
- if (keyFile.has_key ("Color Management", "GammaValue")) {
- icm.gampos = keyFile.get_double ("Color Management", "GammaValue");
+ if (keyFile.has_key ("Color Management", "GammaValue")) {
+ icm.gampos = keyFile.get_double ("Color Management", "GammaValue");
if (pedited) {
pedited->icm.gampos = true;
}
}
- if (keyFile.has_key ("Color Management", "GammaSlope")) {
- icm.slpos = keyFile.get_double ("Color Management", "GammaSlope");
+ if (keyFile.has_key ("Color Management", "GammaSlope")) {
+ icm.slpos = keyFile.get_double ("Color Management", "GammaSlope");
if (pedited) {
pedited->icm.slpos = true;
@@ -6111,9 +6218,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- // load wavelet wavelet parameters
+// load wavelet wavelet parameters
if (keyFile.has_group ("Wavelet")) {
- if (keyFile.has_key ("Wavelet", "Enabled")) {
+ if (keyFile.has_key ("Wavelet", "Enabled")) {
wavelet.enabled = keyFile.get_boolean ("Wavelet", "Enabled");
if (pedited) {
@@ -6121,7 +6228,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Strength")) {
+ if (keyFile.has_key ("Wavelet", "Strength")) {
wavelet.strength = keyFile.get_integer ("Wavelet", "Strength");
if (pedited) {
@@ -6129,7 +6236,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Balance")) {
+ if (keyFile.has_key ("Wavelet", "Balance")) {
wavelet.balance = keyFile.get_integer ("Wavelet", "Balance");
if (pedited) {
@@ -6137,7 +6244,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Iter")) {
+ if (keyFile.has_key ("Wavelet", "Iter")) {
wavelet.iter = keyFile.get_integer ("Wavelet", "Iter");
if (pedited) {
@@ -6177,7 +6284,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBgreenhigh")) {
+ if (keyFile.has_key ("Wavelet", "CBgreenhigh")) {
wavelet.greenhigh = keyFile.get_integer ("Wavelet", "CBgreenhigh");
if (pedited) {
@@ -6185,7 +6292,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBgreenmed")) {
+ if (keyFile.has_key ("Wavelet", "CBgreenmed")) {
wavelet.greenmed = keyFile.get_integer ("Wavelet", "CBgreenmed");
if (pedited) {
@@ -6193,7 +6300,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBgreenlow")) {
+ if (keyFile.has_key ("Wavelet", "CBgreenlow")) {
wavelet.greenlow = keyFile.get_integer ("Wavelet", "CBgreenlow");
if (pedited) {
@@ -6201,7 +6308,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBbluehigh")) {
+ if (keyFile.has_key ("Wavelet", "CBbluehigh")) {
wavelet.bluehigh = keyFile.get_integer ("Wavelet", "CBbluehigh");
if (pedited) {
@@ -6209,7 +6316,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBbluemed")) {
+ if (keyFile.has_key ("Wavelet", "CBbluemed")) {
wavelet.bluemed = keyFile.get_integer ("Wavelet", "CBbluemed");
if (pedited) {
@@ -6217,7 +6324,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "CBbluelow")) {
+ if (keyFile.has_key ("Wavelet", "CBbluelow")) {
wavelet.bluelow = keyFile.get_integer ("Wavelet", "CBbluelow");
if (pedited) {
@@ -6225,7 +6332,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
-// if (keyFile.has_key ("Wavelet", "Edgreinf")) {wavelet.edgreinf = keyFile.get_boolean ("Wavelet", "Edgreinf");if (pedited) pedited->wavelet.edgreinf = true;}
+// if (keyFile.has_key ("Wavelet", "Edgreinf")) {wavelet.edgreinf = keyFile.get_boolean ("Wavelet", "Edgreinf");if (pedited) pedited->wavelet.edgreinf = true;}
if (keyFile.has_key ("Wavelet", "Lipst")) {
wavelet.lipst = keyFile.get_boolean ("Wavelet", "Lipst");
@@ -6250,296 +6357,296 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "LevMethod")) {
- wavelet.Lmethod = keyFile.get_string ("Wavelet", "LevMethod");
+ if (keyFile.has_key ("Wavelet", "LevMethod")) {
+ wavelet.Lmethod = keyFile.get_string ("Wavelet", "LevMethod");
if (pedited) {
pedited->wavelet.Lmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "ChoiceLevMethod")) {
- wavelet.CLmethod = keyFile.get_string ("Wavelet", "ChoiceLevMethod");
+ if (keyFile.has_key ("Wavelet", "ChoiceLevMethod")) {
+ wavelet.CLmethod = keyFile.get_string ("Wavelet", "ChoiceLevMethod");
if (pedited) {
pedited->wavelet.CLmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "BackMethod")) {
- wavelet.Backmethod = keyFile.get_string ("Wavelet", "BackMethod");
+ if (keyFile.has_key ("Wavelet", "BackMethod")) {
+ wavelet.Backmethod = keyFile.get_string ("Wavelet", "BackMethod");
if (pedited) {
pedited->wavelet.Backmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "TilesMethod")) {
- wavelet.Tilesmethod = keyFile.get_string ("Wavelet", "TilesMethod");
+ if (keyFile.has_key ("Wavelet", "TilesMethod")) {
+ wavelet.Tilesmethod = keyFile.get_string ("Wavelet", "TilesMethod");
if (pedited) {
pedited->wavelet.Tilesmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "DaubMethod")) {
- wavelet.daubcoeffmethod = keyFile.get_string ("Wavelet", "DaubMethod");
+ if (keyFile.has_key ("Wavelet", "DaubMethod")) {
+ wavelet.daubcoeffmethod = keyFile.get_string ("Wavelet", "DaubMethod");
if (pedited) {
pedited->wavelet.daubcoeffmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "CHromaMethod")) {
- wavelet.CHmethod = keyFile.get_string ("Wavelet", "CHromaMethod");
+ if (keyFile.has_key ("Wavelet", "CHromaMethod")) {
+ wavelet.CHmethod = keyFile.get_string ("Wavelet", "CHromaMethod");
if (pedited) {
pedited->wavelet.CHmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "Medgreinf")) {
- wavelet.Medgreinf = keyFile.get_string ("Wavelet", "Medgreinf");
+ if (keyFile.has_key ("Wavelet", "Medgreinf")) {
+ wavelet.Medgreinf = keyFile.get_string ("Wavelet", "Medgreinf");
if (pedited) {
pedited->wavelet.Medgreinf = true;
}
}
- if (keyFile.has_key ("Wavelet", "CHSLromaMethod")) {
- wavelet.CHSLmethod = keyFile.get_string ("Wavelet", "CHSLromaMethod");
+ if (keyFile.has_key ("Wavelet", "CHSLromaMethod")) {
+ wavelet.CHSLmethod = keyFile.get_string ("Wavelet", "CHSLromaMethod");
if (pedited) {
pedited->wavelet.CHSLmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "EDMethod")) {
- wavelet.EDmethod = keyFile.get_string ("Wavelet", "EDMethod");
+ if (keyFile.has_key ("Wavelet", "EDMethod")) {
+ wavelet.EDmethod = keyFile.get_string ("Wavelet", "EDMethod");
if (pedited) {
pedited->wavelet.EDmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "NPMethod")) {
- wavelet.NPmethod = keyFile.get_string ("Wavelet", "NPMethod");
+ if (keyFile.has_key ("Wavelet", "NPMethod")) {
+ wavelet.NPmethod = keyFile.get_string ("Wavelet", "NPMethod");
if (pedited) {
pedited->wavelet.NPmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "BAMethod")) {
- wavelet.BAmethod = keyFile.get_string ("Wavelet", "BAMethod");
+ if (keyFile.has_key ("Wavelet", "BAMethod")) {
+ wavelet.BAmethod = keyFile.get_string ("Wavelet", "BAMethod");
if (pedited) {
pedited->wavelet.BAmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "TMMethod")) {
- wavelet.TMmethod = keyFile.get_string ("Wavelet", "TMMethod");
+ if (keyFile.has_key ("Wavelet", "TMMethod")) {
+ wavelet.TMmethod = keyFile.get_string ("Wavelet", "TMMethod");
if (pedited) {
pedited->wavelet.TMmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "HSMethod")) {
- wavelet.HSmethod = keyFile.get_string ("Wavelet", "HSMethod");
+ if (keyFile.has_key ("Wavelet", "HSMethod")) {
+ wavelet.HSmethod = keyFile.get_string ("Wavelet", "HSMethod");
if (pedited) {
pedited->wavelet.HSmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "DirMethod")) {
- wavelet.Dirmethod = keyFile.get_string ("Wavelet", "DirMethod");
+ if (keyFile.has_key ("Wavelet", "DirMethod")) {
+ wavelet.Dirmethod = keyFile.get_string ("Wavelet", "DirMethod");
if (pedited) {
pedited->wavelet.Dirmethod = true;
}
}
- if (keyFile.has_key ("Wavelet", "ResidualcontShadow")) {
- wavelet.rescon = keyFile.get_integer ("Wavelet", "ResidualcontShadow");
+ if (keyFile.has_key ("Wavelet", "ResidualcontShadow")) {
+ wavelet.rescon = keyFile.get_integer ("Wavelet", "ResidualcontShadow");
if (pedited) {
pedited->wavelet.rescon = true;
}
}
- if (keyFile.has_key ("Wavelet", "ResidualcontHighlight")) {
- wavelet.resconH = keyFile.get_integer ("Wavelet", "ResidualcontHighlight");
+ if (keyFile.has_key ("Wavelet", "ResidualcontHighlight")) {
+ wavelet.resconH = keyFile.get_integer ("Wavelet", "ResidualcontHighlight");
if (pedited) {
pedited->wavelet.resconH = true;
}
}
- if (keyFile.has_key ("Wavelet", "Residualchroma")) {
- wavelet.reschro = keyFile.get_integer ("Wavelet", "Residualchroma");
+ if (keyFile.has_key ("Wavelet", "Residualchroma")) {
+ wavelet.reschro = keyFile.get_integer ("Wavelet", "Residualchroma");
if (pedited) {
pedited->wavelet.reschro = true;
}
}
- if (keyFile.has_key ("Wavelet", "ResidualTM")) {
- wavelet.tmrs = keyFile.get_double ("Wavelet", "ResidualTM");
+ if (keyFile.has_key ("Wavelet", "ResidualTM")) {
+ wavelet.tmrs = keyFile.get_double ("Wavelet", "ResidualTM");
if (pedited) {
pedited->wavelet.tmrs = true;
}
}
- if (keyFile.has_key ("Wavelet", "Residualgamma")) {
- wavelet.gamma = keyFile.get_double ("Wavelet", "Residualgamma");
+ if (keyFile.has_key ("Wavelet", "Residualgamma")) {
+ wavelet.gamma = keyFile.get_double ("Wavelet", "Residualgamma");
if (pedited) {
pedited->wavelet.gamma = true;
}
}
- if (keyFile.has_key ("Wavelet", "ContExtra")) {
- wavelet.sup = keyFile.get_integer ("Wavelet", "ContExtra");
+ if (keyFile.has_key ("Wavelet", "ContExtra")) {
+ wavelet.sup = keyFile.get_integer ("Wavelet", "ContExtra");
if (pedited) {
pedited->wavelet.sup = true;
}
}
- if (keyFile.has_key ("Wavelet", "HueRangeResidual")) {
- wavelet.sky = keyFile.get_double ("Wavelet", "HueRangeResidual");
+ if (keyFile.has_key ("Wavelet", "HueRangeResidual")) {
+ wavelet.sky = keyFile.get_double ("Wavelet", "HueRangeResidual");
if (pedited) {
pedited->wavelet.sky = true;
}
}
- if (keyFile.has_key ("Wavelet", "MaxLev")) {
- wavelet.thres = keyFile.get_integer ("Wavelet", "MaxLev");
+ if (keyFile.has_key ("Wavelet", "MaxLev")) {
+ wavelet.thres = keyFile.get_integer ("Wavelet", "MaxLev");
if (pedited) {
pedited->wavelet.thres = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThresholdHighLight")) {
- wavelet.threshold = keyFile.get_integer ("Wavelet", "ThresholdHighLight");
+ if (keyFile.has_key ("Wavelet", "ThresholdHighLight")) {
+ wavelet.threshold = keyFile.get_integer ("Wavelet", "ThresholdHighLight");
if (pedited) {
pedited->wavelet.threshold = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThresholdShadow")) {
- wavelet.threshold2 = keyFile.get_integer ("Wavelet", "ThresholdShadow");
+ if (keyFile.has_key ("Wavelet", "ThresholdShadow")) {
+ wavelet.threshold2 = keyFile.get_integer ("Wavelet", "ThresholdShadow");
if (pedited) {
pedited->wavelet.threshold2 = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgedetect")) {
- wavelet.edgedetect = keyFile.get_integer ("Wavelet", "Edgedetect");
+ if (keyFile.has_key ("Wavelet", "Edgedetect")) {
+ wavelet.edgedetect = keyFile.get_integer ("Wavelet", "Edgedetect");
if (pedited) {
pedited->wavelet.edgedetect = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgedetectthr")) {
- wavelet.edgedetectthr = keyFile.get_integer ("Wavelet", "Edgedetectthr");
+ if (keyFile.has_key ("Wavelet", "Edgedetectthr")) {
+ wavelet.edgedetectthr = keyFile.get_integer ("Wavelet", "Edgedetectthr");
if (pedited) {
pedited->wavelet.edgedetectthr = true;
}
}
- if (keyFile.has_key ("Wavelet", "EdgedetectthrHi")) {
- wavelet.edgedetectthr2 = keyFile.get_integer ("Wavelet", "EdgedetectthrHi");
+ if (keyFile.has_key ("Wavelet", "EdgedetectthrHi")) {
+ wavelet.edgedetectthr2 = keyFile.get_integer ("Wavelet", "EdgedetectthrHi");
if (pedited) {
pedited->wavelet.edgedetectthr2 = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgesensi")) {
- wavelet.edgesensi = keyFile.get_integer ("Wavelet", "Edgesensi");
+ if (keyFile.has_key ("Wavelet", "Edgesensi")) {
+ wavelet.edgesensi = keyFile.get_integer ("Wavelet", "Edgesensi");
if (pedited) {
pedited->wavelet.edgesensi = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgeampli")) {
- wavelet.edgeampli = keyFile.get_integer ("Wavelet", "Edgeampli");
+ if (keyFile.has_key ("Wavelet", "Edgeampli")) {
+ wavelet.edgeampli = keyFile.get_integer ("Wavelet", "Edgeampli");
if (pedited) {
pedited->wavelet.edgeampli = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThresholdChroma")) {
- wavelet.chroma = keyFile.get_integer ("Wavelet", "ThresholdChroma");
+ if (keyFile.has_key ("Wavelet", "ThresholdChroma")) {
+ wavelet.chroma = keyFile.get_integer ("Wavelet", "ThresholdChroma");
if (pedited) {
pedited->wavelet.chroma = true;
}
}
- if (keyFile.has_key ("Wavelet", "ChromaLink")) {
- wavelet.chro = keyFile.get_integer ("Wavelet", "ChromaLink");
+ if (keyFile.has_key ("Wavelet", "ChromaLink")) {
+ wavelet.chro = keyFile.get_integer ("Wavelet", "ChromaLink");
if (pedited) {
pedited->wavelet.chro = true;
}
}
- if (keyFile.has_key ("Wavelet", "Contrast")) {
- wavelet.contrast = keyFile.get_integer ("Wavelet", "Contrast");
+ if (keyFile.has_key ("Wavelet", "Contrast")) {
+ wavelet.contrast = keyFile.get_integer ("Wavelet", "Contrast");
if (pedited) {
pedited->wavelet.contrast = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgrad")) {
- wavelet.edgrad = keyFile.get_integer ("Wavelet", "Edgrad");
+ if (keyFile.has_key ("Wavelet", "Edgrad")) {
+ wavelet.edgrad = keyFile.get_integer ("Wavelet", "Edgrad");
if (pedited) {
pedited->wavelet.edgrad = true;
}
}
- if (keyFile.has_key ("Wavelet", "Edgval")) {
- wavelet.edgval = keyFile.get_integer ("Wavelet", "Edgval");
+ if (keyFile.has_key ("Wavelet", "Edgval")) {
+ wavelet.edgval = keyFile.get_integer ("Wavelet", "Edgval");
if (pedited) {
pedited->wavelet.edgval = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThrEdg")) {
- wavelet.edgthresh = keyFile.get_integer ("Wavelet", "ThrEdg");
+ if (keyFile.has_key ("Wavelet", "ThrEdg")) {
+ wavelet.edgthresh = keyFile.get_integer ("Wavelet", "ThrEdg");
if (pedited) {
pedited->wavelet.edgthresh = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThresholdResidShadow")) {
- wavelet.thr = keyFile.get_integer ("Wavelet", "ThresholdResidShadow");
+ if (keyFile.has_key ("Wavelet", "ThresholdResidShadow")) {
+ wavelet.thr = keyFile.get_integer ("Wavelet", "ThresholdResidShadow");
if (pedited) {
pedited->wavelet.thr = true;
}
}
- if (keyFile.has_key ("Wavelet", "ThresholdResidHighLight")) {
- wavelet.thrH = keyFile.get_integer ("Wavelet", "ThresholdResidHighLight");
+ if (keyFile.has_key ("Wavelet", "ThresholdResidHighLight")) {
+ wavelet.thrH = keyFile.get_integer ("Wavelet", "ThresholdResidHighLight");
if (pedited) {
pedited->wavelet.thrH = true;
@@ -6548,72 +6655,81 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Wavelet", "ContrastCurve")) {
wavelet.ccwcurve = keyFile.get_double_list ("Wavelet", "ContrastCurve");
- avoidEmptyCurve(wavelet.ccwcurve);
+ avoidEmptyCurve (wavelet.ccwcurve);
+
if (pedited) {
pedited->wavelet.ccwcurve = true;
}
}
- if (keyFile.has_key ("Wavelet", "OpacityCurveRG")) {
+ if (keyFile.has_key ("Wavelet", "OpacityCurveRG")) {
wavelet.opacityCurveRG = keyFile.get_double_list ("Wavelet", "OpacityCurveRG");
- avoidEmptyCurve(wavelet.opacityCurveRG);
+ avoidEmptyCurve (wavelet.opacityCurveRG);
+
if (pedited) {
pedited->wavelet.opacityCurveRG = true;
}
}
- if (keyFile.has_key ("Wavelet", "OpacityCurveBY")) {
+ if (keyFile.has_key ("Wavelet", "OpacityCurveBY")) {
wavelet.opacityCurveBY = keyFile.get_double_list ("Wavelet", "OpacityCurveBY");
- avoidEmptyCurve(wavelet.opacityCurveBY);
+ avoidEmptyCurve (wavelet.opacityCurveBY);
+
if (pedited) {
pedited->wavelet.opacityCurveBY = true;
}
}
- if (keyFile.has_key ("Wavelet", "OpacityCurveW")) {
+ if (keyFile.has_key ("Wavelet", "OpacityCurveW")) {
wavelet.opacityCurveW = keyFile.get_double_list ("Wavelet", "OpacityCurveW");
- avoidEmptyCurve(wavelet.opacityCurveW);
+ avoidEmptyCurve (wavelet.opacityCurveW);
+
if (pedited) {
pedited->wavelet.opacityCurveW = true;
}
}
- if (keyFile.has_key ("Wavelet", "OpacityCurveWL")) {
+ if (keyFile.has_key ("Wavelet", "OpacityCurveWL")) {
wavelet.opacityCurveWL = keyFile.get_double_list ("Wavelet", "OpacityCurveWL");
- avoidEmptyCurve(wavelet.opacityCurveWL);
+ avoidEmptyCurve (wavelet.opacityCurveWL);
+
if (pedited) {
pedited->wavelet.opacityCurveWL = true;
}
}
- if (keyFile.has_key ("Wavelet", "HHcurve")) {
+ if (keyFile.has_key ("Wavelet", "HHcurve")) {
wavelet.hhcurve = keyFile.get_double_list ("Wavelet", "HHcurve");
- avoidEmptyCurve(wavelet.hhcurve);
+ avoidEmptyCurve (wavelet.hhcurve);
+
if (pedited) {
pedited->wavelet.hhcurve = true;
}
}
- if (keyFile.has_key ("Wavelet", "CHcurve")) {
+ if (keyFile.has_key ("Wavelet", "CHcurve")) {
wavelet.Chcurve = keyFile.get_double_list ("Wavelet", "CHcurve");
- avoidEmptyCurve(wavelet.Chcurve);
+ avoidEmptyCurve (wavelet.Chcurve);
+
if (pedited) {
pedited->wavelet.Chcurve = true;
}
}
- if (keyFile.has_key ("Wavelet", "WavclCurve")) {
+ if (keyFile.has_key ("Wavelet", "WavclCurve")) {
wavelet.wavclCurve = keyFile.get_double_list ("Wavelet", "WavclCurve");
- avoidEmptyCurve(wavelet.wavclCurve);
+ avoidEmptyCurve (wavelet.wavclCurve);
+
if (pedited) {
pedited->wavelet.wavclCurve = true;
}
}
- if (keyFile.has_key ("Wavelet", "Hueskin")) {
+ if (keyFile.has_key ("Wavelet", "Hueskin")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "Hueskin");
- if(thresh.size() >= 4) {
- wavelet.hueskin.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.hueskin.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6621,10 +6737,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "HueRange")) {
+ if (keyFile.has_key ("Wavelet", "HueRange")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "HueRange");
- if(thresh.size() >= 4) {
- wavelet.hueskin2.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.hueskin2.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6632,10 +6749,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "HLRange")) {
+ if (keyFile.has_key ("Wavelet", "HLRange")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "HLRange");
- if(thresh.size() >= 4) {
- wavelet.hllev.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.hllev.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6643,10 +6761,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "SHRange")) {
+ if (keyFile.has_key ("Wavelet", "SHRange")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "SHRange");
- if(thresh.size() >= 4) {
- wavelet.bllev.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.bllev.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6654,10 +6773,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Edgcont")) {
+ if (keyFile.has_key ("Wavelet", "Edgcont")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "Edgcont");
- if(thresh.size() >= 4) {
- wavelet.edgcont.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.edgcont.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6665,10 +6785,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Level0noise")) {
+ if (keyFile.has_key ("Wavelet", "Level0noise")) {
const std::vector thresh = keyFile.get_double_list ("Wavelet", "Level0noise");
- if(thresh.size() >= 2) {
- wavelet.level0noise.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ wavelet.level0noise.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -6676,10 +6797,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Level1noise")) {
+ if (keyFile.has_key ("Wavelet", "Level1noise")) {
const std::vector thresh = keyFile.get_double_list ("Wavelet", "Level1noise");
- if(thresh.size() >= 2) {
- wavelet.level1noise.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ wavelet.level1noise.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -6687,10 +6809,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Level2noise")) {
+ if (keyFile.has_key ("Wavelet", "Level2noise")) {
const std::vector thresh = keyFile.get_double_list ("Wavelet", "Level2noise");
- if(thresh.size() >= 2) {
- wavelet.level2noise.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ wavelet.level2noise.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -6698,10 +6821,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Level3noise")) {
+ if (keyFile.has_key ("Wavelet", "Level3noise")) {
const std::vector thresh = keyFile.get_double_list ("Wavelet", "Level3noise");
- if(thresh.size() >= 2) {
- wavelet.level3noise.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ wavelet.level3noise.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -6710,10 +6834,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if (keyFile.has_key ("Wavelet", "Pastlev")) {
+ if (keyFile.has_key ("Wavelet", "Pastlev")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "Pastlev");
- if(thresh.size() >= 4) {
- wavelet.pastlev.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.pastlev.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6721,10 +6846,11 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Wavelet", "Satlev")) {
+ if (keyFile.has_key ("Wavelet", "Satlev")) {
const std::vector thresh = keyFile.get_integer_list ("Wavelet", "Satlev");
- if(thresh.size() >= 4) {
- wavelet.satlev.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ wavelet.satlev.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6733,7 +6859,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if(keyFile.has_key ("Wavelet", "Skinprotect")) {
+ if (keyFile.has_key ("Wavelet", "Skinprotect")) {
wavelet.skinprotect = keyFile.get_double ("Wavelet", "Skinprotect");
if (pedited) {
@@ -6757,28 +6883,28 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- for(int i = 0; i < 9; i ++) {
+ for (int i = 0; i < 9; i ++) {
std::stringstream ss;
ss << "Contrast" << (i + 1);
- if(keyFile.has_key ("Wavelet", ss.str())) {
+ if (keyFile.has_key ("Wavelet", ss.str())) {
wavelet.c[i] = keyFile.get_integer ("Wavelet", ss.str());
if (pedited) {
- pedited->wavelet.c[i] = true;
+ pedited->wavelet.c[i] = true;
}
}
}
- for(int i = 0; i < 9; i ++) {
+ for (int i = 0; i < 9; i ++) {
std::stringstream ss;
ss << "Chroma" << (i + 1);
- if(keyFile.has_key ("Wavelet", ss.str())) {
+ if (keyFile.has_key ("Wavelet", ss.str())) {
wavelet.ch[i] = keyFile.get_integer ("Wavelet", ss.str());
if (pedited) {
- pedited->wavelet.ch[i] = true;
+ pedited->wavelet.ch[i] = true;
}
}
}
@@ -6826,9 +6952,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- // load directional pyramid equalizer parameters
+// load directional pyramid equalizer parameters
if (keyFile.has_group ("Directional Pyramid Equalizer")) {
- if (keyFile.has_key ("Directional Pyramid Equalizer", "Enabled")) {
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "Enabled")) {
dirpyrequalizer.enabled = keyFile.get_boolean ("Directional Pyramid Equalizer", "Enabled");
if (pedited) {
@@ -6836,7 +6962,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Directional Pyramid Equalizer", "Gamutlab")) {
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "Gamutlab")) {
dirpyrequalizer.gamutlab = keyFile.get_boolean ("Directional Pyramid Equalizer", "Gamutlab");
if (pedited) {
@@ -6845,8 +6971,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
- if (keyFile.has_key ("Directional Pyramid Equalizer", "cbdlMethod")) {
- dirpyrequalizer.cbdlMethod = keyFile.get_string ("Directional Pyramid Equalizer", "cbdlMethod");
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "cbdlMethod")) {
+ dirpyrequalizer.cbdlMethod = keyFile.get_string ("Directional Pyramid Equalizer", "cbdlMethod");
if (pedited) {
pedited->dirpyrequalizer.cbdlMethod = true;
@@ -6854,11 +6980,12 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
-// if (keyFile.has_key ("Directional Pyramid Equalizer", "Algorithm")) { dirpyrequalizer.algo = keyFile.get_string ("Directional Pyramid Equalizer", "Algorithm"); if (pedited) pedited->dirpyrequalizer.algo = true; }
- if (keyFile.has_key ("Directional Pyramid Equalizer", "Hueskin")) {
+// if (keyFile.has_key ("Directional Pyramid Equalizer", "Algorithm")) { dirpyrequalizer.algo = keyFile.get_string ("Directional Pyramid Equalizer", "Algorithm"); if (pedited) pedited->dirpyrequalizer.algo = true; }
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "Hueskin")) {
const std::vector thresh = keyFile.get_integer_list ("Directional Pyramid Equalizer", "Hueskin");
- if(thresh.size() >= 4) {
- dirpyrequalizer.hueskin.setValues(thresh[0], thresh[1], min(thresh[2], 300), min(thresh[3], 300));
+
+ if (thresh.size() >= 4) {
+ dirpyrequalizer.hueskin.setValues (thresh[0], thresh[1], min (thresh[2], 300), min (thresh[3], 300));
}
if (pedited) {
@@ -6867,22 +6994,22 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion < 316) {
- for(int i = 0; i < 5; i ++) {
+ for (int i = 0; i < 5; i ++) {
std::stringstream ss;
ss << "Mult" << i;
- if(keyFile.has_key ("Directional Pyramid Equalizer", ss.str())) {
- if(i == 4) {
+ if (keyFile.has_key ("Directional Pyramid Equalizer", ss.str())) {
+ if (i == 4) {
dirpyrequalizer.threshold = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
if (pedited) {
pedited->dirpyrequalizer.threshold = true;
}
- } else {
- dirpyrequalizer.mult[i] = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
+ } else {
+ dirpyrequalizer.mult[i] = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
if (pedited) {
- pedited->dirpyrequalizer.mult[i] = true;
+ pedited->dirpyrequalizer.mult[i] = true;
}
}
}
@@ -6890,21 +7017,21 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
dirpyrequalizer.mult[4] = 1.0;
} else {
- // 5 level wavelet + dedicated threshold parameter
- for(int i = 0; i < 6; i ++) {
+// 5 level wavelet + dedicated threshold parameter
+ for (int i = 0; i < 6; i ++) {
std::stringstream ss;
ss << "Mult" << i;
- if(keyFile.has_key ("Directional Pyramid Equalizer", ss.str())) {
- dirpyrequalizer.mult[i] = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
+ if (keyFile.has_key ("Directional Pyramid Equalizer", ss.str())) {
+ dirpyrequalizer.mult[i] = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
if (pedited) {
- pedited->dirpyrequalizer.mult[i] = true;
+ pedited->dirpyrequalizer.mult[i] = true;
}
}
}
- if(keyFile.has_key ("Directional Pyramid Equalizer", "Threshold")) {
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "Threshold")) {
dirpyrequalizer.threshold = keyFile.get_double ("Directional Pyramid Equalizer", "Threshold");
if (pedited) {
@@ -6912,7 +7039,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(keyFile.has_key ("Directional Pyramid Equalizer", "Skinprotect")) {
+ if (keyFile.has_key ("Directional Pyramid Equalizer", "Skinprotect")) {
dirpyrequalizer.skinprotect = keyFile.get_double ("Directional Pyramid Equalizer", "Skinprotect");
if (pedited) {
@@ -6922,29 +7049,29 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load CLUT parameters
- if ( keyFile.has_group( "Film Simulation" ) ) {
- if ( keyFile.has_key( "Film Simulation", "Enabled" ) ) {
- filmSimulation.enabled = keyFile.get_boolean( "Film Simulation", "Enabled" );
+// load CLUT parameters
+ if ( keyFile.has_group ( "Film Simulation" ) ) {
+ if ( keyFile.has_key ( "Film Simulation", "Enabled" ) ) {
+ filmSimulation.enabled = keyFile.get_boolean ( "Film Simulation", "Enabled" );
if ( pedited ) {
pedited->filmSimulation.enabled = true;
}
}
- if ( keyFile.has_key( "Film Simulation", "ClutFilename" ) ) {
- filmSimulation.clutFilename = keyFile.get_string( "Film Simulation", "ClutFilename" );
+ if ( keyFile.has_key ( "Film Simulation", "ClutFilename" ) ) {
+ filmSimulation.clutFilename = keyFile.get_string ( "Film Simulation", "ClutFilename" );
if ( pedited ) {
pedited->filmSimulation.clutFilename = true;
}
}
- if ( keyFile.has_key( "Film Simulation", "Strength" ) ) {
+ if ( keyFile.has_key ( "Film Simulation", "Strength" ) ) {
if (ppVersion < 321) {
- filmSimulation.strength = int(keyFile.get_double( "Film Simulation", "Strength" ) * 100 + 0.1);
+ filmSimulation.strength = int (keyFile.get_double ( "Film Simulation", "Strength" ) * 100 + 0.1);
} else {
- filmSimulation.strength = keyFile.get_integer( "Film Simulation", "Strength" );
+ filmSimulation.strength = keyFile.get_integer ( "Film Simulation", "Strength" );
}
if ( pedited ) {
@@ -6953,12 +7080,13 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load HSV wavelet parameters
+// load HSV wavelet parameters
if (keyFile.has_group ("HSV Equalizer")) {
if (ppVersion >= 300) {
if (keyFile.has_key ("HSV Equalizer", "HCurve")) {
hsvequalizer.hcurve = keyFile.get_double_list ("HSV Equalizer", "HCurve");
- avoidEmptyCurve(hsvequalizer.hcurve);
+ avoidEmptyCurve (hsvequalizer.hcurve);
+
if (pedited) {
pedited->hsvequalizer.hcurve = true;
}
@@ -6966,7 +7094,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("HSV Equalizer", "SCurve")) {
hsvequalizer.scurve = keyFile.get_double_list ("HSV Equalizer", "SCurve");
- avoidEmptyCurve(hsvequalizer.scurve);
+ avoidEmptyCurve (hsvequalizer.scurve);
+
if (pedited) {
pedited->hsvequalizer.scurve = true;
}
@@ -6974,7 +7103,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("HSV Equalizer", "VCurve")) {
hsvequalizer.vcurve = keyFile.get_double_list ("HSV Equalizer", "VCurve");
- avoidEmptyCurve(hsvequalizer.vcurve);
+ avoidEmptyCurve (hsvequalizer.vcurve);
+
if (pedited) {
pedited->hsvequalizer.vcurve = true;
}
@@ -6982,9 +7112,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load RGB curves
+// load RGB curves
if (keyFile.has_group ("RGB Curves")) {
- if (keyFile.has_key ("RGB Curves", "LumaMode")) {
+ if (keyFile.has_key ("RGB Curves", "LumaMode")) {
rgbCurves.lumamode = keyFile.get_boolean ("RGB Curves", "LumaMode");
if (pedited) {
@@ -6994,7 +7124,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("RGB Curves", "rCurve")) {
rgbCurves.rcurve = keyFile.get_double_list ("RGB Curves", "rCurve");
- avoidEmptyCurve(rgbCurves.rcurve);
+ avoidEmptyCurve (rgbCurves.rcurve);
+
if (pedited) {
pedited->rgbCurves.rcurve = true;
}
@@ -7002,24 +7133,26 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("RGB Curves", "gCurve")) {
rgbCurves.gcurve = keyFile.get_double_list ("RGB Curves", "gCurve");
- avoidEmptyCurve(rgbCurves.gcurve);
+ avoidEmptyCurve (rgbCurves.gcurve);
+
if (pedited) {
pedited->rgbCurves.gcurve = true;
}
}
if (keyFile.has_key ("RGB Curves", "bCurve")) {
- rgbCurves.bcurve = keyFile.get_double_list ("RGB Curves", "bCurve");
- avoidEmptyCurve(rgbCurves.bcurve);
+ rgbCurves.bcurve = keyFile.get_double_list ("RGB Curves", "bCurve");
+ avoidEmptyCurve (rgbCurves.bcurve);
+
if (pedited) {
pedited->rgbCurves.bcurve = true;
}
}
}
- // load Color Toning
+// load Color Toning
if (keyFile.has_group ("ColorToning")) {
- if (keyFile.has_key ("ColorToning", "Enabled")) {
+ if (keyFile.has_key ("ColorToning", "Enabled")) {
colorToning.enabled = keyFile.get_boolean ("ColorToning", "Enabled");
if (pedited) {
@@ -7027,7 +7160,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Method")) {
+ if (keyFile.has_key ("ColorToning", "Method")) {
colorToning.method = keyFile.get_string ("ColorToning", "Method");
if (pedited) {
@@ -7035,7 +7168,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Lumamode")) {
+ if (keyFile.has_key ("ColorToning", "Lumamode")) {
colorToning.lumamode = keyFile.get_boolean ("ColorToning", "Lumamode");
if (pedited) {
@@ -7043,7 +7176,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Twocolor")) {
+ if (keyFile.has_key ("ColorToning", "Twocolor")) {
colorToning.twocolor = keyFile.get_string ("ColorToning", "Twocolor");
if (pedited) {
@@ -7051,23 +7184,25 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "OpacityCurve")) {
+ if (keyFile.has_key ("ColorToning", "OpacityCurve")) {
colorToning.opacityCurve = keyFile.get_double_list ("ColorToning", "OpacityCurve");
- avoidEmptyCurve(colorToning.opacityCurve);
+ avoidEmptyCurve (colorToning.opacityCurve);
+
if (pedited) {
pedited->colorToning.opacityCurve = true;
}
}
- if (keyFile.has_key ("ColorToning", "ColorCurve")) {
+ if (keyFile.has_key ("ColorToning", "ColorCurve")) {
colorToning.colorCurve = keyFile.get_double_list ("ColorToning", "ColorCurve");
- avoidEmptyCurve(colorToning.colorCurve);
+ avoidEmptyCurve (colorToning.colorCurve);
+
if (pedited) {
pedited->colorToning.colorCurve = true;
}
}
- if (keyFile.has_key ("ColorToning", "Autosat")) {
+ if (keyFile.has_key ("ColorToning", "Autosat")) {
colorToning.autosat = keyFile.get_boolean ("ColorToning", "Autosat");
if (pedited) {
@@ -7075,7 +7210,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "SatProtectionThreshold")) {
+ if (keyFile.has_key ("ColorToning", "SatProtectionThreshold")) {
colorToning.satProtectionThreshold = keyFile.get_integer ("ColorToning", "SatProtectionThreshold");
if (pedited) {
@@ -7083,7 +7218,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "SaturatedOpacity")) {
+ if (keyFile.has_key ("ColorToning", "SaturatedOpacity")) {
colorToning.saturatedOpacity = keyFile.get_integer ("ColorToning", "SaturatedOpacity");
if (pedited) {
@@ -7091,7 +7226,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Strength")) {
+ if (keyFile.has_key ("ColorToning", "Strength")) {
colorToning.strength = keyFile.get_integer ("ColorToning", "Strength");
if (pedited) {
@@ -7101,8 +7236,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("ColorToning", "HighlightsColorSaturation")) {
const std::vector thresh = keyFile.get_integer_list ("ColorToning", "HighlightsColorSaturation");
- if(thresh.size() >= 2) {
- colorToning.hlColSat.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ colorToning.hlColSat.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -7112,8 +7248,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("ColorToning", "ShadowsColorSaturation")) {
const std::vector thresh = keyFile.get_integer_list ("ColorToning", "ShadowsColorSaturation");
- if(thresh.size() >= 2) {
- colorToning.shadowsColSat.setValues(thresh[0], thresh[1]);
+
+ if (thresh.size() >= 2) {
+ colorToning.shadowsColSat.setValues (thresh[0], thresh[1]);
}
if (pedited) {
@@ -7121,23 +7258,25 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "ClCurve")) {
+ if (keyFile.has_key ("ColorToning", "ClCurve")) {
colorToning.clcurve = keyFile.get_double_list ("ColorToning", "ClCurve");
- avoidEmptyCurve(colorToning.clcurve);
+ avoidEmptyCurve (colorToning.clcurve);
+
if (pedited) {
pedited->colorToning.clcurve = true;
}
}
- if (keyFile.has_key ("ColorToning", "Cl2Curve")) {
+ if (keyFile.has_key ("ColorToning", "Cl2Curve")) {
colorToning.cl2curve = keyFile.get_double_list ("ColorToning", "Cl2Curve");
- avoidEmptyCurve(colorToning.cl2curve);
+ avoidEmptyCurve (colorToning.cl2curve);
+
if (pedited) {
pedited->colorToning.cl2curve = true;
}
}
- if (keyFile.has_key ("ColorToning", "Redlow")) {
+ if (keyFile.has_key ("ColorToning", "Redlow")) {
colorToning.redlow = keyFile.get_double ("ColorToning", "Redlow");
if (pedited) {
@@ -7145,7 +7284,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Greenlow")) {
+ if (keyFile.has_key ("ColorToning", "Greenlow")) {
colorToning.greenlow = keyFile.get_double ("ColorToning", "Greenlow");
if (pedited) {
@@ -7153,7 +7292,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Bluelow")) {
+ if (keyFile.has_key ("ColorToning", "Bluelow")) {
colorToning.bluelow = keyFile.get_double ("ColorToning", "Bluelow");
if (pedited) {
@@ -7161,7 +7300,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Satlow")) {
+ if (keyFile.has_key ("ColorToning", "Satlow")) {
colorToning.satlow = keyFile.get_double ("ColorToning", "Satlow");
if (pedited) {
@@ -7169,7 +7308,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Balance")) {
+ if (keyFile.has_key ("ColorToning", "Balance")) {
colorToning.balance = keyFile.get_integer ("ColorToning", "Balance");
if (pedited) {
@@ -7177,7 +7316,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Sathigh")) {
+ if (keyFile.has_key ("ColorToning", "Sathigh")) {
colorToning.sathigh = keyFile.get_double ("ColorToning", "Sathigh");
if (pedited) {
@@ -7185,7 +7324,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Redmed")) {
+ if (keyFile.has_key ("ColorToning", "Redmed")) {
colorToning.redmed = keyFile.get_double ("ColorToning", "Redmed");
if (pedited) {
@@ -7193,7 +7332,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Greenmed")) {
+ if (keyFile.has_key ("ColorToning", "Greenmed")) {
colorToning.greenmed = keyFile.get_double ("ColorToning", "Greenmed");
if (pedited) {
@@ -7201,7 +7340,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Bluemed")) {
+ if (keyFile.has_key ("ColorToning", "Bluemed")) {
colorToning.bluemed = keyFile.get_double ("ColorToning", "Bluemed");
if (pedited) {
@@ -7209,7 +7348,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Redhigh")) {
+ if (keyFile.has_key ("ColorToning", "Redhigh")) {
colorToning.redhigh = keyFile.get_double ("ColorToning", "Redhigh");
if (pedited) {
@@ -7217,7 +7356,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Greenhigh")) {
+ if (keyFile.has_key ("ColorToning", "Greenhigh")) {
colorToning.greenhigh = keyFile.get_double ("ColorToning", "Greenhigh");
if (pedited) {
@@ -7225,7 +7364,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("ColorToning", "Bluehigh")) {
+ if (keyFile.has_key ("ColorToning", "Bluehigh")) {
colorToning.bluehigh = keyFile.get_double ("ColorToning", "Bluehigh");
if (pedited) {
@@ -7234,17 +7373,17 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // load raw settings
+// load raw settings
if (keyFile.has_group ("RAW")) {
- if (keyFile.has_key ("RAW", "DarkFrame")) {
- raw.dark_frame = expandRelativePath(fname, "", keyFile.get_string ("RAW", "DarkFrame" ));
+ if (keyFile.has_key ("RAW", "DarkFrame")) {
+ raw.dark_frame = expandRelativePath (fname, "", keyFile.get_string ("RAW", "DarkFrame" ));
if (pedited) {
pedited->raw.darkFrame = true;
}
}
- if (keyFile.has_key ("RAW", "DarkFrameAuto")) {
+ if (keyFile.has_key ("RAW", "DarkFrameAuto")) {
raw.df_autoselect = keyFile.get_boolean ("RAW", "DarkFrameAuto" );
if (pedited) {
@@ -7252,32 +7391,32 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "FlatFieldFile")) {
- raw.ff_file = expandRelativePath(fname, "", keyFile.get_string ("RAW", "FlatFieldFile" ));
+ if (keyFile.has_key ("RAW", "FlatFieldFile")) {
+ raw.ff_file = expandRelativePath (fname, "", keyFile.get_string ("RAW", "FlatFieldFile" ));
if (pedited) {
pedited->raw.ff_file = true;
}
}
- if (keyFile.has_key ("RAW", "FlatFieldAutoSelect")) {
- raw.ff_AutoSelect = keyFile.get_boolean ("RAW", "FlatFieldAutoSelect" );
+ if (keyFile.has_key ("RAW", "FlatFieldAutoSelect")) {
+ raw.ff_AutoSelect = keyFile.get_boolean ("RAW", "FlatFieldAutoSelect" );
if (pedited) {
pedited->raw.ff_AutoSelect = true;
}
}
- if (keyFile.has_key ("RAW", "FlatFieldBlurRadius")) {
- raw.ff_BlurRadius = keyFile.get_integer ("RAW", "FlatFieldBlurRadius" );
+ if (keyFile.has_key ("RAW", "FlatFieldBlurRadius")) {
+ raw.ff_BlurRadius = keyFile.get_integer ("RAW", "FlatFieldBlurRadius" );
if (pedited) {
pedited->raw.ff_BlurRadius = true;
}
}
- if (keyFile.has_key ("RAW", "FlatFieldBlurType")) {
- raw.ff_BlurType = keyFile.get_string ("RAW", "FlatFieldBlurType" );
+ if (keyFile.has_key ("RAW", "FlatFieldBlurType")) {
+ raw.ff_BlurType = keyFile.get_string ("RAW", "FlatFieldBlurType" );
if (pedited) {
pedited->raw.ff_BlurType = true;
@@ -7285,22 +7424,22 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "FlatFieldAutoClipControl")) {
- raw.ff_AutoClipControl = keyFile.get_boolean ("RAW", "FlatFieldAutoClipControl" );
+ raw.ff_AutoClipControl = keyFile.get_boolean ("RAW", "FlatFieldAutoClipControl" );
if (pedited) {
pedited->raw.ff_AutoClipControl = true;
}
}
- if (keyFile.has_key ("RAW", "FlatFieldClipControl")) {
- raw.ff_clipControl = keyFile.get_boolean ("RAW", "FlatFieldClipControl" );
+ if (keyFile.has_key ("RAW", "FlatFieldClipControl")) {
+ raw.ff_clipControl = keyFile.get_boolean ("RAW", "FlatFieldClipControl" );
if (pedited) {
pedited->raw.ff_clipControl = true;
}
}
- if (keyFile.has_key ("RAW", "CA")) {
+ if (keyFile.has_key ("RAW", "CA")) {
raw.ca_autocorrect = keyFile.get_boolean ("RAW", "CA" );
if (pedited) {
@@ -7308,7 +7447,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "CARed")) {
+ if (keyFile.has_key ("RAW", "CARed")) {
raw.cared = keyFile.get_double ("RAW", "CARed" );
if (pedited) {
@@ -7316,7 +7455,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "CABlue")) {
+ if (keyFile.has_key ("RAW", "CABlue")) {
raw.cablue = keyFile.get_double ("RAW", "CABlue" );
if (pedited) {
@@ -7324,8 +7463,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- // for compatibility to elder pp3 versions
- if (keyFile.has_key ("RAW", "HotDeadPixels")) {
+// for compatibility to elder pp3 versions
+ if (keyFile.has_key ("RAW", "HotDeadPixels")) {
raw.deadPixelFilter = raw.hotPixelFilter = keyFile.get_boolean ("RAW", "HotDeadPixels" );
if (pedited) {
@@ -7333,7 +7472,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "HotPixelFilter")) {
+ if (keyFile.has_key ("RAW", "HotPixelFilter")) {
raw.hotPixelFilter = keyFile.get_boolean ("RAW", "HotPixelFilter" );
if (pedited) {
@@ -7341,7 +7480,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "DeadPixelFilter")) {
+ if (keyFile.has_key ("RAW", "DeadPixelFilter")) {
raw.deadPixelFilter = keyFile.get_boolean ("RAW", "DeadPixelFilter" );
if (pedited) {
@@ -7349,7 +7488,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "HotDeadPixelThresh")) {
+ if (keyFile.has_key ("RAW", "HotDeadPixelThresh")) {
raw.hotdeadpix_thresh = keyFile.get_integer ("RAW", "HotDeadPixelThresh" );
if (pedited) {
@@ -7357,16 +7496,16 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "PreExposure")) {
- raw.expos = keyFile.get_double("RAW", "PreExposure");
+ if (keyFile.has_key ("RAW", "PreExposure")) {
+ raw.expos = keyFile.get_double ("RAW", "PreExposure");
if (pedited) {
pedited->raw.exPos = true;
}
}
- if (keyFile.has_key ("RAW", "PrePreserv")) {
- raw.preser = keyFile.get_double("RAW", "PrePreserv");
+ if (keyFile.has_key ("RAW", "PrePreserv")) {
+ raw.preser = keyFile.get_double ("RAW", "PrePreserv");
if (pedited) {
pedited->raw.exPreser = true;
@@ -7374,7 +7513,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (ppVersion < 320) {
- if (keyFile.has_key ("RAW", "Method")) {
+ if (keyFile.has_key ("RAW", "Method")) {
raw.bayersensor.method = keyFile.get_string ("RAW", "Method");
if (pedited) {
@@ -7382,15 +7521,15 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "CcSteps")) {
- raw.bayersensor.ccSteps = keyFile.get_integer ("RAW", "CcSteps");
+ if (keyFile.has_key ("RAW", "CcSteps")) {
+ raw.bayersensor.ccSteps = keyFile.get_integer ("RAW", "CcSteps");
if (pedited) {
pedited->raw.bayersensor.ccSteps = true;
}
}
- if (keyFile.has_key ("RAW", "LineDenoise")) {
+ if (keyFile.has_key ("RAW", "LineDenoise")) {
raw.bayersensor.linenoise = keyFile.get_integer ("RAW", "LineDenoise" );
if (pedited) {
@@ -7406,77 +7545,77 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW", "DCBIterations")) {
- raw.bayersensor.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations");
+ if (keyFile.has_key ("RAW", "DCBIterations")) {
+ raw.bayersensor.dcb_iterations = keyFile.get_integer ("RAW", "DCBIterations");
if (pedited) {
pedited->raw.bayersensor.dcbIterations = true;
}
}
- if (keyFile.has_key ("RAW", "DCBEnhance")) {
- raw.bayersensor.dcb_enhance = keyFile.get_boolean("RAW", "DCBEnhance");
+ if (keyFile.has_key ("RAW", "DCBEnhance")) {
+ raw.bayersensor.dcb_enhance = keyFile.get_boolean ("RAW", "DCBEnhance");
if (pedited) {
pedited->raw.bayersensor.dcbEnhance = true;
}
}
- if (keyFile.has_key ("RAW", "LMMSEIterations")) {
- raw.bayersensor.lmmse_iterations = keyFile.get_integer("RAW", "LMMSEIterations");
+ if (keyFile.has_key ("RAW", "LMMSEIterations")) {
+ raw.bayersensor.lmmse_iterations = keyFile.get_integer ("RAW", "LMMSEIterations");
if (pedited) {
pedited->raw.bayersensor.lmmseIterations = true;
}
}
- if (keyFile.has_key ("RAW", "PreBlackzero")) {
- raw.bayersensor.black0 = keyFile.get_double("RAW", "PreBlackzero");
+ if (keyFile.has_key ("RAW", "PreBlackzero")) {
+ raw.bayersensor.black0 = keyFile.get_double ("RAW", "PreBlackzero");
if (pedited) {
pedited->raw.bayersensor.exBlack0 = true;
}
}
- if (keyFile.has_key ("RAW", "PreBlackone")) {
- raw.bayersensor.black1 = keyFile.get_double("RAW", "PreBlackone");
+ if (keyFile.has_key ("RAW", "PreBlackone")) {
+ raw.bayersensor.black1 = keyFile.get_double ("RAW", "PreBlackone");
if (pedited) {
pedited->raw.bayersensor.exBlack1 = true;
}
}
- if (keyFile.has_key ("RAW", "PreBlacktwo")) {
- raw.bayersensor.black2 = keyFile.get_double("RAW", "PreBlacktwo");
+ if (keyFile.has_key ("RAW", "PreBlacktwo")) {
+ raw.bayersensor.black2 = keyFile.get_double ("RAW", "PreBlacktwo");
if (pedited) {
pedited->raw.bayersensor.exBlack2 = true;
}
}
- if (keyFile.has_key ("RAW", "PreBlackthree")) {
- raw.bayersensor.black3 = keyFile.get_double("RAW", "PreBlackthree");
+ if (keyFile.has_key ("RAW", "PreBlackthree")) {
+ raw.bayersensor.black3 = keyFile.get_double ("RAW", "PreBlackthree");
if (pedited) {
pedited->raw.bayersensor.exBlack3 = true;
}
}
- if (keyFile.has_key ("RAW", "PreTwoGreen")) {
- raw.bayersensor.twogreen = keyFile.get_boolean("RAW", "PreTwoGreen");
+ if (keyFile.has_key ("RAW", "PreTwoGreen")) {
+ raw.bayersensor.twogreen = keyFile.get_boolean ("RAW", "PreTwoGreen");
if (pedited) {
pedited->raw.bayersensor.exTwoGreen = true;
}
}
- //if (keyFile.has_key ("RAW", "ALLEnhance")) { raw.bayersensor.all_enhance = keyFile.get_boolean("RAW", "ALLEnhance"); if (pedited) pedited->raw.bayersensor.allEnhance = true; }
+//if (keyFile.has_key ("RAW", "ALLEnhance")) { raw.bayersensor.all_enhance = keyFile.get_boolean("RAW", "ALLEnhance"); if (pedited) pedited->raw.bayersensor.allEnhance = true; }
}
}
// load Bayer sensors' raw settings
if (keyFile.has_group ("RAW Bayer")) {
- if (keyFile.has_key ("RAW Bayer", "Method")) {
+ if (keyFile.has_key ("RAW Bayer", "Method")) {
raw.bayersensor.method = keyFile.get_string ("RAW Bayer", "Method");
if (pedited) {
@@ -7484,7 +7623,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW Bayer", "ImageNum")) {
+ if (keyFile.has_key ("RAW Bayer", "ImageNum")) {
raw.bayersensor.imageNum = keyFile.get_integer ("RAW Bayer", "ImageNum") - 1;
if (pedited) {
@@ -7492,55 +7631,55 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW Bayer", "CcSteps")) {
- raw.bayersensor.ccSteps = keyFile.get_integer ("RAW Bayer", "CcSteps");
+ if (keyFile.has_key ("RAW Bayer", "CcSteps")) {
+ raw.bayersensor.ccSteps = keyFile.get_integer ("RAW Bayer", "CcSteps");
if (pedited) {
pedited->raw.bayersensor.ccSteps = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PreBlack0")) {
- raw.bayersensor.black0 = keyFile.get_double("RAW Bayer", "PreBlack0");
+ if (keyFile.has_key ("RAW Bayer", "PreBlack0")) {
+ raw.bayersensor.black0 = keyFile.get_double ("RAW Bayer", "PreBlack0");
if (pedited) {
pedited->raw.bayersensor.exBlack0 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PreBlack1")) {
- raw.bayersensor.black1 = keyFile.get_double("RAW Bayer", "PreBlack1");
+ if (keyFile.has_key ("RAW Bayer", "PreBlack1")) {
+ raw.bayersensor.black1 = keyFile.get_double ("RAW Bayer", "PreBlack1");
if (pedited) {
pedited->raw.bayersensor.exBlack1 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PreBlack2")) {
- raw.bayersensor.black2 = keyFile.get_double("RAW Bayer", "PreBlack2");
+ if (keyFile.has_key ("RAW Bayer", "PreBlack2")) {
+ raw.bayersensor.black2 = keyFile.get_double ("RAW Bayer", "PreBlack2");
if (pedited) {
pedited->raw.bayersensor.exBlack2 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PreBlack3")) {
- raw.bayersensor.black3 = keyFile.get_double("RAW Bayer", "PreBlack3");
+ if (keyFile.has_key ("RAW Bayer", "PreBlack3")) {
+ raw.bayersensor.black3 = keyFile.get_double ("RAW Bayer", "PreBlack3");
if (pedited) {
pedited->raw.bayersensor.exBlack3 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PreTwoGreen")) {
- raw.bayersensor.twogreen = keyFile.get_boolean("RAW Bayer", "PreTwoGreen");
+ if (keyFile.has_key ("RAW Bayer", "PreTwoGreen")) {
+ raw.bayersensor.twogreen = keyFile.get_boolean ("RAW Bayer", "PreTwoGreen");
if (pedited) {
pedited->raw.bayersensor.exTwoGreen = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "LineDenoise")) {
+ if (keyFile.has_key ("RAW Bayer", "LineDenoise")) {
raw.bayersensor.linenoise = keyFile.get_integer ("RAW Bayer", "LineDenoise" );
if (pedited) {
@@ -7556,264 +7695,264 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW Bayer", "DCBIterations")) {
- raw.bayersensor.dcb_iterations = keyFile.get_integer("RAW Bayer", "DCBIterations");
+ if (keyFile.has_key ("RAW Bayer", "DCBIterations")) {
+ raw.bayersensor.dcb_iterations = keyFile.get_integer ("RAW Bayer", "DCBIterations");
if (pedited) {
pedited->raw.bayersensor.dcbIterations = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "DCBEnhance")) {
- raw.bayersensor.dcb_enhance = keyFile.get_boolean("RAW Bayer", "DCBEnhance");
+ if (keyFile.has_key ("RAW Bayer", "DCBEnhance")) {
+ raw.bayersensor.dcb_enhance = keyFile.get_boolean ("RAW Bayer", "DCBEnhance");
if (pedited) {
pedited->raw.bayersensor.dcbEnhance = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "LMMSEIterations")) {
- raw.bayersensor.lmmse_iterations = keyFile.get_integer("RAW Bayer", "LMMSEIterations");
+ if (keyFile.has_key ("RAW Bayer", "LMMSEIterations")) {
+ raw.bayersensor.lmmse_iterations = keyFile.get_integer ("RAW Bayer", "LMMSEIterations");
if (pedited) {
pedited->raw.bayersensor.lmmseIterations = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftMotion")) {
- raw.bayersensor.pixelShiftMotion = keyFile.get_integer("RAW Bayer", "PixelShiftMotion");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftMotion")) {
+ raw.bayersensor.pixelShiftMotion = keyFile.get_integer ("RAW Bayer", "PixelShiftMotion");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMotion = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrection")) {
- raw.bayersensor.pixelShiftMotionCorrection = (RAWParams::BayerSensor::ePSMotionCorrection)keyFile.get_integer("RAW Bayer", "PixelShiftMotionCorrection");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrection")) {
+ raw.bayersensor.pixelShiftMotionCorrection = (RAWParams::BayerSensor::ePSMotionCorrection)keyFile.get_integer ("RAW Bayer", "PixelShiftMotionCorrection");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMotionCorrection = true;
}
}
-
- if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrectionMethod")) {
- raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::ePSMotionCorrectionMethod)keyFile.get_integer("RAW Bayer", "PixelShiftMotionCorrectionMethod");
+
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrectionMethod")) {
+ raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::ePSMotionCorrectionMethod)keyFile.get_integer ("RAW Bayer", "PixelShiftMotionCorrectionMethod");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMotionCorrectionMethod = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorGreen")) {
- raw.bayersensor.pixelShiftStddevFactorGreen = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorGreen");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorGreen")) {
+ raw.bayersensor.pixelShiftStddevFactorGreen = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorGreen");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorGreen = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorRed")) {
- raw.bayersensor.pixelShiftStddevFactorRed = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorRed");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorRed")) {
+ raw.bayersensor.pixelShiftStddevFactorRed = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorRed");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorRed = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorBlue")) {
- raw.bayersensor.pixelShiftStddevFactorBlue = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorBlue");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorBlue")) {
+ raw.bayersensor.pixelShiftStddevFactorBlue = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorBlue");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorBlue = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftEperIso")) {
- raw.bayersensor.pixelShiftEperIso = keyFile.get_double("RAW Bayer", "PixelShiftEperIso");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftEperIso")) {
+ raw.bayersensor.pixelShiftEperIso = keyFile.get_double ("RAW Bayer", "PixelShiftEperIso");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEperIso = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftNreadIso")) {
- raw.bayersensor.pixelShiftNreadIso = keyFile.get_double("RAW Bayer", "PixelShiftNreadIso");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftNreadIso")) {
+ raw.bayersensor.pixelShiftNreadIso = keyFile.get_double ("RAW Bayer", "PixelShiftNreadIso");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNreadIso = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftPrnu")) {
- raw.bayersensor.pixelShiftPrnu = keyFile.get_double("RAW Bayer", "PixelShiftPrnu");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftPrnu")) {
+ raw.bayersensor.pixelShiftPrnu = keyFile.get_double ("RAW Bayer", "PixelShiftPrnu");
if (pedited) {
pedited->raw.bayersensor.pixelShiftPrnu = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftSigma")) {
- raw.bayersensor.pixelShiftSigma = keyFile.get_double("RAW Bayer", "PixelShiftSigma");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftSigma")) {
+ raw.bayersensor.pixelShiftSigma = keyFile.get_double ("RAW Bayer", "PixelShiftSigma");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSigma = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftSum")) {
- raw.bayersensor.pixelShiftSum = keyFile.get_double("RAW Bayer", "PixelShiftSum");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftSum")) {
+ raw.bayersensor.pixelShiftSum = keyFile.get_double ("RAW Bayer", "PixelShiftSum");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSum = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftRedBlueWeight")) {
- raw.bayersensor.pixelShiftRedBlueWeight = keyFile.get_double("RAW Bayer", "PixelShiftRedBlueWeight");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftRedBlueWeight")) {
+ raw.bayersensor.pixelShiftRedBlueWeight = keyFile.get_double ("RAW Bayer", "PixelShiftRedBlueWeight");
if (pedited) {
pedited->raw.bayersensor.pixelShiftRedBlueWeight = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotion")) {
- raw.bayersensor.pixelShiftShowMotion = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotion");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotion")) {
+ raw.bayersensor.pixelShiftShowMotion = keyFile.get_boolean ("RAW Bayer", "PixelShiftShowMotion");
if (pedited) {
pedited->raw.bayersensor.pixelShiftShowMotion = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotionMaskOnly")) {
- raw.bayersensor.pixelShiftShowMotionMaskOnly = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotionMaskOnly");
+ if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotionMaskOnly")) {
+ raw.bayersensor.pixelShiftShowMotionMaskOnly = keyFile.get_boolean ("RAW Bayer", "PixelShiftShowMotionMaskOnly");
if (pedited) {
pedited->raw.bayersensor.pixelShiftShowMotionMaskOnly = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftAutomatic")) {
- raw.bayersensor.pixelShiftAutomatic = keyFile.get_boolean("RAW Bayer", "pixelShiftAutomatic");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftAutomatic")) {
+ raw.bayersensor.pixelShiftAutomatic = keyFile.get_boolean ("RAW Bayer", "pixelShiftAutomatic");
if (pedited) {
pedited->raw.bayersensor.pixelShiftAutomatic = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenHorizontal")) {
- raw.bayersensor.pixelShiftNonGreenHorizontal = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenHorizontal");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenHorizontal")) {
+ raw.bayersensor.pixelShiftNonGreenHorizontal = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenHorizontal");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenHorizontal = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenVertical")) {
- raw.bayersensor.pixelShiftNonGreenVertical = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenVertical");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenVertical")) {
+ raw.bayersensor.pixelShiftNonGreenVertical = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenVertical");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenVertical = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftHoleFill")) {
- raw.bayersensor.pixelShiftHoleFill = keyFile.get_boolean("RAW Bayer", "pixelShiftHoleFill");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftHoleFill")) {
+ raw.bayersensor.pixelShiftHoleFill = keyFile.get_boolean ("RAW Bayer", "pixelShiftHoleFill");
if (pedited) {
pedited->raw.bayersensor.pixelShiftHoleFill = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian")) {
- raw.bayersensor.pixelShiftMedian = keyFile.get_boolean("RAW Bayer", "pixelShiftMedian");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian")) {
+ raw.bayersensor.pixelShiftMedian = keyFile.get_boolean ("RAW Bayer", "pixelShiftMedian");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMedian = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian3")) {
- raw.bayersensor.pixelShiftMedian3 = keyFile.get_boolean("RAW Bayer", "pixelShiftMedian3");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian3")) {
+ raw.bayersensor.pixelShiftMedian3 = keyFile.get_boolean ("RAW Bayer", "pixelShiftMedian3");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMedian3 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftGreen")) {
- raw.bayersensor.pixelShiftGreen = keyFile.get_boolean("RAW Bayer", "pixelShiftGreen");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftGreen")) {
+ raw.bayersensor.pixelShiftGreen = keyFile.get_boolean ("RAW Bayer", "pixelShiftGreen");
if (pedited) {
pedited->raw.bayersensor.pixelShiftGreen = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftBlur")) {
- raw.bayersensor.pixelShiftBlur = keyFile.get_boolean("RAW Bayer", "pixelShiftBlur");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftBlur")) {
+ raw.bayersensor.pixelShiftBlur = keyFile.get_boolean ("RAW Bayer", "pixelShiftBlur");
if (pedited) {
pedited->raw.bayersensor.pixelShiftBlur = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftSmoothFactor")) {
- raw.bayersensor.pixelShiftSmoothFactor = keyFile.get_double("RAW Bayer", "pixelShiftSmoothFactor");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftSmoothFactor")) {
+ raw.bayersensor.pixelShiftSmoothFactor = keyFile.get_double ("RAW Bayer", "pixelShiftSmoothFactor");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSmooth = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftExp0")) {
- raw.bayersensor.pixelShiftExp0 = keyFile.get_boolean("RAW Bayer", "pixelShiftExp0");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftExp0")) {
+ raw.bayersensor.pixelShiftExp0 = keyFile.get_boolean ("RAW Bayer", "pixelShiftExp0");
if (pedited) {
pedited->raw.bayersensor.pixelShiftExp0 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftLmmse")) {
- raw.bayersensor.pixelShiftLmmse = keyFile.get_boolean("RAW Bayer", "pixelShiftLmmse");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftLmmse")) {
+ raw.bayersensor.pixelShiftLmmse = keyFile.get_boolean ("RAW Bayer", "pixelShiftLmmse");
if (pedited) {
pedited->raw.bayersensor.pixelShiftLmmse = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBright")) {
- raw.bayersensor.pixelShiftEqualBright = keyFile.get_boolean("RAW Bayer", "pixelShiftEqualBright");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBright")) {
+ raw.bayersensor.pixelShiftEqualBright = keyFile.get_boolean ("RAW Bayer", "pixelShiftEqualBright");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEqualBright = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBrightChannel")) {
- raw.bayersensor.pixelShiftEqualBrightChannel = keyFile.get_boolean("RAW Bayer", "pixelShiftEqualBrightChannel");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBrightChannel")) {
+ raw.bayersensor.pixelShiftEqualBrightChannel = keyFile.get_boolean ("RAW Bayer", "pixelShiftEqualBrightChannel");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEqualBrightChannel = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross")) {
- raw.bayersensor.pixelShiftNonGreenCross = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenCross");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross")) {
+ raw.bayersensor.pixelShiftNonGreenCross = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenCross");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenCross = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross2")) {
- raw.bayersensor.pixelShiftNonGreenCross2 = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenCross2");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross2")) {
+ raw.bayersensor.pixelShiftNonGreenCross2 = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenCross2");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenCross2 = true;
}
}
- if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenAmaze")) {
- raw.bayersensor.pixelShiftNonGreenAmaze = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenAmaze");
+ if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenAmaze")) {
+ raw.bayersensor.pixelShiftNonGreenAmaze = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenAmaze");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenAmaze = true;
@@ -7823,7 +7962,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load X-Trans sensors' raw settings
if (keyFile.has_group ("RAW X-Trans")) {
- if (keyFile.has_key ("RAW X-Trans", "Method")) {
+ if (keyFile.has_key ("RAW X-Trans", "Method")) {
raw.xtranssensor.method = keyFile.get_string ("RAW X-Trans", "Method");
if (pedited) {
@@ -7831,32 +7970,32 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("RAW X-Trans", "CcSteps")) {
- raw.xtranssensor.ccSteps = keyFile.get_integer ("RAW X-Trans", "CcSteps");
+ if (keyFile.has_key ("RAW X-Trans", "CcSteps")) {
+ raw.xtranssensor.ccSteps = keyFile.get_integer ("RAW X-Trans", "CcSteps");
if (pedited) {
pedited->raw.xtranssensor.ccSteps = true;
}
}
- if (keyFile.has_key ("RAW X-Trans", "PreBlackRed")) {
- raw.xtranssensor.blackred = keyFile.get_double("RAW X-Trans", "PreBlackRed");
+ if (keyFile.has_key ("RAW X-Trans", "PreBlackRed")) {
+ raw.xtranssensor.blackred = keyFile.get_double ("RAW X-Trans", "PreBlackRed");
if (pedited) {
pedited->raw.xtranssensor.exBlackRed = true;
}
}
- if (keyFile.has_key ("RAW X-Trans", "PreBlackGreen")) {
- raw.xtranssensor.blackgreen = keyFile.get_double("RAW X-Trans", "PreBlackGreen");
+ if (keyFile.has_key ("RAW X-Trans", "PreBlackGreen")) {
+ raw.xtranssensor.blackgreen = keyFile.get_double ("RAW X-Trans", "PreBlackGreen");
if (pedited) {
pedited->raw.xtranssensor.exBlackGreen = true;
}
}
- if (keyFile.has_key ("RAW X-Trans", "PreBlackBlue")) {
- raw.xtranssensor.blackblue = keyFile.get_double("RAW X-Trans", "PreBlackBlue");
+ if (keyFile.has_key ("RAW X-Trans", "PreBlackBlue")) {
+ raw.xtranssensor.blackblue = keyFile.get_double ("RAW X-Trans", "PreBlackBlue");
if (pedited) {
pedited->raw.xtranssensor.exBlackBlue = true;
@@ -7896,7 +8035,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
for (unsigned int i = 0; i < keys.size(); i++) {
// does this key already exist?
- element = iptc.find(keys[i]);
+ element = iptc.find (keys[i]);
if (element != iptc.end()) {
// it already exist so we cleanup the values
@@ -7910,7 +8049,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
std::vector::iterator currLoadedTagValue = currIptc.begin();
currLoadedTagValue != currIptc.end();
++currLoadedTagValue) {
- iptc[keys[i]].push_back(currLoadedTagValue->data());
+ iptc[keys[i]].push_back (currLoadedTagValue->data());
}
if (pedited) {
@@ -7934,22 +8073,22 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
return 0;
}
-const Glib::ustring ColorManagementParams::NoICMString = Glib::ustring("No ICM: sRGB output");
+const Glib::ustring ColorManagementParams::NoICMString = Glib::ustring ("No ICM: sRGB output");
-bool operator==(const WaveletParams & a, const WaveletParams & b)
+bool operator== (const WaveletParams & a, const WaveletParams & b)
{
- if(a.enabled != b.enabled) {
+ if (a.enabled != b.enabled) {
return false;
}
- for(int i = 0; i < 9; i++) {
- if(a.c[i] != b.c[i]) {
+ for (int i = 0; i < 9; i++) {
+ if (a.c[i] != b.c[i]) {
return false;
}
}
- for(int i = 0; i < 9; i++) {
- if(a.ch[i] != b.ch[i]) {
+ for (int i = 0; i < 9; i++) {
+ if (a.ch[i] != b.ch[i]) {
return false;
}
}
@@ -7959,14 +8098,14 @@ bool operator==(const WaveletParams & a, const WaveletParams & b)
-bool operator==(const DirPyrEqualizerParams & a, const DirPyrEqualizerParams & b)
+bool operator== (const DirPyrEqualizerParams & a, const DirPyrEqualizerParams & b)
{
- if(a.enabled != b.enabled) {
+ if (a.enabled != b.enabled) {
return false;
}
- for(int i = 0; i < 6; i++) {
- if(a.mult[i] != b.mult[i]) {
+ for (int i = 0; i < 6; i++) {
+ if (a.mult[i] != b.mult[i]) {
return false;
}
}
@@ -8125,6 +8264,9 @@ bool ProcParams::operator== (const ProcParams& other)
&& colorappearance.contrast == other.colorappearance.contrast
&& colorappearance.qcontrast == other.colorappearance.qcontrast
&& colorappearance.colorh == other.colorappearance.colorh
+ && colorappearance.tempout == other.colorappearance.tempout
+ && colorappearance.greenout == other.colorappearance.greenout
+ && colorappearance.ybout == other.colorappearance.ybout
&& impulseDenoise.enabled == other.impulseDenoise.enabled
&& impulseDenoise.thresh == other.impulseDenoise.thresh
&& dirpyrDenoise.enabled == other.dirpyrDenoise.enabled
@@ -8211,9 +8353,9 @@ bool ProcParams::operator== (const ProcParams& other)
&& vignetting.strength == other.vignetting.strength
&& vignetting.centerX == other.vignetting.centerX
&& vignetting.centerY == other.vignetting.centerY
- && !memcmp (&chmixer.red, &other.chmixer.red, 3 * sizeof(int))
- && !memcmp (&chmixer.green, &other.chmixer.green, 3 * sizeof(int))
- && !memcmp (&chmixer.blue, &other.chmixer.blue, 3 * sizeof(int))
+ && !memcmp (&chmixer.red, &other.chmixer.red, 3 * sizeof (int))
+ && !memcmp (&chmixer.green, &other.chmixer.green, 3 * sizeof (int))
+ && !memcmp (&chmixer.blue, &other.chmixer.blue, 3 * sizeof (int))
&& blackwhite.mixerRed == other.blackwhite.mixerRed
&& blackwhite.mixerOrange == other.blackwhite.mixerOrange
&& blackwhite.mixerYellow == other.blackwhite.mixerYellow
@@ -8444,45 +8586,45 @@ bool ProcParams::operator== (const ProcParams& other)
bool ProcParams::operator!= (const ProcParams& other)
{
- return !(*this == other);
+ return ! (*this == other);
}
-PartialProfile::PartialProfile(bool createInstance, bool paramsEditedValue)
+PartialProfile::PartialProfile (bool createInstance, bool paramsEditedValue)
{
if (createInstance) {
pparams = new ProcParams();
- pedited = new ParamsEdited(paramsEditedValue);
+ pedited = new ParamsEdited (paramsEditedValue);
} else {
pparams = nullptr;
pedited = nullptr;
}
}
-PartialProfile::PartialProfile(ProcParams* pp, ParamsEdited* pe, bool fullCopy)
+PartialProfile::PartialProfile (ProcParams* pp, ParamsEdited* pe, bool fullCopy)
{
if (fullCopy && pp) {
- pparams = new ProcParams(*pp);
+ pparams = new ProcParams (*pp);
} else {
pparams = pp;
}
if (fullCopy && pe) {
- pedited = new ParamsEdited(*pe);
+ pedited = new ParamsEdited (*pe);
} else {
pedited = pe;
}
}
-PartialProfile::PartialProfile(const ProcParams* pp, const ParamsEdited* pe)
+PartialProfile::PartialProfile (const ProcParams* pp, const ParamsEdited* pe)
{
if (pp) {
- pparams = new ProcParams(*pp);
+ pparams = new ProcParams (*pp);
} else {
pparams = nullptr;
}
if (pe) {
- pedited = new ParamsEdited(*pe);
+ pedited = new ParamsEdited (*pe);
} else {
pedited = nullptr;
}
@@ -8503,7 +8645,7 @@ int PartialProfile::load (const Glib::ustring &fName)
} else if (fName == DEFPROFILE_DYNAMIC) {
return -1; // should not happen here
} else {
- return pparams->load(fName, pedited);
+ return pparams->load (fName, pedited);
}
}
@@ -8533,17 +8675,17 @@ void PartialProfile::clearGeneral ()
}
}
-const void PartialProfile::applyTo(ProcParams *destParams) const
+const void PartialProfile::applyTo (ProcParams *destParams) const
{
if (destParams && pparams && pedited) {
- pedited->combine(*destParams, *pparams, true);
+ pedited->combine (*destParams, *pparams, true);
}
}
-void PartialProfile::set(bool v)
+void PartialProfile::set (bool v)
{
if (pedited) {
- pedited->set(v);
+ pedited->set (v);
}
}
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 0f287abf4..39f6eeaee 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -73,8 +73,8 @@ public:
initEq1 = startAtOne;
value[0] = bottom;
value[1] = top;
- value[2] = T(0);
- value[3] = T(0);
+ value[2] = T (0);
+ value[3] = T (0);
_isDouble = false;
}
@@ -89,14 +89,14 @@ public:
}
// for convenience, since 'values' is public
- void setValues(T bottom, T top)
+ void setValues (T bottom, T top)
{
value[0] = bottom;
value[1] = top;
}
// for convenience, since 'values' is public
- void setValues(T bottomLeft, T topLeft, T bottomRight, T topRight)
+ void setValues (T bottomLeft, T topLeft, T bottomRight, T topRight)
{
value[0] = bottomLeft;
value[1] = topLeft;
@@ -113,64 +113,64 @@ public:
// RV: Type of the value on the X axis
// RV2: Type of the maximum value on the Y axis
template
- RT multiply(RV x, RV2 yMax) const
+ RT multiply (RV x, RV2 yMax) const
{
- double val = double(x);
+ double val = double (x);
if (initEq1) {
if (_isDouble) {
- if (val == double(value[2]) && double(value[2]) == double(value[3]))
+ if (val == double (value[2]) && double (value[2]) == double (value[3]))
// this handle the special case where the 2 right values are the same, then bottom one is sent back,
// useful if one wants to keep the bottom value even beyond the x max bound
{
- return RT(0.);
+ return RT (0.);
}
- if (val >= double(value[3])) {
- return RT(yMax);
+ if (val >= double (value[3])) {
+ return RT (yMax);
}
- if (val > double(value[2])) {
- return RT(double(yMax) * (val - double(value[2])) / (double(value[3]) - double(value[2])));
+ if (val > double (value[2])) {
+ return RT (double (yMax) * (val - double (value[2])) / (double (value[3]) - double (value[2])));
}
}
- if (val >= double(value[0])) {
- return RT(0);
+ if (val >= double (value[0])) {
+ return RT (0);
}
- if (val > double(value[1])) {
- return RT(double(yMax) * (1. - (val - double(value[0])) / (double(value[1]) - double(value[0]))));
+ if (val > double (value[1])) {
+ return RT (double (yMax) * (1. - (val - double (value[0])) / (double (value[1]) - double (value[0]))));
}
- return RT(yMax);
+ return RT (yMax);
} else {
if (_isDouble) {
- if (val == double(value[2]) && double(value[2]) == double(value[3]))
+ if (val == double (value[2]) && double (value[2]) == double (value[3]))
// this handle the special case where the 2 right values are the same, then top one is sent back,
// useful if one wants to keep the top value even beyond the x max bound
{
- return RT(yMax);
+ return RT (yMax);
}
- if (val >= double(value[2])) {
- return RT(0);
+ if (val >= double (value[2])) {
+ return RT (0);
}
- if (val > double(value[3])) {
- return RT(double(yMax) * (1. - (val - double(value[3])) / (double(value[2]) - double(value[3]))));
+ if (val > double (value[3])) {
+ return RT (double (yMax) * (1. - (val - double (value[3])) / (double (value[2]) - double (value[3]))));
}
}
- if (val >= double(value[1])) {
- return RT(yMax);
+ if (val >= double (value[1])) {
+ return RT (yMax);
}
- if (val > double(value[0])) {
- return RT(double(yMax) * (val - double(value[0])) / (double(value[1]) - double(value[0])));
+ if (val > double (value[0])) {
+ return RT (double (yMax) * (val - double (value[0])) / (double (value[1]) - double (value[0])));
}
- return RT(0);
+ return RT (0);
}
}
@@ -207,7 +207,7 @@ public:
}
}*/
- Threshold& operator =(const Threshold &rhs)
+ Threshold& operator = (const Threshold &rhs)
{
value[0] = rhs.value[0];
value[1] = rhs.value[1];
@@ -219,21 +219,21 @@ public:
}
template
- typename std::enable_if::value, bool>::type operator ==(const Threshold &rhs) const
+ typename std::enable_if::value, bool>::type operator == (const Threshold &rhs) const
{
if (_isDouble) {
- return std::fabs(value[0] - rhs.value[0]) < 1e-10
- && std::fabs(value[1] - rhs.value[1]) < 1e-10
- && std::fabs(value[2] - rhs.value[2]) < 1e-10
- && std::fabs(value[3] - rhs.value[3]) < 1e-10;
+ return std::fabs (value[0] - rhs.value[0]) < 1e-10
+ && std::fabs (value[1] - rhs.value[1]) < 1e-10
+ && std::fabs (value[2] - rhs.value[2]) < 1e-10
+ && std::fabs (value[3] - rhs.value[3]) < 1e-10;
} else {
- return std::fabs(value[0] - rhs.value[0]) < 1e-10
- && std::fabs(value[1] - rhs.value[1]) < 1e-10;
+ return std::fabs (value[0] - rhs.value[0]) < 1e-10
+ && std::fabs (value[1] - rhs.value[1]) < 1e-10;
}
}
template
- typename std::enable_if::value, bool>::type operator ==(const Threshold &rhs) const
+ typename std::enable_if::value, bool>::type operator == (const Threshold &rhs) const
{
if (_isDouble) {
return
@@ -288,7 +288,7 @@ public:
setDefaults();
}
void setDefaults();
- static bool HLReconstructionNecessary(LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw);
+ static bool HLReconstructionNecessary (LUTu &histRedRaw, LUTu &histGreenRaw, LUTu &histBlueRaw);
};
/**
* Parameters of Retinex
@@ -331,11 +331,11 @@ public:
bool medianmap;
RetinexParams ();
void setDefaults();
- void getCurves(RetinextransmissionCurve &transmissionCurveLUT, RetinexgaintransmissionCurve &gaintransmissionCurveLUT) const;
+ void getCurves (RetinextransmissionCurve &transmissionCurveLUT, RetinexgaintransmissionCurve &gaintransmissionCurveLUT) const;
- static void getDefaultgaintransmissionCurve(std::vector &curve);
+ static void getDefaultgaintransmissionCurve (std::vector &curve);
- static void getDefaulttransmissionCurve(std::vector &curve);
+ static void getDefaulttransmissionCurve (std::vector &curve);
};
@@ -431,16 +431,16 @@ public:
ColorToningParams ();
void setDefaults(); // SHOULD BE GENERALIZED TO ALL CLASSES!
/// @brief Transform the mixer values to their curve equivalences
- void mixerToCurve(std::vector &colorCurve, std::vector &opacityCurve) const;
+ void mixerToCurve (std::vector &colorCurve, std::vector &opacityCurve) const;
/// @brief Specifically transform the sliders values to their curve equivalences
- void slidersToCurve(std::vector &colorCurve, std::vector &opacityCurve) const;
+ void slidersToCurve (std::vector &colorCurve, std::vector &opacityCurve) const;
/// @brief Fill the ColorGradientCurve and OpacityCurve LUTf from the control points curve or sliders value
- void getCurves(ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const;
+ void getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const;
- static void getDefaultColorCurve(std::vector &curve);
- static void getDefaultOpacityCurve(std::vector &curve);
- static void getDefaultCLCurve(std::vector &curve);
- static void getDefaultCL2Curve(std::vector &curve);
+ static void getDefaultColorCurve (std::vector &curve);
+ static void getDefaultOpacityCurve (std::vector &curve);
+ static void getDefaultCLCurve (std::vector &curve);
+ static void getDefaultCL2Curve (std::vector &curve);
};
/**
@@ -546,7 +546,7 @@ public:
double equal;
double tempBias;
- WBEntry(const Glib::ustring &p, enum WBTypes t, const Glib::ustring &l, int temp, double green, double equal, double bias) : ppLabel(p), type(t), GUILabel(l), temperature(temp), green(green), equal(equal), tempBias(bias) {};
+ WBEntry (const Glib::ustring &p, enum WBTypes t, const Glib::ustring &l, int temp, double green, double equal, double bias) : ppLabel (p), type (t), GUILabel (l), temperature (temp), green (green), equal (equal), tempBias (bias) {};
};
class WBParams
@@ -614,6 +614,10 @@ public:
// bool badpix;
bool datacie;
bool tonecie;
+ int tempout;
+ int ybout;
+ double greenout;
+
// bool sharpcie;
};
@@ -708,10 +712,10 @@ public:
DirPyrDenoiseParams ();
void setDefaults(); // SHOULD BE GENERALIZED TO ALL CLASSES!
- void getCurves(NoiseCurve &lCurve, NoiseCurve &cCurve) const;
+ void getCurves (NoiseCurve &lCurve, NoiseCurve &cCurve) const;
- static void getDefaultNoisCurve(std::vector &curve);
- static void getDefaultCCCurve(std::vector &curve);
+ static void getDefaultNoisCurve (std::vector &curve);
+ static void getDefaultCCCurve (std::vector &curve);
};
@@ -761,8 +765,8 @@ public:
Glib::ustring orientation;
Glib::ustring guide;
- CropParams() : enabled(false), x(0), y(0), w(0), h(0), fixratio(false) {};
- void mapToResized(int resizedWidth, int resizedHeight, int scale, int &x1, int &x2, int &y1, int &y2) const;
+ CropParams() : enabled (false), x (0), y (0), w (0), h (0), fixratio (false) {};
+ void mapToResized (int resizedWidth, int resizedHeight, int scale, int &x1, int &x2, int &y1, int &y2) const;
};
/**
@@ -1104,12 +1108,12 @@ public:
WaveletParams ();
void setDefaults();
- void getCurves(WavCurve &cCurve, WavOpacityCurveRG &opacityCurveLUTRG , WavOpacityCurveBY &opacityCurveLUTBY, WavOpacityCurveW &opacityCurveLUTW, WavOpacityCurveWL &opacityCurveLUTWL) const;
- static void getDefaultCCWCurve(std::vector &curve);
- static void getDefaultOpacityCurveRG(std::vector &curve);
- static void getDefaultOpacityCurveBY(std::vector &curve);
- static void getDefaultOpacityCurveW(std::vector &curve);
- static void getDefaultOpacityCurveWL(std::vector &curve);
+ void getCurves (WavCurve &cCurve, WavOpacityCurveRG &opacityCurveLUTRG, WavOpacityCurveBY &opacityCurveLUTBY, WavOpacityCurveW &opacityCurveLUTW, WavOpacityCurveWL &opacityCurveLUTWL) const;
+ static void getDefaultCCWCurve (std::vector &curve);
+ static void getDefaultOpacityCurveRG (std::vector &curve);
+ static void getDefaultOpacityCurveBY (std::vector &curve);
+ static void getDefaultOpacityCurveW (std::vector &curve);
+ static void getDefaultOpacityCurveWL (std::vector &curve);
};
@@ -1129,7 +1133,7 @@ public:
Threshold hueskin;
//Glib::ustring algo;
Glib::ustring cbdlMethod;
- DirPyrEqualizerParams() : hueskin(20, 80, 2000, 1200, false) {};
+ DirPyrEqualizerParams() : hueskin (20, 80, 2000, 1200, false) {};
};
/**
@@ -1420,7 +1424,7 @@ class PartialProfile
public:
rtengine::procparams::ProcParams* pparams;
ParamsEdited* pedited;
- PartialProfile& operator =(const PartialProfile& rhs)
+ PartialProfile& operator = (const PartialProfile& rhs)
{
pparams = rhs.pparams;
pedited = rhs.pedited;
@@ -1445,7 +1449,7 @@ public:
class AutoPartialProfile : public PartialProfile
{
public:
- AutoPartialProfile() : PartialProfile(true) {}
+ AutoPartialProfile() : PartialProfile (true) {}
~AutoPartialProfile()
{
deleteInstance();
diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc
index def53993c..af3dfafae 100644
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -501,7 +501,11 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DEMOSAIC, // EvPixelShiftSmooth
DEMOSAIC, // EvPixelShiftLmmse
DEMOSAIC, // EvPixelShiftEqualBright
- DEMOSAIC // EvPixelShiftEqualBrightChannel
+ DEMOSAIC, // EvPixelShiftEqualBrightChannel
+ LUMINANCECURVE, // EvCATtempout
+ LUMINANCECURVE, // EvCATgreenout
+ LUMINANCECURVE // EvCATybout
+
};
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 59bdb4b31..af45d50b6 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -21,9 +21,99 @@
#include "guiutils.h"
#include "../rtengine/color.h"
+#define MINTEMP0 1500 //1200
+#define MAXTEMP0 12000 //12000
+#define CENTERTEMP0 5000
+#define MINGREEN0 0.8
+#define MAXGREEN0 1.2
+
+
using namespace rtengine;
using namespace rtengine::procparams;
+static double wbSlider2Temp (double sval)
+{
+
+ // slider range: 0 - 10000
+ double temp;
+
+ if (sval <= 5000) {
+ // linear below center-temp
+ temp = MINTEMP0 + (sval / 5000.0) * (CENTERTEMP0 - MINTEMP0);
+ } else {
+ const double slope = (double) (CENTERTEMP0 - MINTEMP0) / (MAXTEMP0 - CENTERTEMP0);
+ double x = (sval - 5000) / 5000; // x 0..1
+ double y = x * slope + (1.0 - slope) * pow (x, 4.0);
+ //double y = pow(x, 4.0);
+ temp = CENTERTEMP0 + y * (MAXTEMP0 - CENTERTEMP0);
+ }
+
+ if (temp < MINTEMP0) {
+ temp = MINTEMP0;
+ }
+
+ if (temp > MAXTEMP0) {
+ temp = MAXTEMP0;
+ }
+
+ return temp;
+}
+
+static double wbTemp2Slider (double temp)
+{
+
+ double sval;
+
+ if (temp <= CENTERTEMP0) {
+ sval = ((temp - MINTEMP0) / (CENTERTEMP0 - MINTEMP0)) * 5000.0;
+ } else {
+ const double slope = (double) (CENTERTEMP0 - MINTEMP0) / (MAXTEMP0 - CENTERTEMP0);
+ const double y = (temp - CENTERTEMP0) / (MAXTEMP0 - CENTERTEMP0);
+ double x = pow (y, 0.25); // rough guess of x, will be a little lower
+ double k = 0.1;
+ bool add = true;
+
+ // the y=f(x) function is a mess to invert, therefore we have this trial-refinement loop instead.
+ // from tests, worst case is about 20 iterations, ie no problem
+ for (;;) {
+ double y1 = x * slope + (1.0 - slope) * pow (x, 4.0);
+
+ if (5000 * fabs (y1 - y) < 0.1) {
+ break;
+ }
+
+ if (y1 < y) {
+ if (!add) {
+ k /= 2;
+ }
+
+ x += k;
+ add = true;
+ } else {
+ if (add) {
+ k /= 2;
+ }
+
+ x -= k;
+ add = false;
+ }
+ }
+
+ sval = 5000.0 + x * 5000.0;
+ }
+
+ if (sval < 0) {
+ sval = 0;
+ }
+
+ if (sval > 10000) {
+ sval = 10000;
+ }
+
+ return sval;
+}
+
+
ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance", M ("TP_COLORAPP_LABEL"), false, true)
{
CurveListener::setMulti (true);
@@ -353,6 +443,24 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
adaplum->set_tooltip_markup (M ("TP_COLORAPP_ADAPTVIEWING_TOOLTIP"));
p3VBox->pack_start (*adaplum);
+ Gtk::Image* itempL = Gtk::manage (new RTImage ("ajd-wb-temp1.png"));
+ Gtk::Image* itempR = Gtk::manage (new RTImage ("ajd-wb-temp2.png"));
+ Gtk::Image* igreenL = Gtk::manage (new RTImage ("ajd-wb-green1.png"));
+ Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png"));
+// Gtk::Image* iblueredL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png"));
+// Gtk::Image* iblueredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png"));
+
+ tempout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempR, itempL, &wbSlider2Temp, &wbTemp2Slider));
+ greenout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_GREEN"), MINGREEN0, MAXGREEN0, 0.001, 1.0, igreenR, igreenL));
+ ybout = Gtk::manage (new Adjuster (M ("TP_COLORAPP_YB"), 5, 50, 1, 18));
+
+ tempout->show();
+ greenout->show();
+ ybout->show();
+ p3VBox->pack_start (*tempout);
+ p3VBox->pack_start (*greenout);
+ p3VBox->pack_start (*ybout);
+
Gtk::HBox* surrHBox = Gtk::manage (new Gtk::HBox ());
surrHBox->set_spacing (2);
surrHBox->set_tooltip_markup (M ("TP_COLORAPP_SURROUND_TOOLTIP"));
@@ -418,6 +526,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
contrast->setAdjusterListener (this);
qcontrast->setAdjusterListener (this);
rstprotection->setAdjusterListener (this);
+ tempout->setAdjusterListener (this);
+ greenout->setAdjusterListener (this);
+ ybout->setAdjusterListener (this);
+
show_all();
}
@@ -469,6 +581,9 @@ void ColorAppearance::read (const ProcParams* pp, const ParamsEdited* pedited)
schroma->setEditedState (pedited->colorappearance.schroma ? Edited : UnEdited);
mchroma->setEditedState (pedited->colorappearance.mchroma ? Edited : UnEdited);
rstprotection->setEditedState (pedited->colorappearance.rstprotection ? Edited : UnEdited);
+ tempout->setEditedState (pedited->colorappearance.tempout ? Edited : UnEdited);
+ greenout->setEditedState (pedited->colorappearance.greenout ? Edited : UnEdited);
+ ybout->setEditedState (pedited->colorappearance.ybout ? Edited : UnEdited);
contrast->setEditedState (pedited->colorappearance.contrast ? Edited : UnEdited);
qcontrast->setEditedState (pedited->colorappearance.qcontrast ? Edited : UnEdited);
colorh->setEditedState (pedited->colorappearance.colorh ? Edited : UnEdited);
@@ -599,6 +714,9 @@ void ColorAppearance::read (const ProcParams* pp, const ParamsEdited* pedited)
contrast->setValue (pp->colorappearance.contrast);
qcontrast->setValue (pp->colorappearance.qcontrast);
colorh->setValue (pp->colorappearance.colorh);
+ tempout->setValue (pp->colorappearance.tempout);
+ greenout->setValue (pp->colorappearance.greenout);
+ ybout->setValue (pp->colorappearance.ybout);
tcmode3conn.block (false);
tcmode2conn.block (false);
@@ -642,6 +760,9 @@ void ColorAppearance::write (ProcParams* pp, ParamsEdited* pedited)
pp->colorappearance.curve = shape->getCurve ();
pp->colorappearance.curve2 = shape2->getCurve ();
pp->colorappearance.curve3 = shape3->getCurve ();
+ pp->colorappearance.tempout = tempout->getValue ();
+ pp->colorappearance.greenout = greenout->getValue ();
+ pp->colorappearance.ybout = ybout->getValue ();
int tcMode = toneCurveMode->get_active_row_number();
@@ -701,6 +822,10 @@ void ColorAppearance::write (ProcParams* pp, ParamsEdited* pedited)
pedited->colorappearance.curveMode = toneCurveMode->get_active_row_number() != 2;
pedited->colorappearance.curveMode2 = toneCurveMode2->get_active_row_number() != 2;
pedited->colorappearance.curveMode3 = toneCurveMode3->get_active_row_number() != 3;
+ pedited->colorappearance.tempout = tempout->getEditedState ();
+ pedited->colorappearance.greenout = greenout->getEditedState ();
+ pedited->colorappearance.ybout = ybout->getEditedState ();
+
}
if (surround->get_active_row_number() == 0) {
@@ -971,6 +1096,9 @@ void ColorAppearance::setDefaults (const ProcParams* defParams, const ParamsEdit
contrast->setDefault (defParams->colorappearance.contrast);
qcontrast->setDefault (defParams->colorappearance.qcontrast);
colorh->setDefault (defParams->colorappearance.colorh);
+ tempout->setDefault (defParams->colorappearance.tempout);
+ greenout->setDefault (defParams->colorappearance.greenout);
+ ybout->setDefault (defParams->colorappearance.ybout);
if (pedited) {
degree->setDefaultEditedState (pedited->colorappearance.degree ? Edited : UnEdited);
@@ -986,6 +1114,9 @@ void ColorAppearance::setDefaults (const ProcParams* defParams, const ParamsEdit
contrast->setDefaultEditedState (pedited->colorappearance.contrast ? Edited : UnEdited);
qcontrast->setDefaultEditedState (pedited->colorappearance.qcontrast ? Edited : UnEdited);
colorh->setDefaultEditedState (pedited->colorappearance.colorh ? Edited : UnEdited);
+ tempout->setDefaultEditedState (pedited->colorappearance.tempout ? Edited : UnEdited);
+ greenout->setDefaultEditedState (pedited->colorappearance.greenout ? Edited : UnEdited);
+ ybout->setDefaultEditedState (pedited->colorappearance.ybout ? Edited : UnEdited);
} else {
degree->setDefaultEditedState (Irrelevant);
@@ -1001,6 +1132,9 @@ void ColorAppearance::setDefaults (const ProcParams* defParams, const ParamsEdit
qcontrast->setDefaultEditedState (Irrelevant);
rstprotection->setDefaultEditedState (Irrelevant);
colorh->setDefaultEditedState (Irrelevant);
+ tempout->setDefaultEditedState (Irrelevant);
+ greenout->setDefaultEditedState (Irrelevant);
+ ybout->setDefaultEditedState (Irrelevant);
}
}
@@ -1104,6 +1238,13 @@ void ColorAppearance::adjusterChanged (Adjuster* a, double newval)
listener->panelChanged (EvCAThue, a->getTextValue());
} else if (a == qcontrast) {
listener->panelChanged (EvCATQContrast, a->getTextValue());
+ } else if (a == tempout) {
+ listener->panelChanged (EvCATtempout, a->getTextValue());
+ } else if (a == greenout) {
+ listener->panelChanged (EvCATgreenout, a->getTextValue());
+ } else if (a == ybout) {
+ listener->panelChanged (EvCATybout, a->getTextValue());
+
}
}
@@ -1281,6 +1422,9 @@ void ColorAppearance::setBatchMode (bool batchMode)
contrast->showEditedCB ();
qcontrast->showEditedCB ();
colorh->showEditedCB ();
+ tempout->showEditedCB ();
+ greenout->showEditedCB ();
+ ybout->showEditedCB ();
surround->append (M ("GENERAL_UNCHANGED"));
wbmodel->append (M ("GENERAL_UNCHANGED"));
@@ -1337,4 +1481,8 @@ void ColorAppearance::trimValues (rtengine::procparams::ProcParams* pp)
contrast->trimValue (pp->colorappearance.contrast);
qcontrast->trimValue (pp->colorappearance.qcontrast);
colorh->trimValue (pp->colorappearance.colorh);
+ tempout->trimValue (pp->colorappearance.tempout);
+ greenout->trimValue (pp->colorappearance.greenout);
+ ybout->trimValue (pp->colorappearance.ybout);
+
}
diff --git a/rtgui/colorappearance.h b/rtgui/colorappearance.h
index e7b7e072d..5f433b556 100644
--- a/rtgui/colorappearance.h
+++ b/rtgui/colorappearance.h
@@ -29,12 +29,12 @@
#include "colorprovider.h"
class ColorAppearance final :
- public ToolParamBlock,
- public AdjusterListener,
- public FoldableToolPanel,
- public rtengine::AutoCamListener,
- public CurveListener,
- public ColorProvider
+ public ToolParamBlock,
+ public AdjusterListener,
+ public FoldableToolPanel,
+ public rtengine::AutoCamListener,
+ public CurveListener,
+ public ColorProvider
{
public:
ColorAppearance ();
@@ -80,8 +80,8 @@ public:
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller);
private:
- bool bgTTipQuery(int x, int y, bool keyboard_tooltip, const Glib::RefPtr& tooltip);
- bool srTTipQuery(int x, int y, bool keyboard_tooltip, const Glib::RefPtr& tooltip);
+ bool bgTTipQuery (int x, int y, bool keyboard_tooltip, const Glib::RefPtr& tooltip);
+ bool srTTipQuery (int x, int y, bool keyboard_tooltip, const Glib::RefPtr& tooltip);
Glib::RefPtr bgTTips;
Glib::RefPtr srTTips;
@@ -101,6 +101,10 @@ private:
Adjuster* contrast;
Adjuster* qcontrast;
Adjuster* colorh;
+ Adjuster* tempout;
+ Adjuster* greenout;
+ Adjuster* ybout;
+
MyComboBoxText* toneCurveMode;
MyComboBoxText* toneCurveMode2;
MyComboBoxText* toneCurveMode3;
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index c1760c1ff..bb5e77b42 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -1912,10 +1912,10 @@ bool EditorPanel::saveImmediately(const Glib::ustring &filename, const SaveForma
{
rtengine::procparams::ProcParams pparams;
ipc->getParams (&pparams);
- std::unique_ptr job(rtengine::ProcessingJob::create (ipc->getInitialImage(), pparams));
+ rtengine::ProcessingJob *job = rtengine::ProcessingJob::create(ipc->getInitialImage(), pparams);
// save immediately
- rtengine::IImage16 *img = rtengine::processImage(job.get(), err, nullptr, options.tunnelMetaData, false);
+ rtengine::IImage16 *img = rtengine::processImage(job, err, nullptr, options.tunnelMetaData, false);
int err = 0;
if (sf.format == "tif") {
diff --git a/rtgui/main.cc b/rtgui/main.cc
index 10cbe72b1..455749fdd 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -416,6 +416,19 @@ private:
RTWindow *rtWindow;
};
+void show_gimp_plugin_info_dialog(Gtk::Window *parent)
+{
+ if (options.gimpPluginShowInfoDialog) {
+ Gtk::MessageDialog info(*parent, M("GIMP_PLUGIN_INFO"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, true);
+ Gtk::Box *box = info.get_message_area();
+ Gtk::CheckButton dontshowagain(M("DONT_SHOW_AGAIN"));
+ dontshowagain.show();
+ box->pack_start(dontshowagain);
+ info.run();
+ options.gimpPluginShowInfoDialog = !dontshowagain.get_active();
+ }
+}
+
} // namespace
@@ -602,6 +615,9 @@ int main(int argc, char **argv)
Gtk::Main m(&argc, &argv);
gdk_threads_enter();
const std::unique_ptr rtWindow(create_rt_window());
+ if (gimpPlugin) {
+ show_gimp_plugin_info_dialog(rtWindow.get());
+ }
m.run(*rtWindow);
gdk_threads_leave();
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 07b0f81ad..9ee4b7538 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -46,7 +46,7 @@ Glib::ustring Options::rtdir;
Glib::ustring Options::cacheBaseDir;
Options options;
-Glib::ustring versionString = RTVERSION;
+Glib::ustring versionString = RTVERSION;
Glib::ustring paramFileExtension = ".pp3";
Options::Options ()
@@ -511,117 +511,117 @@ void Options::setDefaults ()
// Reminder: 0 = SET mode, 1 = ADD mode
baBehav = {
- 0, // ADDSET_TC_EXPCOMP
- 0, // ADDSET_TC_BRIGHTNESS
- 0, // ADDSET_TC_BLACKLEVEL
- 0, // ADDSET_TC_CONTRAST
- 0, // ADDSET_SH_HIGHLIGHTS
- 0, // ADDSET_SH_SHADOWS
- 0, // ADDSET_SH_LOCALCONTRAST
- 0, // ADDSET_LC_BRIGHTNESS
- 0, // ADDSET_LC_CONTRAST
- 0, // ADDSET_SHARP_AMOUNT
- 0, // ADDSET_WB_TEMPERATURE
- 0, // ADDSET_WB_GREEN
- 0, // ADDSET_ROTATE_DEGREE
- 0, // ADDSET_DIST_AMOUNT
- 0, // ADDSET_PERSPECTIVE
- 0, // ADDSET_CA
- 0, // ADDSET_VIGN_AMOUNT
- 0, // ADDSET_VIGN_RADIUS
- 0, // ADDSET_VIGN_STRENGTH
- 0, // ADDSET_VIGN_CENTER
- 0, // ADDSET_LC_CHROMATICITY
- 0, // ADDSET_TC_SATURATION
- 0, // ADDSET_TC_HLCOMPAMOUNT
- 0, // ADDSET_TC_HLCOMPTHRESH
- 0, // ADDSET_TC_SHCOMP
- 0, // ADDSET_DIRPYREQ
- 0, // ADDSET_DIRPYRDN_LUMA
- 0, // ADDSET_DIRPYRDN_LUDET
- 0, // ADDSET_DIRPYRDN_CHROMA
- 0, // ADDSET_DIRPYRDN_CHROMARED
- 0, // ADDSET_DIRPYRDN_CHROMABLUE
- 0, // ADDSET_DIRPYRDN_GAMMA
- 0, // ADDSET_CHMIXER
- 0, // ADDSET_PREPROCESS_GREENEQUIL
- 0, // ADDSET_PREPROCESS_LINEDENOISE
- 0, // ADDSET_RAWCACORR
- 0, // ADDSET_RAWEXPOS_LINEAR
- 0, // ADDSET_RAWEXPOS_PRESER
- 0, // ADDSET_RAWEXPOS_BLACKS
- 0, // ADDSET_SHARPENEDGE_AMOUNT
- 0, // ADDSET_SHARPENMICRO_AMOUNT
- 0, // ADDSET_SHARPENEDGE_PASS
- 0, // ADDSET_SHARPENMICRO_UNIFORMITY
- 0, // ADDSET_VIBRANCE_PASTELS
- 0, // ADDSET_VIBRANCE_SATURATED
- 0, // ADDSET_FREE_OUPUT_GAMMA
- 0, // ADDSET_FREE_OUTPUT_SLOPE
- 0, // ADDSET_CAT_DEGREE
- 0, // ADDSET_CAT_ADAPSCEN
- 0, // ADDSET_CAT_ADAPLUM
- 0, // ADDSET_CAT_LIGHT
- 0, // ADDSET_CAT_RSTPRO
- 0, // ADDSET_CAT_BADPIX
- 0, // ADDSET_CAT_JLIGHT
- 0, // ADDSET_CAT_CHROMA
- 0, // ADDSET_CAT_CONTRAST
- 0, // ADDSET_CAT_CHROMA_S
- 0, // ADDSET_CAT_CHROMA_M
- 0, // ADDSET_CAT_HUE
- 0, // ADDSET_CAT_BADPIX
- 0, // ADDSET_WB_EQUAL
- 0, // ADDSET_GRADIENT_DEGREE
- 0, // ADDSET_GRADIENT_FEATHER
- 0, // ADDSET_GRADIENT_STRENGTH
- 0, // ADDSET_GRADIENT_CENTER
- 0, // ADDSET_PCVIGNETTE_STRENGTH
- 0, // ADDSET_PCVIGNETTE_FEATHER
- 0, // ADDSET_PCVIGNETTE_ROUNDNESS
- 0, // ADDSET_BLACKWHITE_HUES
- 0, // ADDSET_BLACKWHITE_GAMMA
- 0, // ADDSET_DIRPYREQ_THRESHOLD
- 0, // ADDSET_DIRPYREQ_SKINPROTECT
- 0, // ADDSET_COLORTONING_SPLIT
- 0, // ADDSET_COLORTONING_SATTHRESHOLD
- 0, // ADDSET_COLORTONING_SATOPACITY
- 0, // ADDSET_COLORTONING_BALANCE
- 0, // ADDSET_COLORTONING_STRENGTH
- 0, // ADDSET_DIRPYRDN_PASSES
- 0, // ADDSET_RAWFFCLIPCONTROL
- 0, // ADDSET_FILMSIMULATION_STRENGTH
- 0, // ADDSET_WA
- 0, // ADDSET_WA_SKINPROTECT
- 0, // ADDSET_WA_THRESHOLD2
- 0, // ADDSET_WA_THRR
- 0, // ADDSET_WA_THRRH
- 0, // ADDSET_WA_THRESHOLD
- 0, // ADDSET_WA_THRESHOLD2
- 0, // ADDSET_WA_CHRO
- 0, // ADDSET_WA_CHROMA
- 0, // ADDSET_WA_CONTRAST
- 0, // ADDSET_WA_RESCON
- 0, // ADDSET_WA_RESCONH
- 0, // ADDSET_WA_RESCHRO
- 0, // ADDSET_WA_SKYPROTECT
- 0, // ADDSET_WA_EDGRAD
- 0, // ADDSET_WA_EDGVAL
- 0, // ADDSET_WA_STRENGTH
- 0, // ADDSET_WA_EDGEDETECT
- 0, // ADDSET_WA_EDGEDETECTTHR
- 0, // ADDSET_WA_EDGEDETECTTHR2
- 0, // ADDSET_WA_TMRS
- 0, // ADDSET_WA_GAMMA
- 0, // ADDSET_RETI_STR
- 0, // ADDSET_RETI_NEIGH
- 0, // ADDSET_RETI_LIMD
- 0, // ADDSET_RETI_GAIN
- 0, // ADDSET_RETI_OFFS
- 0, // ADDSET_RETI_VART
- 0, // ADDSET_RETI_GAM
- 0, // ADDSET_RETI_SLO
- 0, // ADDSET_WB_TEMPBIAS
+ 1, // ADDSET_TC_EXPCOMP
+ 1, // ADDSET_TC_BRIGHTNESS
+ 1, // ADDSET_TC_BLACKLEVEL
+ 1, // ADDSET_TC_CONTRAST
+ 1, // ADDSET_SH_HIGHLIGHTS
+ 1, // ADDSET_SH_SHADOWS
+ 1, // ADDSET_SH_LOCALCONTRAST
+ 1, // ADDSET_LC_BRIGHTNESS
+ 1, // ADDSET_LC_CONTRAST
+ 1, // ADDSET_SHARP_AMOUNT
+ 1, // ADDSET_WB_TEMPERATURE
+ 1, // ADDSET_WB_GREEN
+ 1, // ADDSET_ROTATE_DEGREE
+ 1, // ADDSET_DIST_AMOUNT
+ 1, // ADDSET_PERSPECTIVE
+ 1, // ADDSET_CA
+ 1, // ADDSET_VIGN_AMOUNT
+ 1, // ADDSET_VIGN_RADIUS
+ 1, // ADDSET_VIGN_STRENGTH
+ 1, // ADDSET_VIGN_CENTER
+ 1, // ADDSET_LC_CHROMATICITY
+ 1, // ADDSET_TC_SATURATION
+ 1, // ADDSET_TC_HLCOMPAMOUNT
+ 1, // ADDSET_TC_HLCOMPTHRESH
+ 1, // ADDSET_TC_SHCOMP
+ 1, // ADDSET_DIRPYREQ
+ 1, // ADDSET_DIRPYRDN_LUMA
+ 1, // ADDSET_DIRPYRDN_LUDET
+ 1, // ADDSET_DIRPYRDN_CHROMA
+ 1, // ADDSET_DIRPYRDN_CHROMARED
+ 1, // ADDSET_DIRPYRDN_CHROMABLUE
+ 1, // ADDSET_DIRPYRDN_GAMMA
+ 1, // ADDSET_CHMIXER
+ 1, // ADDSET_PREPROCESS_GREENEQUIL
+ 1, // ADDSET_PREPROCESS_LINEDENOISE
+ 1, // ADDSET_RAWCACORR
+ 1, // ADDSET_RAWEXPOS_LINEAR
+ 1, // ADDSET_RAWEXPOS_PRESER
+ 1, // ADDSET_RAWEXPOS_BLACKS
+ 1, // ADDSET_SHARPENEDGE_AMOUNT
+ 1, // ADDSET_SHARPENMICRO_AMOUNT
+ 1, // ADDSET_SHARPENEDGE_PASS
+ 1, // ADDSET_SHARPENMICRO_UNIFORMITY
+ 1, // ADDSET_VIBRANCE_PASTELS
+ 1, // ADDSET_VIBRANCE_SATURATED
+ 1, // ADDSET_FREE_OUPUT_GAMMA
+ 1, // ADDSET_FREE_OUTPUT_SLOPE
+ 1, // ADDSET_CAT_DEGREE
+ 1, // ADDSET_CAT_ADAPSCEN
+ 1, // ADDSET_CAT_ADAPLUM
+ 1, // ADDSET_CAT_LIGHT
+ 1, // ADDSET_CAT_RSTPRO
+ 1, // ADDSET_CAT_BADPIX
+ 1, // ADDSET_CAT_JLIGHT
+ 1, // ADDSET_CAT_CHROMA
+ 1, // ADDSET_CAT_CONTRAST
+ 1, // ADDSET_CAT_CHROMA_S
+ 1, // ADDSET_CAT_CHROMA_M
+ 1, // ADDSET_CAT_HUE
+ 1, // ADDSET_CAT_BADPIX
+ 1, // ADDSET_WB_EQUAL
+ 1, // ADDSET_GRADIENT_DEGREE
+ 1, // ADDSET_GRADIENT_FEATHER
+ 1, // ADDSET_GRADIENT_STRENGTH
+ 1, // ADDSET_GRADIENT_CENTER
+ 1, // ADDSET_PCVIGNETTE_STRENGTH
+ 1, // ADDSET_PCVIGNETTE_FEATHER
+ 1, // ADDSET_PCVIGNETTE_ROUNDNESS
+ 1, // ADDSET_BLACKWHITE_HUES
+ 1, // ADDSET_BLACKWHITE_GAMMA
+ 1, // ADDSET_DIRPYREQ_THRESHOLD
+ 1, // ADDSET_DIRPYREQ_SKINPROTECT
+ 1, // ADDSET_COLORTONING_SPLIT
+ 1, // ADDSET_COLORTONING_SATTHRESHOLD
+ 1, // ADDSET_COLORTONING_SATOPACITY
+ 1, // ADDSET_COLORTONING_BALANCE
+ 1, // ADDSET_COLORTONING_STRENGTH
+ 1, // ADDSET_DIRPYRDN_PASSES
+ 1, // ADDSET_RAWFFCLIPCONTROL
+ 1, // ADDSET_FILMSIMULATION_STRENGTH
+ 1, // ADDSET_WA
+ 1, // ADDSET_WA_SKINPROTECT
+ 1, // ADDSET_WA_THRESHOLD2
+ 1, // ADDSET_WA_THRR
+ 1, // ADDSET_WA_THRRH
+ 1, // ADDSET_WA_THRESHOLD
+ 1, // ADDSET_WA_THRESHOLD2
+ 1, // ADDSET_WA_CHRO
+ 1, // ADDSET_WA_CHROMA
+ 1, // ADDSET_WA_CONTRAST
+ 1, // ADDSET_WA_RESCON
+ 1, // ADDSET_WA_RESCONH
+ 1, // ADDSET_WA_RESCHRO
+ 1, // ADDSET_WA_SKYPROTECT
+ 1, // ADDSET_WA_EDGRAD
+ 1, // ADDSET_WA_EDGVAL
+ 1, // ADDSET_WA_STRENGTH
+ 1, // ADDSET_WA_EDGEDETECT
+ 1, // ADDSET_WA_EDGEDETECTTHR
+ 1, // ADDSET_WA_EDGEDETECTTHR2
+ 1, // ADDSET_WA_TMRS
+ 1, // ADDSET_WA_GAMMA
+ 1, // ADDSET_RETI_STR
+ 1, // ADDSET_RETI_NEIGH
+ 1, // ADDSET_RETI_LIMD
+ 1, // ADDSET_RETI_GAIN
+ 1, // ADDSET_RETI_OFFS
+ 1, // ADDSET_RETI_VART
+ 1, // ADDSET_RETI_GAM
+ 1, // ADDSET_RETI_SLO
+ 1, // ADDSET_WB_TEMPBIAS
};
rtSettings.darkFramesPath = "";
@@ -640,8 +640,8 @@ void Options::setDefaults ()
#else
rtSettings.iccDirectory = "/usr/share/color/icc";
#endif
- rtSettings.viewingdevice = 0;
- rtSettings.viewingdevicegrey = 3;
+// rtSettings.viewingdevice = 0;
+// rtSettings.viewingdevicegrey = 3;
rtSettings.viewinggreySc = 1;
rtSettings.leveldnv = 2;
rtSettings.leveldnti = 0;
@@ -724,6 +724,7 @@ void Options::setDefaults ()
lastProfilingReferenceDir = "";
lastBWCurvesDir = "";
lastLensProfileDir = "";
+ gimpPluginShowInfoDialog = true;
maxRecentFolders = 15;
}
@@ -764,7 +765,7 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("General", "StartupDirectory")) {
- if ( keyFile.get_string ("General", "StartupDirectory") == "home") {
+ if ( keyFile.get_string ("General", "StartupDirectory") == "home") {
startupDir = STARTUPDIR_HOME;
} else if ( keyFile.get_string ("General", "StartupDirectory") == "current") {
startupDir = STARTUPDIR_CURRENT;
@@ -776,19 +777,19 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("General", "StartupPath")) {
- startupPath = keyFile.get_string ("General", "StartupPath");
+ startupPath = keyFile.get_string ("General", "StartupPath");
}
if (keyFile.has_key ("General", "DateFormat")) {
- dateFormat = keyFile.get_string ("General", "DateFormat");
+ dateFormat = keyFile.get_string ("General", "DateFormat");
}
if (keyFile.has_key ("General", "AdjusterMinDelay")) {
- adjusterMinDelay = keyFile.get_integer ("General", "AdjusterMinDelay");
+ adjusterMinDelay = keyFile.get_integer ("General", "AdjusterMinDelay");
}
if (keyFile.has_key ("General", "AdjusterMaxDelay")) {
- adjusterMaxDelay = keyFile.get_integer ("General", "AdjusterMaxDelay");
+ adjusterMaxDelay = keyFile.get_integer ("General", "AdjusterMaxDelay");
}
if (keyFile.has_key ("General", "StoreLastProfile")) {
@@ -796,15 +797,15 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("General", "MultiUser")) {
- multiUser = keyFile.get_boolean ("General", "MultiUser");
+ multiUser = keyFile.get_boolean ("General", "MultiUser");
}
if (keyFile.has_key ("General", "Version")) {
- version = keyFile.get_string ("General", "Version");
+ version = keyFile.get_string ("General", "Version");
}
if (keyFile.has_key ("General", "Language")) {
- language = keyFile.get_string ("General", "Language");
+ language = keyFile.get_string ("General", "Language");
}
if (keyFile.has_key ("General", "LanguageAutoDetect")) {
@@ -812,7 +813,7 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("General", "Theme")) {
- theme = keyFile.get_string ("General", "Theme");
+ theme = keyFile.get_string ("General", "Theme");
}
if ( keyFile.has_key ("General", "DarkFramesPath")) {
@@ -828,39 +829,39 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("General", "BotLeft")) {
- rtSettings.bot_left = keyFile.get_double ("General", "BotLeft");
+ rtSettings.bot_left = keyFile.get_double ("General", "BotLeft");
}
if (keyFile.has_key ("General", "TopLeft")) {
- rtSettings.top_left = keyFile.get_double ("General", "TopLeft");
+ rtSettings.top_left = keyFile.get_double ("General", "TopLeft");
}
if (keyFile.has_key ("General", "TopRight")) {
- rtSettings.top_right = keyFile.get_double ("General", "TopRight");
+ rtSettings.top_right = keyFile.get_double ("General", "TopRight");
}
if (keyFile.has_key ("General", "BotRight")) {
- rtSettings.bot_right = keyFile.get_double ("General", "BotRight");
+ rtSettings.bot_right = keyFile.get_double ("General", "BotRight");
}
if (keyFile.has_key ("General", "EDdetec")) {
- rtSettings.ed_detec = keyFile.get_double ("General", "EDdetec");
+ rtSettings.ed_detec = keyFile.get_double ("General", "EDdetec");
}
if (keyFile.has_key ("General", "EDdetecStr")) {
- rtSettings.ed_detecStr = keyFile.get_double ("General", "EDdetecStr");
+ rtSettings.ed_detecStr = keyFile.get_double ("General", "EDdetecStr");
}
if (keyFile.has_key ("General", "EDLow")) {
- rtSettings.ed_low = keyFile.get_double ("General", "EDLow");
+ rtSettings.ed_low = keyFile.get_double ("General", "EDLow");
}
if (keyFile.has_key ("General", "EDLipinfl")) {
- rtSettings.ed_lipinfl = keyFile.get_double ("General", "EDLipinfl");
+ rtSettings.ed_lipinfl = keyFile.get_double ("General", "EDLipinfl");
}
if (keyFile.has_key ("General", "EDLipampl")) {
- rtSettings.ed_lipampl = keyFile.get_double ("General", "EDLipampl");
+ rtSettings.ed_lipampl = keyFile.get_double ("General", "EDLipampl");
}
@@ -868,45 +869,45 @@ int Options::readFromFile (Glib::ustring fname)
if (keyFile.has_group ("External Editor")) {
if (keyFile.has_key ("External Editor", "EditorKind")) {
- editorToSendTo = keyFile.get_integer ("External Editor", "EditorKind");
+ editorToSendTo = keyFile.get_integer ("External Editor", "EditorKind");
}
if (keyFile.has_key ("External Editor", "GimpDir")) {
- gimpDir = keyFile.get_string ("External Editor", "GimpDir");
+ gimpDir = keyFile.get_string ("External Editor", "GimpDir");
}
if (keyFile.has_key ("External Editor", "PhotoshopDir")) {
- psDir = keyFile.get_string ("External Editor", "PhotoshopDir");
+ psDir = keyFile.get_string ("External Editor", "PhotoshopDir");
}
if (keyFile.has_key ("External Editor", "CustomEditor")) {
- customEditorProg = keyFile.get_string ("External Editor", "CustomEditor");
+ customEditorProg = keyFile.get_string ("External Editor", "CustomEditor");
}
}
if (keyFile.has_group ("Output")) {
if (keyFile.has_key ("Output", "Format")) {
- saveFormat.format = keyFile.get_string ("Output", "Format");
+ saveFormat.format = keyFile.get_string ("Output", "Format");
}
if (keyFile.has_key ("Output", "JpegQuality")) {
- saveFormat.jpegQuality = keyFile.get_integer ("Output", "JpegQuality");
+ saveFormat.jpegQuality = keyFile.get_integer ("Output", "JpegQuality");
}
if (keyFile.has_key ("Output", "JpegSubSamp")) {
- saveFormat.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSamp");
+ saveFormat.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSamp");
}
if (keyFile.has_key ("Output", "PngCompression")) {
- saveFormat.pngCompression = keyFile.get_integer ("Output", "PngCompression");
+ saveFormat.pngCompression = keyFile.get_integer ("Output", "PngCompression");
}
if (keyFile.has_key ("Output", "PngBps")) {
- saveFormat.pngBits = keyFile.get_integer ("Output", "PngBps");
+ saveFormat.pngBits = keyFile.get_integer ("Output", "PngBps");
}
if (keyFile.has_key ("Output", "TiffBps")) {
- saveFormat.tiffBits = keyFile.get_integer ("Output", "TiffBps");
+ saveFormat.tiffBits = keyFile.get_integer ("Output", "TiffBps");
}
if (keyFile.has_key ("Output", "TiffUncompressed")) {
@@ -914,32 +915,32 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Output", "SaveProcParams")) {
- saveFormat.saveParams = keyFile.get_boolean ("Output", "SaveProcParams");
+ saveFormat.saveParams = keyFile.get_boolean ("Output", "SaveProcParams");
}
if (keyFile.has_key ("Output", "FormatBatch")) {
- saveFormatBatch.format = keyFile.get_string ("Output", "FormatBatch");
+ saveFormatBatch.format = keyFile.get_string ("Output", "FormatBatch");
}
if (keyFile.has_key ("Output", "JpegQualityBatch")) {
- saveFormatBatch.jpegQuality = keyFile.get_integer ("Output", "JpegQualityBatch");
+ saveFormatBatch.jpegQuality = keyFile.get_integer ("Output", "JpegQualityBatch");
}
if (keyFile.has_key ("Output", "JpegSubSampBatch")) {
- saveFormatBatch.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSampBatch");
+ saveFormatBatch.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSampBatch");
}
if (keyFile.has_key ("Output", "PngCompressionBatch")) {
- saveFormatBatch.pngCompression = keyFile.get_integer ("Output", "PngCompressionBatch");
+ saveFormatBatch.pngCompression = keyFile.get_integer ("Output", "PngCompressionBatch");
}
if (keyFile.has_key ("Output", "PngBpsBatch")) {
- saveFormatBatch.pngBits = keyFile.get_integer ("Output", "PngBpsBatch");
+ saveFormatBatch.pngBits = keyFile.get_integer ("Output", "PngBpsBatch");
}
if (keyFile.has_key ("Output", "TiffBpsBatch")) {
- saveFormatBatch.tiffBits = keyFile.get_integer ("Output", "TiffBpsBatch");
+ saveFormatBatch.tiffBits = keyFile.get_integer ("Output", "TiffBpsBatch");
}
if (keyFile.has_key ("Output", "TiffUncompressedBatch")) {
@@ -947,135 +948,135 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Output", "SaveProcParamsBatch")) {
- saveFormatBatch.saveParams = keyFile.get_boolean ("Output", "SaveProcParamsBatch");
+ saveFormatBatch.saveParams = keyFile.get_boolean ("Output", "SaveProcParamsBatch");
}
if (keyFile.has_key ("Output", "Path")) {
- savePathTemplate = keyFile.get_string ("Output", "Path");
+ savePathTemplate = keyFile.get_string ("Output", "Path");
}
if (keyFile.has_key ("Output", "PathTemplate")) {
- savePathTemplate = keyFile.get_string ("Output", "PathTemplate");
+ savePathTemplate = keyFile.get_string ("Output", "PathTemplate");
}
if (keyFile.has_key ("Output", "PathFolder")) {
- savePathFolder = keyFile.get_string ("Output", "PathFolder");
+ savePathFolder = keyFile.get_string ("Output", "PathFolder");
}
if (keyFile.has_key ("Output", "AutoSuffix")) {
- autoSuffix = keyFile.get_boolean ("Output", "AutoSuffix");
+ autoSuffix = keyFile.get_boolean ("Output", "AutoSuffix");
}
if (keyFile.has_key ("Output", "ForceFormatOpts")) {
- forceFormatOpts = keyFile.get_boolean ("Output", "ForceFormatOpts");
+ forceFormatOpts = keyFile.get_boolean ("Output", "ForceFormatOpts");
}
if (keyFile.has_key ("Output", "SaveMethodNum")) {
- saveMethodNum = keyFile.get_integer ("Output", "SaveMethodNum");
+ saveMethodNum = keyFile.get_integer ("Output", "SaveMethodNum");
}
if (keyFile.has_key ("Output", "UsePathTemplate")) {
- saveUsePathTemplate = keyFile.get_boolean ("Output", "UsePathTemplate");
+ saveUsePathTemplate = keyFile.get_boolean ("Output", "UsePathTemplate");
}
if (keyFile.has_key ("Output", "LastSaveAsPath")) {
- lastSaveAsPath = keyFile.get_string ("Output", "LastSaveAsPath");
+ lastSaveAsPath = keyFile.get_string ("Output", "LastSaveAsPath");
}
if (keyFile.has_key ("Output", "OverwriteOutputFile")) {
- overwriteOutputFile = keyFile.get_boolean ("Output", "OverwriteOutputFile");
+ overwriteOutputFile = keyFile.get_boolean ("Output", "OverwriteOutputFile");
}
if (keyFile.has_key ("Output", "TunnelMetaData")) {
- tunnelMetaData = keyFile.get_boolean ("Output", "TunnelMetaData");
+ tunnelMetaData = keyFile.get_boolean ("Output", "TunnelMetaData");
}
}
if (keyFile.has_group ("Profiles")) {
if (keyFile.has_key ("Profiles", "Directory")) {
- profilePath = keyFile.get_string ("Profiles", "Directory");
+ profilePath = keyFile.get_string ("Profiles", "Directory");
}
if (keyFile.has_key ("Profiles", "UseBundledProfiles")) {
- useBundledProfiles = keyFile.get_boolean ("Profiles", "UseBundledProfiles");
+ useBundledProfiles = keyFile.get_boolean ("Profiles", "UseBundledProfiles");
}
if (keyFile.has_key ("Profiles", "LoadSaveProfilePath")) {
- loadSaveProfilePath = keyFile.get_string ("Profiles", "LoadSaveProfilePath");
+ loadSaveProfilePath = keyFile.get_string ("Profiles", "LoadSaveProfilePath");
}
if (keyFile.has_key ("Profiles", "RawDefault")) {
- defProfRaw = keyFile.get_string ("Profiles", "RawDefault");
+ defProfRaw = keyFile.get_string ("Profiles", "RawDefault");
}
if (keyFile.has_key ("Profiles", "ImgDefault")) {
- defProfImg = keyFile.get_string ("Profiles", "ImgDefault");
+ defProfImg = keyFile.get_string ("Profiles", "ImgDefault");
}
if (keyFile.has_key ("Profiles", "FilledProfile")) {
- filledProfile = keyFile.get_boolean ("Profiles", "FilledProfile");
+ filledProfile = keyFile.get_boolean ("Profiles", "FilledProfile");
}
if (keyFile.has_key ("Profiles", "SaveParamsWithFile")) {
- saveParamsFile = keyFile.get_boolean ("Profiles", "SaveParamsWithFile");
+ saveParamsFile = keyFile.get_boolean ("Profiles", "SaveParamsWithFile");
}
if (keyFile.has_key ("Profiles", "SaveParamsToCache")) {
- saveParamsCache = keyFile.get_boolean ("Profiles", "SaveParamsToCache");
+ saveParamsCache = keyFile.get_boolean ("Profiles", "SaveParamsToCache");
}
if (keyFile.has_key ("Profiles", "LoadParamsFromLocation")) {
- paramsLoadLocation = (PPLoadLocation)keyFile.get_integer ("Profiles", "LoadParamsFromLocation");
+ paramsLoadLocation = (PPLoadLocation)keyFile.get_integer ("Profiles", "LoadParamsFromLocation");
}
if (keyFile.has_key ("Profiles", "CustomProfileBuilder")) {
- CPBPath = keyFile.get_string ("Profiles", "CustomProfileBuilder"); // for backward compatibility only
+ CPBPath = keyFile.get_string ("Profiles", "CustomProfileBuilder"); // for backward compatibility only
}
if (keyFile.has_key ("Profiles", "CustomProfileBuilderPath")) {
- CPBPath = keyFile.get_string ("Profiles", "CustomProfileBuilderPath");
+ CPBPath = keyFile.get_string ("Profiles", "CustomProfileBuilderPath");
}
if (keyFile.has_key ("Profiles", "CustomProfileBuilderKeys")) {
- CPBKeys = (CPBKeyType)keyFile.get_integer ("Profiles", "CustomProfileBuilderKeys");
+ CPBKeys = (CPBKeyType)keyFile.get_integer ("Profiles", "CustomProfileBuilderKeys");
}
}
if (keyFile.has_group ("File Browser")) {
if (keyFile.has_key ("File Browser", "ThumbnailSize")) {
- thumbSize = keyFile.get_integer ("File Browser", "ThumbnailSize");
+ thumbSize = keyFile.get_integer ("File Browser", "ThumbnailSize");
}
if (keyFile.has_key ("File Browser", "ThumbnailSizeTab")) {
- thumbSizeTab = keyFile.get_integer ("File Browser", "ThumbnailSizeTab");
+ thumbSizeTab = keyFile.get_integer ("File Browser", "ThumbnailSizeTab");
}
if (keyFile.has_key ("File Browser", "ThumbnailSizeQueue")) {
- thumbSizeQueue = keyFile.get_integer ("File Browser", "ThumbnailSizeQueue");
+ thumbSizeQueue = keyFile.get_integer ("File Browser", "ThumbnailSizeQueue");
}
if (keyFile.has_key ("File Browser", "SameThumbSize")) {
- sameThumbSize = keyFile.get_integer ("File Browser", "SameThumbSize");
+ sameThumbSize = keyFile.get_integer ("File Browser", "SameThumbSize");
}
if (keyFile.has_key ("File Browser", "BrowseOnlyRaw")) {
- fbOnlyRaw = keyFile.get_boolean ("File Browser", "BrowseOnlyRaw");
+ fbOnlyRaw = keyFile.get_boolean ("File Browser", "BrowseOnlyRaw");
}
if (keyFile.has_key ("File Browser", "BrowserShowsDate")) {
- fbShowDateTime = keyFile.get_boolean ("File Browser", "BrowserShowsDate");
+ fbShowDateTime = keyFile.get_boolean ("File Browser", "BrowserShowsDate");
}
if (keyFile.has_key ("File Browser", "BrowserShowsExif")) {
- fbShowBasicExif = keyFile.get_boolean ("File Browser", "BrowserShowsExif");
+ fbShowBasicExif = keyFile.get_boolean ("File Browser", "BrowserShowsExif");
}
if (keyFile.has_key ("File Browser", "BrowserShowsExpComp")) {
- fbShowExpComp = keyFile.get_boolean ("File Browser", "BrowserShowsExpComp");
+ fbShowExpComp = keyFile.get_boolean ("File Browser", "BrowserShowsExpComp");
}
if (keyFile.has_key ("File Browser", "BrowserShowsHidden")) {
- fbShowHidden = keyFile.get_boolean ("File Browser", "BrowserShowsHidden");
+ fbShowHidden = keyFile.get_boolean ("File Browser", "BrowserShowsHidden");
}
if (keyFile.has_key ("File Browser", "MaxPreviewHeight")) {
@@ -1083,31 +1084,31 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("File Browser", "MaxCacheEntries")) {
- maxCacheEntries = keyFile.get_integer ("File Browser", "MaxCacheEntries");
+ maxCacheEntries = keyFile.get_integer ("File Browser", "MaxCacheEntries");
}
if (keyFile.has_key ("File Browser", "ParseExtensions")) {
- parseExtensions = keyFile.get_string_list ("File Browser", "ParseExtensions");
+ parseExtensions = keyFile.get_string_list ("File Browser", "ParseExtensions");
}
if (keyFile.has_key ("File Browser", "ParseExtensionsEnabled")) {
- parseExtensionsEnabled = keyFile.get_integer_list ("File Browser", "ParseExtensionsEnabled");
+ parseExtensionsEnabled = keyFile.get_integer_list ("File Browser", "ParseExtensionsEnabled");
}
if (keyFile.has_key ("File Browser", "ThumbnailArrangement")) {
- fbArrangement = keyFile.get_integer ("File Browser", "ThumbnailArrangement");
+ fbArrangement = keyFile.get_integer ("File Browser", "ThumbnailArrangement");
}
if (keyFile.has_key ("File Browser", "ThumbnailInterpolation")) {
- thumbInterp = keyFile.get_integer ("File Browser", "ThumbnailInterpolation");
+ thumbInterp = keyFile.get_integer ("File Browser", "ThumbnailInterpolation");
}
if (keyFile.has_key ("File Browser", "FavoriteDirs")) {
- favoriteDirs = keyFile.get_string_list ("File Browser", "FavoriteDirs");
+ favoriteDirs = keyFile.get_string_list ("File Browser", "FavoriteDirs");
}
if (keyFile.has_key ("File Browser", "RenameTemplates")) {
- renameTemplates = keyFile.get_string_list ("File Browser", "RenameTemplates");
+ renameTemplates = keyFile.get_string_list ("File Browser", "RenameTemplates");
}
if (keyFile.has_key ("File Browser", "RenameUseTemplates")) {
@@ -1119,7 +1120,7 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("File Browser", "OverlayedFileNames")) {
- overlayedFileNames = keyFile.get_boolean ("File Browser", "OverlayedFileNames");
+ overlayedFileNames = keyFile.get_boolean ("File Browser", "OverlayedFileNames");
}
if (keyFile.has_key ("File Browser", "FilmStripOverlayedFileNames")) {
@@ -1127,45 +1128,45 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("File Browser", "ShowFileNames")) {
- showFileNames = keyFile.get_boolean ("File Browser", "ShowFileNames");
+ showFileNames = keyFile.get_boolean ("File Browser", "ShowFileNames");
}
if (keyFile.has_key ("File Browser", "FilmStripShowFileNames")) {
- filmStripShowFileNames = keyFile.get_boolean ("File Browser", "FilmStripShowFileNames");
+ filmStripShowFileNames = keyFile.get_boolean ("File Browser", "FilmStripShowFileNames");
}
if (keyFile.has_key ("File Browser", "InternalThumbIfUntouched")) {
- internalThumbIfUntouched = keyFile.get_boolean ("File Browser", "InternalThumbIfUntouched");
+ internalThumbIfUntouched = keyFile.get_boolean ("File Browser", "InternalThumbIfUntouched");
}
if (keyFile.has_key ("File Browser", "menuGroupRank")) {
- menuGroupRank = keyFile.get_boolean ("File Browser", "menuGroupRank");
+ menuGroupRank = keyFile.get_boolean ("File Browser", "menuGroupRank");
}
if (keyFile.has_key ("File Browser", "menuGroupLabel")) {
- menuGroupLabel = keyFile.get_boolean ("File Browser", "menuGroupLabel");
+ menuGroupLabel = keyFile.get_boolean ("File Browser", "menuGroupLabel");
}
if (keyFile.has_key ("File Browser", "menuGroupFileOperations")) {
- menuGroupFileOperations = keyFile.get_boolean ("File Browser", "menuGroupFileOperations");
+ menuGroupFileOperations = keyFile.get_boolean ("File Browser", "menuGroupFileOperations");
}
if (keyFile.has_key ("File Browser", "menuGroupProfileOperations")) {
- menuGroupProfileOperations = keyFile.get_boolean ("File Browser", "menuGroupProfileOperations");
+ menuGroupProfileOperations = keyFile.get_boolean ("File Browser", "menuGroupProfileOperations");
}
if (keyFile.has_key ("File Browser", "menuGroupExtProg")) {
- menuGroupExtProg = keyFile.get_boolean ("File Browser", "menuGroupExtProg");
+ menuGroupExtProg = keyFile.get_boolean ("File Browser", "menuGroupExtProg");
}
if (keyFile.has_key ("File Browser", "MaxRecentFolders")) {
- maxRecentFolders = keyFile.get_integer ("File Browser", "MaxRecentFolders");
+ maxRecentFolders = keyFile.get_integer ("File Browser", "MaxRecentFolders");
}
recentFolders.reserve (maxRecentFolders + 10); // reserve some more than maxRecentFolders, because at runtime it stores more than that
if (keyFile.has_key ("File Browser", "RecentFolders")) {
- recentFolders = keyFile.get_string_list ("File Browser", "RecentFolders");
+ recentFolders = keyFile.get_string_list ("File Browser", "RecentFolders");
}
}
@@ -1175,29 +1176,29 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Clipping Indication", "ShadowThreshold")) {
- shadowThreshold = keyFile.get_integer ("Clipping Indication", "ShadowThreshold");
+ shadowThreshold = keyFile.get_integer ("Clipping Indication", "ShadowThreshold");
}
if (keyFile.has_key ("Clipping Indication", "BlinkClipped")) {
- blinkClipped = keyFile.get_boolean ("Clipping Indication", "BlinkClipped");
+ blinkClipped = keyFile.get_boolean ("Clipping Indication", "BlinkClipped");
}
}
if (keyFile.has_group ("Performance")) {
if (keyFile.has_key ("Performance", "RgbDenoiseThreadLimit")) {
- rgbDenoiseThreadLimit = keyFile.get_integer ("Performance", "RgbDenoiseThreadLimit");
+ rgbDenoiseThreadLimit = keyFile.get_integer ("Performance", "RgbDenoiseThreadLimit");
}
if ( keyFile.has_key ("Performance", "NRauto")) {
- rtSettings.nrauto = keyFile.get_double ("Performance", "NRauto");
+ rtSettings.nrauto = keyFile.get_double ("Performance", "NRauto");
}
if ( keyFile.has_key ("Performance", "NRautomax")) {
- rtSettings.nrautomax = keyFile.get_double ("Performance", "NRautomax");
+ rtSettings.nrautomax = keyFile.get_double ("Performance", "NRautomax");
}
if ( keyFile.has_key ("Performance", "NRhigh")) {
- rtSettings.nrhigh = keyFile.get_double ("Performance", "NRhigh");
+ rtSettings.nrhigh = keyFile.get_double ("Performance", "NRhigh");
}
if (rtSettings.nrhigh == 0.0) { //avoid crash by division by zero in noise reduction
@@ -1205,23 +1206,23 @@ int Options::readFromFile (Glib::ustring fname)
}
if ( keyFile.has_key ("Performance", "NRWavlevel")) {
- rtSettings.nrwavlevel = keyFile.get_integer ("Performance", "NRWavlevel");
+ rtSettings.nrwavlevel = keyFile.get_integer ("Performance", "NRWavlevel");
}
if (keyFile.has_key ("Performance", "LevNR")) {
- rtSettings.leveldnv = keyFile.get_integer ("Performance", "LevNR");
+ rtSettings.leveldnv = keyFile.get_integer ("Performance", "LevNR");
}
if (keyFile.has_key ("Performance", "LevNRTI")) {
- rtSettings.leveldnti = keyFile.get_integer ("Performance", "LevNRTI");
+ rtSettings.leveldnti = keyFile.get_integer ("Performance", "LevNRTI");
}
if (keyFile.has_key ("Performance", "LevNRAUT")) {
- rtSettings.leveldnaut = keyFile.get_integer ("Performance", "LevNRAUT");
+ rtSettings.leveldnaut = keyFile.get_integer ("Performance", "LevNRAUT");
}
if (keyFile.has_key ("Performance", "LevNRLISS")) {
- rtSettings.leveldnliss = keyFile.get_integer ("Performance", "LevNRLISS");
+ rtSettings.leveldnliss = keyFile.get_integer ("Performance", "LevNRLISS");
}
if (keyFile.has_key ("Performance", "SIMPLNRAUT")) {
@@ -1229,41 +1230,41 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Performance", "ClutCacheSize")) {
- clutCacheSize = keyFile.get_integer ("Performance", "ClutCacheSize");
+ clutCacheSize = keyFile.get_integer ("Performance", "ClutCacheSize");
}
if (keyFile.has_key ("Performance", "MaxInspectorBuffers")) {
- maxInspectorBuffers = keyFile.get_integer ("Performance", "MaxInspectorBuffers");
+ maxInspectorBuffers = keyFile.get_integer ("Performance", "MaxInspectorBuffers");
}
if (keyFile.has_key ("Performance", "PreviewDemosaicFromSidecar")) {
- prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar");
+ prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar");
}
if (keyFile.has_key ("Performance", "Daubechies")) {
- rtSettings.daubech = keyFile.get_boolean ("Performance", "Daubechies");
+ rtSettings.daubech = keyFile.get_boolean ("Performance", "Daubechies");
}
if (keyFile.has_key ("Performance", "SerializeTiffRead")) {
- serializeTiffRead = keyFile.get_boolean ("Performance", "SerializeTiffRead");
+ serializeTiffRead = keyFile.get_boolean ("Performance", "SerializeTiffRead");
}
}
if (keyFile.has_group ("GUI")) {
if (keyFile.has_key ("GUI", "WindowWidth")) {
- windowWidth = keyFile.get_integer ("GUI", "WindowWidth");
+ windowWidth = keyFile.get_integer ("GUI", "WindowWidth");
}
if (keyFile.has_key ("GUI", "WindowHeight")) {
- windowHeight = keyFile.get_integer ("GUI", "WindowHeight");
+ windowHeight = keyFile.get_integer ("GUI", "WindowHeight");
}
if (keyFile.has_key ("GUI", "WindowX")) {
- windowX = keyFile.get_integer ("GUI", "WindowX");
+ windowX = keyFile.get_integer ("GUI", "WindowX");
}
if (keyFile.has_key ("GUI", "WindowY")) {
- windowY = keyFile.get_integer ("GUI", "WindowY");
+ windowY = keyFile.get_integer ("GUI", "WindowY");
}
if (keyFile.has_key ("GUI", "WindowMonitor")) {
@@ -1283,19 +1284,19 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "MeowWidth")) {
- meowWidth = keyFile.get_integer ("GUI", "MeowWidth");
+ meowWidth = keyFile.get_integer ("GUI", "MeowWidth");
}
if (keyFile.has_key ("GUI", "MeowHeight")) {
- meowHeight = keyFile.get_integer ("GUI", "MeowHeight");
+ meowHeight = keyFile.get_integer ("GUI", "MeowHeight");
}
if (keyFile.has_key ("GUI", "MeowX")) {
- meowX = keyFile.get_integer ("GUI", "MeowX");
+ meowX = keyFile.get_integer ("GUI", "MeowX");
}
if (keyFile.has_key ("GUI", "MeowY")) {
- meowY = keyFile.get_integer ("GUI", "MeowY");
+ meowY = keyFile.get_integer ("GUI", "MeowY");
}
if (keyFile.has_key ("GUI", "WindowMaximized")) {
@@ -1303,47 +1304,47 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "DetailWindowWidth")) {
- detailWindowWidth = keyFile.get_integer ("GUI", "DetailWindowWidth");
+ detailWindowWidth = keyFile.get_integer ("GUI", "DetailWindowWidth");
}
if (keyFile.has_key ("GUI", "DetailWindowHeight")) {
- detailWindowHeight = keyFile.get_integer ("GUI", "DetailWindowHeight");
+ detailWindowHeight = keyFile.get_integer ("GUI", "DetailWindowHeight");
}
if (keyFile.has_key ("GUI", "DirBrowserWidth")) {
- dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth");
+ dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth");
}
if (keyFile.has_key ("GUI", "DirBrowserHeight")) {
- dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight");
+ dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight");
}
if (keyFile.has_key ("GUI", "SortType")) {
- dirBrowserSortType = static_cast (keyFile.get_integer ("GUI", "SortType"));
+ dirBrowserSortType = static_cast (keyFile.get_integer ("GUI", "SortType"));
}
if (keyFile.has_key ("GUI", "PreferencesWidth")) {
- preferencesWidth = keyFile.get_integer ("GUI", "PreferencesWidth");
+ preferencesWidth = keyFile.get_integer ("GUI", "PreferencesWidth");
}
if (keyFile.has_key ("GUI", "PreferencesHeight")) {
- preferencesHeight = keyFile.get_integer ("GUI", "PreferencesHeight");
+ preferencesHeight = keyFile.get_integer ("GUI", "PreferencesHeight");
}
if (keyFile.has_key ("GUI", "SaveAsDialogWidth")) {
- saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
+ saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
}
if (keyFile.has_key ("GUI", "SaveAsDialogHeight")) {
- saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
+ saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
}
if (keyFile.has_key ("GUI", "ToolPanelWidth")) {
- toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth");
+ toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth");
}
if (keyFile.has_key ("GUI", "BrowserToolPanelWidth")) {
- browserToolPanelWidth = keyFile.get_integer ("GUI", "BrowserToolPanelWidth");
+ browserToolPanelWidth = keyFile.get_integer ("GUI", "BrowserToolPanelWidth");
}
if (keyFile.has_key ("GUI", "BrowserToolPanelHeight")) {
@@ -1355,11 +1356,11 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "BrowserDirPanelOpened")) {
- browserDirPanelOpened = keyFile.get_boolean ("GUI", "BrowserDirPanelOpened");
+ browserDirPanelOpened = keyFile.get_boolean ("GUI", "BrowserDirPanelOpened");
}
if (keyFile.has_key ("GUI", "EditorFilmStripOpened")) {
- editorFilmStripOpened = keyFile.get_boolean ("GUI", "EditorFilmStripOpened");
+ editorFilmStripOpened = keyFile.get_boolean ("GUI", "EditorFilmStripOpened");
}
if (keyFile.has_key ("GUI", "HistoryPanelWidth")) {
@@ -1367,39 +1368,39 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "FontFamily")) {
- fontFamily = keyFile.get_string ("GUI", "FontFamily");
+ fontFamily = keyFile.get_string ("GUI", "FontFamily");
}
if (keyFile.has_key ("GUI", "FontSize")) {
- fontSize = keyFile.get_integer ("GUI", "FontSize");
+ fontSize = keyFile.get_integer ("GUI", "FontSize");
}
if (keyFile.has_key ("GUI", "CPFontFamily")) {
- CPFontFamily = keyFile.get_string ("GUI", "CPFontFamily");
+ CPFontFamily = keyFile.get_string ("GUI", "CPFontFamily");
}
if (keyFile.has_key ("GUI", "CPFontSize")) {
- CPFontSize = keyFile.get_integer ("GUI", "CPFontSize");
+ CPFontSize = keyFile.get_integer ("GUI", "CPFontSize");
}
if (keyFile.has_key ("GUI", "LastPreviewScale")) {
- lastScale = keyFile.get_integer ("GUI", "LastPreviewScale");
+ lastScale = keyFile.get_integer ("GUI", "LastPreviewScale");
}
if (keyFile.has_key ("GUI", "PanAccelFactor")) {
- panAccelFactor = keyFile.get_integer ("GUI", "PanAccelFactor");
+ panAccelFactor = keyFile.get_integer ("GUI", "PanAccelFactor");
}
if (keyFile.has_key ("GUI", "RememberZoomAndPan")) {
- rememberZoomAndPan = keyFile.get_boolean ("GUI", "RememberZoomAndPan");
+ rememberZoomAndPan = keyFile.get_boolean ("GUI", "RememberZoomAndPan");
}
if (keyFile.has_key ("GUI", "LastCropSize")) {
- lastCropSize = keyFile.get_integer ("GUI", "LastCropSize");
+ lastCropSize = keyFile.get_integer ("GUI", "LastCropSize");
}
if (keyFile.has_key ("GUI", "ShowHistory")) {
- showHistory = keyFile.get_boolean ("GUI", "ShowHistory");
+ showHistory = keyFile.get_boolean ("GUI", "ShowHistory");
}
if (keyFile.has_key ("GUI", "ShowFilePanelState")) {
@@ -1407,11 +1408,11 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "ShowInfo")) {
- showInfo = keyFile.get_boolean ("GUI", "ShowInfo");
+ showInfo = keyFile.get_boolean ("GUI", "ShowInfo");
}
if (keyFile.has_key ("GUI", "MainNBVertical")) {
- mainNBVertical = keyFile.get_boolean ("GUI", "MainNBVertical");
+ mainNBVertical = keyFile.get_boolean ("GUI", "MainNBVertical");
}
if (keyFile.has_key ("GUI", "ShowClippedHighlights")) {
@@ -1423,7 +1424,7 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "FrameColor")) {
- bgcolor = keyFile.get_integer ("GUI", "FrameColor");
+ bgcolor = keyFile.get_integer ("GUI", "FrameColor");
}
if (keyFile.has_key ("GUI", "ProcessingQueueEnbled")) {
@@ -1431,44 +1432,44 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "ToolPanelsExpanded")) {
- tpOpen = keyFile.get_integer_list ("GUI", "ToolPanelsExpanded");
+ tpOpen = keyFile.get_integer_list ("GUI", "ToolPanelsExpanded");
}
if (keyFile.has_key ("GUI", "MultiDisplayMode")) {
- multiDisplayMode = keyFile.get_integer ("GUI", "MultiDisplayMode");
+ multiDisplayMode = keyFile.get_integer ("GUI", "MultiDisplayMode");
}
- //if (keyFile.has_key ("GUI", "CurvePanelsExpanded")) crvOpen = keyFile.get_integer_list ("GUI", "CurvePanelsExpanded");
+ //if (keyFile.has_key ("GUI", "CurvePanelsExpanded")) crvOpen = keyFile.get_integer_list ("GUI", "CurvePanelsExpanded");
if (keyFile.has_key ("GUI", "CutOverlayBrush")) {
- cutOverlayBrush = keyFile.get_double_list ("GUI", "CutOverlayBrush");
+ cutOverlayBrush = keyFile.get_double_list ("GUI", "CutOverlayBrush");
}
if (keyFile.has_key ("GUI", "NavGuideBrush")) {
- navGuideBrush = keyFile.get_double_list ("GUI", "NavGuideBrush");
+ navGuideBrush = keyFile.get_double_list ("GUI", "NavGuideBrush");
}
if (keyFile.has_key ("GUI", "HistogramPosition")) {
- histogramPosition = keyFile.get_integer ("GUI", "HistogramPosition");
+ histogramPosition = keyFile.get_integer ("GUI", "HistogramPosition");
}
if (keyFile.has_key ("GUI", "HistogramBar")) {
- histogramBar = keyFile.get_boolean ("GUI", "HistogramBar");
+ histogramBar = keyFile.get_boolean ("GUI", "HistogramBar");
}
if (keyFile.has_key ("GUI", "HistogramFullMode")) {
- histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode");
+ histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode");
}
if (keyFile.has_key ("GUI", "NavigatorRGBUnit")) {
- navRGBUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorRGBUnit");
+ navRGBUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorRGBUnit");
}
if (keyFile.has_key ("GUI", "NavigatorHSVUnit")) {
- navHSVUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorHSVUnit");
+ navHSVUnit = (NavigatorUnit)keyFile.get_integer ("GUI", "NavigatorHSVUnit");
}
if (keyFile.has_key ("GUI", "ShowFilmStripToolBar")) {
- showFilmStripToolBar = keyFile.get_boolean ("GUI", "ShowFilmStripToolBar");
+ showFilmStripToolBar = keyFile.get_boolean ("GUI", "ShowFilmStripToolBar");
}
if (keyFile.has_key ("GUI", "FileBrowserToolbarSingleRow")) {
@@ -1476,11 +1477,11 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "HideTPVScrollbar")) {
- hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar");
+ hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar");
}
if (keyFile.has_key ("GUI", "UseIconNoText")) {
- UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText");
+ UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText");
}
if (keyFile.has_key ("GUI", "HistogramWorking")) {
@@ -1488,35 +1489,35 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("GUI", "CurveBBoxPosition")) {
- curvebboxpos = keyFile.get_integer ("GUI", "CurveBBoxPosition");
+ curvebboxpos = keyFile.get_integer ("GUI", "CurveBBoxPosition");
}
}
if (keyFile.has_group ("Crop Settings")) {
if (keyFile.has_key ("Crop Settings", "PPI")) {
- cropPPI = keyFile.get_integer ("Crop Settings", "PPI");
+ cropPPI = keyFile.get_integer ("Crop Settings", "PPI");
}
}
if (keyFile.has_group ("Color Management")) {
if (keyFile.has_key ("Color Management", "ICCDirectory")) {
- rtSettings.iccDirectory = keyFile.get_string ("Color Management", "ICCDirectory");
+ rtSettings.iccDirectory = keyFile.get_string ("Color Management", "ICCDirectory");
}
if (keyFile.has_key ("Color Management", "PrinterIntent")) {
- rtSettings.printerIntent = static_cast (keyFile.get_integer ("Color Management", "PrinterIntent"));
+ rtSettings.printerIntent = static_cast (keyFile.get_integer ("Color Management", "PrinterIntent"));
}
if (keyFile.has_key ("Color Management", "PrinterBPC")) {
- rtSettings.printerBPC = keyFile.get_boolean ("Color Management", "PrinterBPC");
+ rtSettings.printerBPC = keyFile.get_boolean ("Color Management", "PrinterBPC");
}
if (keyFile.has_key ("Color Management", "PrinterProfile")) {
- rtSettings.printerProfile = keyFile.get_string ("Color Management", "PrinterProfile");
+ rtSettings.printerProfile = keyFile.get_string ("Color Management", "PrinterProfile");
}
if (keyFile.has_key ("Color Management", "MonitorProfile")) {
- rtSettings.monitorProfile = keyFile.get_string ("Color Management", "MonitorProfile");
+ rtSettings.monitorProfile = keyFile.get_string ("Color Management", "MonitorProfile");
}
if (keyFile.has_key ("Color Management", "AutoMonitorProfile")) {
@@ -1532,122 +1533,124 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Color Management", "Intent")) {
- rtSettings.monitorIntent = static_cast (keyFile.get_integer ("Color Management", "Intent"));
+ rtSettings.monitorIntent = static_cast (keyFile.get_integer ("Color Management", "Intent"));
}
if (keyFile.has_key ("Color Management", "MonitorBPC")) {
- rtSettings.monitorBPC = keyFile.get_boolean ("Color Management", "MonitorBPC");
+ rtSettings.monitorBPC = keyFile.get_boolean ("Color Management", "MonitorBPC");
}
if (keyFile.has_key ("Color Management", "CRI")) {
- rtSettings.CRI_color = keyFile.get_integer ("Color Management", "CRI");
+ rtSettings.CRI_color = keyFile.get_integer ("Color Management", "CRI");
}
if (keyFile.has_key ("Color Management", "DenoiseLabgamma")) {
- rtSettings.denoiselabgamma = keyFile.get_integer ("Color Management", "DenoiseLabgamma");
+ rtSettings.denoiselabgamma = keyFile.get_integer ("Color Management", "DenoiseLabgamma");
}
+ /*
if (keyFile.has_key ("Color Management", "view")) {
- rtSettings.viewingdevice = keyFile.get_integer ("Color Management", "view");
+ rtSettings.viewingdevice = keyFile.get_integer ("Color Management", "view");
}
if (keyFile.has_key ("Color Management", "grey")) {
- rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey");
+ rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey");
}
+ */
if (keyFile.has_key ("Color Management", "greySc")) {
- rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
+ rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
}
if (keyFile.has_key ("Color Management", "CBDLArtif")) {
- rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif");
+ rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif");
}
if (keyFile.has_key ("Color Management", "CBDLlevel0")) {
- rtSettings.level0_cbdl = keyFile.get_double ("Color Management", "CBDLlevel0");
+ rtSettings.level0_cbdl = keyFile.get_double ("Color Management", "CBDLlevel0");
}
if (keyFile.has_key ("Color Management", "CBDLlevel123")) {
- rtSettings.level123_cbdl = keyFile.get_double ("Color Management", "CBDLlevel123");
+ rtSettings.level123_cbdl = keyFile.get_double ("Color Management", "CBDLlevel123");
}
-// if (keyFile.has_key ("Color Management", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab");
-// if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction");
+ //if (keyFile.has_key ("Color Management", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab");
+ //if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction");
if (keyFile.has_key ("Color Management", "WhiteBalanceSpotSize")) {
- whiteBalanceSpotSize = keyFile.get_integer ("Color Management", "WhiteBalanceSpotSize");
+ whiteBalanceSpotSize = keyFile.get_integer ("Color Management", "WhiteBalanceSpotSize");
}
if ( keyFile.has_key ("Color Management", "GamutICC")) {
- rtSettings.gamutICC = keyFile.get_boolean ("Color Management", "GamutICC");
+ rtSettings.gamutICC = keyFile.get_boolean ("Color Management", "GamutICC");
}
-// if( keyFile.has_key ("Color Management", "BWcomplement")) rtSettings.bw_complementary = keyFile.get_boolean("Color Management", "BWcomplement");
+ //if ( keyFile.has_key ("Color Management", "BWcomplement")) rtSettings.bw_complementary = keyFile.get_boolean("Color Management", "BWcomplement");
if ( keyFile.has_key ("Color Management", "Ciecamfloat")) {
- rtSettings.ciecamfloat = keyFile.get_boolean ("Color Management", "Ciecamfloat");
+ rtSettings.ciecamfloat = keyFile.get_boolean ("Color Management", "Ciecamfloat");
}
if ( keyFile.has_key ("Color Management", "AdobeRGB")) {
- rtSettings.adobe = keyFile.get_string ("Color Management", "AdobeRGB");
+ rtSettings.adobe = keyFile.get_string ("Color Management", "AdobeRGB");
}
if ( keyFile.has_key ("Color Management", "ProPhoto")) {
- rtSettings.prophoto = keyFile.get_string ("Color Management", "ProPhoto");
+ rtSettings.prophoto = keyFile.get_string ("Color Management", "ProPhoto");
}
if ( keyFile.has_key ("Color Management", "ProPhoto10")) {
- rtSettings.prophoto10 = keyFile.get_string ("Color Management", "ProPhoto10");
+ rtSettings.prophoto10 = keyFile.get_string ("Color Management", "ProPhoto10");
}
if ( keyFile.has_key ("Color Management", "WideGamut")) {
- rtSettings.widegamut = keyFile.get_string ("Color Management", "WideGamut");
+ rtSettings.widegamut = keyFile.get_string ("Color Management", "WideGamut");
}
if ( keyFile.has_key ("Color Management", "sRGB")) {
- rtSettings.srgb = keyFile.get_string ("Color Management", "sRGB");
+ rtSettings.srgb = keyFile.get_string ("Color Management", "sRGB");
}
if ( keyFile.has_key ("Color Management", "sRGB10")) {
- rtSettings.srgb10 = keyFile.get_string ("Color Management", "sRGB10");
+ rtSettings.srgb10 = keyFile.get_string ("Color Management", "sRGB10");
}
if ( keyFile.has_key ("Color Management", "Beta")) {
- rtSettings.beta = keyFile.get_string ("Color Management", "Beta");
+ rtSettings.beta = keyFile.get_string ("Color Management", "Beta");
}
if ( keyFile.has_key ("Color Management", "Best")) {
- rtSettings.best = keyFile.get_string ("Color Management", "Best");
+ rtSettings.best = keyFile.get_string ("Color Management", "Best");
}
if ( keyFile.has_key ("Color Management", "Rec2020")) {
- rtSettings.rec2020 = keyFile.get_string ("Color Management", "Rec2020");
+ rtSettings.rec2020 = keyFile.get_string ("Color Management", "Rec2020");
}
if ( keyFile.has_key ("Color Management", "Bruce")) {
- rtSettings.bruce = keyFile.get_string ("Color Management", "Bruce");
+ rtSettings.bruce = keyFile.get_string ("Color Management", "Bruce");
}
if ( keyFile.has_key ("Color Management", "GamutLch")) {
- rtSettings.gamutLch = keyFile.get_boolean ("Color Management", "GamutLch");
+ rtSettings.gamutLch = keyFile.get_boolean ("Color Management", "GamutLch");
}
if ( keyFile.has_key ("Color Management", "ProtectRed")) {
- rtSettings.protectred = keyFile.get_integer ("Color Management", "ProtectRed");
+ rtSettings.protectred = keyFile.get_integer ("Color Management", "ProtectRed");
}
if ( keyFile.has_key ("Color Management", "ProtectRedH")) {
- rtSettings.protectredh = keyFile.get_double ("Color Management", "ProtectRedH");
+ rtSettings.protectredh = keyFile.get_double ("Color Management", "ProtectRedH");
}
if ( keyFile.has_key ("Color Management", "Amountchroma")) {
- rtSettings.amchroma = keyFile.get_integer ("Color Management", "Amountchroma");
+ rtSettings.amchroma = keyFile.get_integer ("Color Management", "Amountchroma");
}
if ( keyFile.has_key ("Color Management", "ClutsDirectory")) {
- clutsDir = keyFile.get_string ("Color Management", "ClutsDirectory");
+ clutsDir = keyFile.get_string ("Color Management", "ClutsDirectory");
}
-// if( keyFile.has_key ("Color Management", "Ciebadpixgauss")) rtSettings.ciebadpixgauss = keyFile.get_boolean("Color Management", "Ciebadpixgauss");
+ //if( keyFile.has_key ("Color Management", "Ciebadpixgauss")) rtSettings.ciebadpixgauss = keyFile.get_boolean("Color Management", "Ciebadpixgauss");
}
@@ -1659,7 +1662,7 @@ int Options::readFromFile (Glib::ustring fname)
if (keyFile.has_group ("Sounds")) {
if (keyFile.has_key ("Sounds", "Enable")) {
- sndEnable = keyFile.get_boolean ("Sounds", "Enable");
+ sndEnable = keyFile.get_boolean ("Sounds", "Enable");
}
if (keyFile.has_key ("Sounds", "BatchQueueDone")) {
@@ -1667,7 +1670,7 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_key ("Sounds", "LngEditProcDone")) {
- sndLngEditProcDone = keyFile.get_string ("Sounds", "LngEditProcDone");
+ sndLngEditProcDone = keyFile.get_string ("Sounds", "LngEditProcDone");
}
if (keyFile.has_key ("Sounds", "LngEditProcDoneSecs")) {
@@ -1676,162 +1679,163 @@ int Options::readFromFile (Glib::ustring fname)
}
if (keyFile.has_group ("Fast Export")) {
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpening" )) {
- fastexport_bypass_sharpening = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpening" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpening" )) {
+ fastexport_bypass_sharpening = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpening" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpenEdge" )) {
- fastexport_bypass_sharpenEdge = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpenEdge" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpenEdge" )) {
+ fastexport_bypass_sharpenEdge = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpenEdge" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpenMicro" )) {
- fastexport_bypass_sharpenMicro = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpenMicro" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_sharpenMicro" )) {
+ fastexport_bypass_sharpenMicro = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sharpenMicro" );
}
- //if (keyFile.has_key ("Fast Export", "fastexport_bypass_lumaDenoise" )) fastexport_bypass_lumaDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" );
- //if (keyFile.has_key ("Fast Export", "fastexport_bypass_colorDenoise" )) fastexport_bypass_colorDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_colorDenoise" );
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_defringe" )) {
- fastexport_bypass_defringe = keyFile.get_boolean ("Fast Export", "fastexport_bypass_defringe" );
+ //if (keyFile.has_key ("Fast Export", "fastexport_bypass_lumaDenoise" )) fastexport_bypass_lumaDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" );
+ //if (keyFile.has_key ("Fast Export", "fastexport_bypass_colorDenoise" )) fastexport_bypass_colorDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_colorDenoise" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_defringe" )) {
+ fastexport_bypass_defringe = keyFile.get_boolean ("Fast Export", "fastexport_bypass_defringe" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrDenoise" )) {
- fastexport_bypass_dirpyrDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrDenoise" )) {
+ fastexport_bypass_dirpyrDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_sh_hq" )) {
- fastexport_bypass_sh_hq = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sh_hq" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_sh_hq" )) {
+ fastexport_bypass_sh_hq = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sh_hq" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrequalizer" )) {
- fastexport_bypass_dirpyrequalizer = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrequalizer" )) {
+ fastexport_bypass_dirpyrequalizer = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_wavelet" )) {
- fastexport_bypass_wavelet = keyFile.get_boolean ("Fast Export", "fastexport_bypass_wavelet" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_wavelet" )) {
+ fastexport_bypass_wavelet = keyFile.get_boolean ("Fast Export", "fastexport_bypass_wavelet" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_raw_dmethod" )) {
- fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_dmethod" );
+ if (keyFile.has_key ("Fast Export", "fastexport_raw_dmethod" )) {
+ fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_dmethod" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_raw_bayer_method" )) {
- fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_bayer_method" );
+ if (keyFile.has_key ("Fast Export", "fastexport_raw_bayer_method" )) {
+ fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_bayer_method" );
}
- //if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_all_enhance" )) fastexport_bypass_raw_bayer_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" );
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations" )) {
- fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" );
+//if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_all_enhance" )) fastexport_bypass_raw_bayer_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations" )) {
+ fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations" )) {
- fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations" )) {
+ fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_enhance" )) {
- fastexport_bypass_raw_bayer_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_enhance" )) {
+ fastexport_bypass_raw_bayer_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance" )) {
- fastexport_bypass_raw_bayer_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance" )) {
+ fastexport_bypass_raw_bayer_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_lmmse_iterations" )) {
- fastexport_bypass_raw_bayer_lmmse_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_lmmse_iterations" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_lmmse_iterations" )) {
+ fastexport_bypass_raw_bayer_lmmse_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_lmmse_iterations" );
}
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations")) {
- fastexport_bypass_raw_bayer_lmmse_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations");
+ fastexport_bypass_raw_bayer_lmmse_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations");
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_linenoise" )) {
- fastexport_bypass_raw_bayer_linenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_linenoise" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_linenoise" )) {
+ fastexport_bypass_raw_bayer_linenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_linenoise" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_linenoise" )) {
- fastexport_bypass_raw_bayer_linenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_linenoise" )) {
+ fastexport_bypass_raw_bayer_linenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_greenthresh" )) {
- fastexport_bypass_raw_bayer_greenthresh = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_greenthresh" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_greenthresh" )) {
+ fastexport_bypass_raw_bayer_greenthresh = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_greenthresh" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh" )) {
- fastexport_bypass_raw_bayer_greenthresh = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh" )) {
+ fastexport_bypass_raw_bayer_greenthresh = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_raw_xtrans_method" )) {
- fastexport_raw_xtrans_method = keyFile.get_string ("Fast Export", "fastexport_raw_xtrans_method" );
+ if (keyFile.has_key ("Fast Export", "fastexport_raw_xtrans_method" )) {
+ fastexport_raw_xtrans_method = keyFile.get_string ("Fast Export", "fastexport_raw_xtrans_method" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ccSteps" )) {
- fastexport_bypass_raw_ccSteps = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ccSteps" )) {
+ fastexport_bypass_raw_ccSteps = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ca" )) {
- fastexport_bypass_raw_ca = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ca" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ca" )) {
+ fastexport_bypass_raw_ca = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ca" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_df" )) {
- fastexport_bypass_raw_df = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_df" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_df" )) {
+ fastexport_bypass_raw_df = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_df" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ff" )) {
- fastexport_bypass_raw_ff = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ff" );
+ if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ff" )) {
+ fastexport_bypass_raw_ff = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ff" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_input" )) {
- fastexport_icm_input = keyFile.get_string ("Fast Export", "fastexport_icm_input" );
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_input" )) {
+ fastexport_icm_input = keyFile.get_string ("Fast Export", "fastexport_icm_input" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_working" )) {
- fastexport_icm_working = keyFile.get_string ("Fast Export", "fastexport_icm_working" );
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_working" )) {
+ fastexport_icm_working = keyFile.get_string ("Fast Export", "fastexport_icm_working" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_output" )) {
- fastexport_icm_output = keyFile.get_string ("Fast Export", "fastexport_icm_output" );
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_output" )) {
+ fastexport_icm_output = keyFile.get_string ("Fast Export", "fastexport_icm_output" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_output_intent" )) {
- fastexport_icm_outputIntent = static_cast (keyFile.get_integer ("Fast Export", "fastexport_icm_output_intent" ));
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_output_intent" )) {
+ fastexport_icm_outputIntent = static_cast (keyFile.get_integer ("Fast Export", "fastexport_icm_output_intent" ));
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_output_bpc" )) {
- fastexport_icm_outputBPC = keyFile.get_boolean ("Fast Export", "fastexport_icm_output_bpc" );
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_output_bpc" )) {
+ fastexport_icm_outputBPC = keyFile.get_boolean ("Fast Export", "fastexport_icm_output_bpc" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_icm_gamma" )) {
- fastexport_icm_gamma = keyFile.get_string ("Fast Export", "fastexport_icm_gamma" );
+ if (keyFile.has_key ("Fast Export", "fastexport_icm_gamma" )) {
+ fastexport_icm_gamma = keyFile.get_string ("Fast Export", "fastexport_icm_gamma" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_enabled" )) {
- fastexport_resize_enabled = keyFile.get_boolean ("Fast Export", "fastexport_resize_enabled" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_enabled" )) {
+ fastexport_resize_enabled = keyFile.get_boolean ("Fast Export", "fastexport_resize_enabled" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_scale" )) {
- fastexport_resize_scale = keyFile.get_double ("Fast Export", "fastexport_resize_scale" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_scale" )) {
+ fastexport_resize_scale = keyFile.get_double ("Fast Export", "fastexport_resize_scale" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_appliesTo" )) {
- fastexport_resize_appliesTo = keyFile.get_string ("Fast Export", "fastexport_resize_appliesTo" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_appliesTo" )) {
+ fastexport_resize_appliesTo = keyFile.get_string ("Fast Export", "fastexport_resize_appliesTo" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_method" )) {
- fastexport_resize_method = keyFile.get_string ("Fast Export", "fastexport_resize_method" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_method" )) {
+ fastexport_resize_method = keyFile.get_string ("Fast Export", "fastexport_resize_method" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_dataspec" )) {
- fastexport_resize_dataspec = keyFile.get_integer ("Fast Export", "fastexport_resize_dataspec" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_dataspec" )) {
+ fastexport_resize_dataspec = keyFile.get_integer ("Fast Export", "fastexport_resize_dataspec" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_width" )) {
- fastexport_resize_width = keyFile.get_integer ("Fast Export", "fastexport_resize_width" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_width" )) {
+ fastexport_resize_width = keyFile.get_integer ("Fast Export", "fastexport_resize_width" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_resize_height" )) {
- fastexport_resize_height = keyFile.get_integer ("Fast Export", "fastexport_resize_height" );
+ if (keyFile.has_key ("Fast Export", "fastexport_resize_height" )) {
+ fastexport_resize_height = keyFile.get_integer ("Fast Export", "fastexport_resize_height" );
}
- if (keyFile.has_key ("Fast Export", "fastexport_use_fast_pipeline" )) {
- fastexport_use_fast_pipeline = keyFile.get_integer ("Fast Export", "fastexport_use_fast_pipeline" );
+
+ if (keyFile.has_key ("Fast Export", "fastexport_use_fast_pipeline" )) {
+ fastexport_use_fast_pipeline = keyFile.get_integer ("Fast Export", "fastexport_use_fast_pipeline" );
}
}
@@ -1852,6 +1856,10 @@ int Options::readFromFile (Glib::ustring fname)
safeDirGet (keyFile, "Dialogs", "LastVibranceCurvesDir", lastVibranceCurvesDir);
safeDirGet (keyFile, "Dialogs", "LastProfilingReferenceDir", lastProfilingReferenceDir);
safeDirGet (keyFile, "Dialogs", "LastLensProfileDir", lastLensProfileDir);
+
+ if (keyFile.has_key ("Dialogs", "GimpPluginShowInfoDialog")) {
+ gimpPluginShowInfoDialog = keyFile.get_boolean ("Dialogs", "GimpPluginShowInfoDialog");
+ }
}
// --------------------------------------------------------------------------------------------------------
@@ -1924,15 +1932,15 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("General", "DarkFramesPath", rtSettings.darkFramesPath);
keyFile.set_string ("General", "FlatFieldsPath", rtSettings.flatFieldsPath);
keyFile.set_boolean ("General", "Verbose", rtSettings.verbose);
- keyFile.set_double ("General", "BotLeft", rtSettings.bot_left);
- keyFile.set_double ("General", "TopLeft", rtSettings.top_left);
- keyFile.set_double ("General", "TopRight", rtSettings.top_right);
- keyFile.set_double ("General", "BotRight", rtSettings.bot_right);
- keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec);
- keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr);
- keyFile.set_double ("General", "EDLow", rtSettings.ed_low);
- keyFile.set_double ("General", "EDLipinfl", rtSettings.ed_lipinfl);
- keyFile.set_double ("General", "EDLipampl", rtSettings.ed_lipampl);
+ keyFile.set_double ("General", "BotLeft", rtSettings.bot_left);
+ keyFile.set_double ("General", "TopLeft", rtSettings.top_left);
+ keyFile.set_double ("General", "TopRight", rtSettings.top_right);
+ keyFile.set_double ("General", "BotRight", rtSettings.bot_right);
+ keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec);
+ keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr);
+ keyFile.set_double ("General", "EDLow", rtSettings.ed_low);
+ keyFile.set_double ("General", "EDLipinfl", rtSettings.ed_lipinfl);
+ keyFile.set_double ("General", "EDLipampl", rtSettings.ed_lipampl);
keyFile.set_integer ("External Editor", "EditorKind", editorToSendTo);
@@ -2123,8 +2131,8 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_boolean ("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut);
keyFile.set_integer ("Color Management", "Intent", rtSettings.monitorIntent);
keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC);
- keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
- keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
+ //keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
+ //keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe);
@@ -2139,7 +2147,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Color Management", "Bruce", rtSettings.bruce);
keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize);
keyFile.set_boolean ("Color Management", "GamutICC", rtSettings.gamutICC);
-// keyFile.set_boolean ("Color Management", "BWcomplement", rtSettings.bw_complementary);
+ //keyFile.set_boolean ("Color Management", "BWcomplement", rtSettings.bw_complementary);
keyFile.set_boolean ("Color Management", "Ciecamfloat", rtSettings.ciecamfloat);
keyFile.set_boolean ("Color Management", "GamutLch", rtSettings.gamutLch);
keyFile.set_integer ("Color Management", "ProtectRed", rtSettings.protectred);
@@ -2147,13 +2155,13 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_double ("Color Management", "ProtectRedH", rtSettings.protectredh);
keyFile.set_integer ("Color Management", "CRI", rtSettings.CRI_color);
keyFile.set_integer ("Color Management", "DenoiseLabgamma", rtSettings.denoiselabgamma);
-// keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss);
- keyFile.set_double ("Color Management", "CBDLArtif", rtSettings.artifact_cbdl);
- keyFile.set_double ("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
- keyFile.set_double ("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
-// keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);
-// keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction);
- keyFile.set_string ("Color Management", "ClutsDirectory", clutsDir);
+ //keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss);
+ keyFile.set_double ("Color Management", "CBDLArtif", rtSettings.artifact_cbdl);
+ keyFile.set_double ("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
+ keyFile.set_double ("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
+ //keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);
+ //keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction);
+ keyFile.set_string ("Color Management", "ClutsDirectory", clutsDir);
Glib::ArrayHandle bab = baBehav;
@@ -2165,58 +2173,59 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_double ("Sounds", "LngEditProcDoneSecs", sndLngEditProcDoneSecs);
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpening", fastexport_bypass_sharpening );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenEdge", fastexport_bypass_sharpenEdge );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenMicro", fastexport_bypass_sharpenMicro );
- //keyFile.set_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" , fastexport_bypass_lumaDenoise );
- //keyFile.set_boolean ("Fast Export", "fastexport_bypass_colorDenoise" , fastexport_bypass_colorDenoise );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_defringe", fastexport_bypass_defringe );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise", fastexport_bypass_dirpyrDenoise );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq", fastexport_bypass_sh_hq );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer", fastexport_bypass_dirpyrequalizer );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_wavelet", fastexport_bypass_wavelet );
- keyFile.set_string ("Fast Export", "fastexport_raw_bayer_method", fastexport_raw_bayer_method );
- //keyFile.set_boolean ("Fast Export", "fastexport_bypass_bayer_raw_all_enhance" , fastexport_bypass_raw_bayer_all_enhance );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations", fastexport_bypass_raw_bayer_dcb_iterations );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance", fastexport_bypass_raw_bayer_dcb_enhance );
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpening", fastexport_bypass_sharpening);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenEdge", fastexport_bypass_sharpenEdge);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenMicro", fastexport_bypass_sharpenMicro);
+ //keyFile.set_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" , fastexport_bypass_lumaDenoise);
+ //keyFile.set_boolean ("Fast Export", "fastexport_bypass_colorDenoise" , fastexport_bypass_colorDenoise);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_defringe", fastexport_bypass_defringe);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise", fastexport_bypass_dirpyrDenoise);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq", fastexport_bypass_sh_hq);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer", fastexport_bypass_dirpyrequalizer);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_wavelet", fastexport_bypass_wavelet);
+ keyFile.set_string ("Fast Export", "fastexport_raw_bayer_method", fastexport_raw_bayer_method);
+ //keyFile.set_boolean ("Fast Export", "fastexport_bypass_bayer_raw_all_enhance" , fastexport_bypass_raw_bayer_all_enhance);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations", fastexport_bypass_raw_bayer_dcb_iterations);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance", fastexport_bypass_raw_bayer_dcb_enhance);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations", fastexport_bypass_raw_bayer_lmmse_iterations);
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise", fastexport_bypass_raw_bayer_linenoise );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh", fastexport_bypass_raw_bayer_greenthresh );
- keyFile.set_string ("Fast Export", "fastexport_raw_xtrans_method", fastexport_raw_xtrans_method );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps", fastexport_bypass_raw_ccSteps );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ca", fastexport_bypass_raw_ca );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_df", fastexport_bypass_raw_df );
- keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ff", fastexport_bypass_raw_ff );
- keyFile.set_string ("Fast Export", "fastexport_icm_input", fastexport_icm_input );
- keyFile.set_string ("Fast Export", "fastexport_icm_working", fastexport_icm_working );
- keyFile.set_string ("Fast Export", "fastexport_icm_output", fastexport_icm_output );
- keyFile.set_integer ("Fast Export", "fastexport_icm_output_intent", fastexport_icm_outputIntent );
- keyFile.set_boolean ("Fast Export", "fastexport_icm_output_bpc", fastexport_icm_outputBPC );
- keyFile.set_string ("Fast Export", "fastexport_icm_gamma", fastexport_icm_gamma );
- keyFile.set_boolean ("Fast Export", "fastexport_resize_enabled", fastexport_resize_enabled );
- keyFile.set_double ("Fast Export", "fastexport_resize_scale", fastexport_resize_scale );
- keyFile.set_string ("Fast Export", "fastexport_resize_appliesTo", fastexport_resize_appliesTo );
- keyFile.set_string ("Fast Export", "fastexport_resize_method", fastexport_resize_method );
- keyFile.set_integer ("Fast Export", "fastexport_resize_dataspec", fastexport_resize_dataspec );
- keyFile.set_integer ("Fast Export", "fastexport_resize_width", fastexport_resize_width );
- keyFile.set_integer ("Fast Export", "fastexport_resize_height", fastexport_resize_height );
- keyFile.set_integer ("Fast Export", "fastexport_use_fast_pipeline", fastexport_use_fast_pipeline );
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise", fastexport_bypass_raw_bayer_linenoise);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh", fastexport_bypass_raw_bayer_greenthresh);
+ keyFile.set_string ("Fast Export", "fastexport_raw_xtrans_method", fastexport_raw_xtrans_method);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps", fastexport_bypass_raw_ccSteps);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ca", fastexport_bypass_raw_ca);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_df", fastexport_bypass_raw_df);
+ keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ff", fastexport_bypass_raw_ff);
+ keyFile.set_string ("Fast Export", "fastexport_icm_input", fastexport_icm_input);
+ keyFile.set_string ("Fast Export", "fastexport_icm_working", fastexport_icm_working);
+ keyFile.set_string ("Fast Export", "fastexport_icm_output", fastexport_icm_output);
+ keyFile.set_integer ("Fast Export", "fastexport_icm_output_intent", fastexport_icm_outputIntent);
+ keyFile.set_boolean ("Fast Export", "fastexport_icm_output_bpc", fastexport_icm_outputBPC);
+ keyFile.set_string ("Fast Export", "fastexport_icm_gamma", fastexport_icm_gamma);
+ keyFile.set_boolean ("Fast Export", "fastexport_resize_enabled", fastexport_resize_enabled);
+ keyFile.set_double ("Fast Export", "fastexport_resize_scale", fastexport_resize_scale);
+ keyFile.set_string ("Fast Export", "fastexport_resize_appliesTo", fastexport_resize_appliesTo);
+ keyFile.set_string ("Fast Export", "fastexport_resize_method", fastexport_resize_method);
+ keyFile.set_integer ("Fast Export", "fastexport_resize_dataspec", fastexport_resize_dataspec);
+ keyFile.set_integer ("Fast Export", "fastexport_resize_width", fastexport_resize_width);
+ keyFile.set_integer ("Fast Export", "fastexport_resize_height", fastexport_resize_height);
+ keyFile.set_integer ("Fast Export", "fastexport_use_fast_pipeline", fastexport_use_fast_pipeline);
- keyFile.set_string ("Dialogs", "LastIccDir", lastIccDir);
- keyFile.set_string ("Dialogs", "LastDarkframeDir", lastDarkframeDir);
- keyFile.set_string ("Dialogs", "LastFlatfieldDir", lastFlatfieldDir);
- keyFile.set_string ("Dialogs", "LastRgbCurvesDir", lastRgbCurvesDir);
- keyFile.set_string ("Dialogs", "LastLabCurvesDir", lastLabCurvesDir);
- keyFile.set_string ("Dialogs", "LastRetinexDir", lastRetinexDir);
- keyFile.set_string ("Dialogs", "LastDenoiseCurvesDir", lastDenoiseCurvesDir);
- keyFile.set_string ("Dialogs", "LastWaveletCurvesDir", lastWaveletCurvesDir);
- keyFile.set_string ("Dialogs", "LastPFCurvesDir", lastPFCurvesDir);
- keyFile.set_string ("Dialogs", "LastHsvCurvesDir", lastHsvCurvesDir);
- keyFile.set_string ("Dialogs", "LastBWCurvesDir", lastBWCurvesDir);
- keyFile.set_string ("Dialogs", "LastToneCurvesDir", lastToneCurvesDir);
- keyFile.set_string ("Dialogs", "LastVibranceCurvesDir", lastVibranceCurvesDir);
- keyFile.set_string ("Dialogs", "LastProfilingReferenceDir", lastProfilingReferenceDir);
- keyFile.set_string ("Dialogs", "LastLensProfileDir", lastLensProfileDir);
+ keyFile.set_string ("Dialogs", "LastIccDir", lastIccDir);
+ keyFile.set_string ("Dialogs", "LastDarkframeDir", lastDarkframeDir);
+ keyFile.set_string ("Dialogs", "LastFlatfieldDir", lastFlatfieldDir);
+ keyFile.set_string ("Dialogs", "LastRgbCurvesDir", lastRgbCurvesDir);
+ keyFile.set_string ("Dialogs", "LastLabCurvesDir", lastLabCurvesDir);
+ keyFile.set_string ("Dialogs", "LastRetinexDir", lastRetinexDir);
+ keyFile.set_string ("Dialogs", "LastDenoiseCurvesDir", lastDenoiseCurvesDir);
+ keyFile.set_string ("Dialogs", "LastWaveletCurvesDir", lastWaveletCurvesDir);
+ keyFile.set_string ("Dialogs", "LastPFCurvesDir", lastPFCurvesDir);
+ keyFile.set_string ("Dialogs", "LastHsvCurvesDir", lastHsvCurvesDir);
+ keyFile.set_string ("Dialogs", "LastBWCurvesDir", lastBWCurvesDir);
+ keyFile.set_string ("Dialogs", "LastToneCurvesDir", lastToneCurvesDir);
+ keyFile.set_string ("Dialogs", "LastVibranceCurvesDir", lastVibranceCurvesDir);
+ keyFile.set_string ("Dialogs", "LastProfilingReferenceDir", lastProfilingReferenceDir);
+ keyFile.set_string ("Dialogs", "LastLensProfileDir", lastLensProfileDir);
+ keyFile.set_boolean ("Dialogs", "GimpPluginShowInfoDialog", gimpPluginShowInfoDialog);
keyData = keyFile.to_data ();
@@ -2231,7 +2240,7 @@ int Options::saveToFile (Glib::ustring fname)
if (f == nullptr) {
std::cout << "Warning! Unable to save your preferences to: " << fname << std::endl;
#ifndef RAWTHERAPEE_CLI
- Glib::ustring msg_ = Glib::ustring::compose(M("MAIN_MSG_WRITEFAILED"), fname.c_str());
+ Glib::ustring msg_ = Glib::ustring::compose (M ("MAIN_MSG_WRITEFAILED"), fname.c_str());
//writeFailed (getToplevelWindow (this), msg_);
Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE, true);
msgd.run ();
diff --git a/rtgui/options.h b/rtgui/options.h
index 9253b7e2f..13025ee7c 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -315,6 +315,7 @@ public:
Glib::ustring lastProfilingReferenceDir;
Glib::ustring lastBWCurvesDir;
Glib::ustring lastLensProfileDir;
+ bool gimpPluginShowInfoDialog;
size_t maxRecentFolders; // max. number of recent folders stored in options file
std::vector recentFolders; // List containing all recent folders
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index b39eaadda..e09b30b24 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -204,6 +204,9 @@ void ParamsEdited::set (bool v)
colorappearance.curveMode = v;
colorappearance.curveMode2 = v;
colorappearance.curveMode3 = v;
+ colorappearance.tempout = v;
+ colorappearance.greenout = v;
+ colorappearance.ybout = v;
//colorBoost.amount = v;
//colorBoost.avoidclip = v;
@@ -507,11 +510,11 @@ void ParamsEdited::set (bool v)
wavelet.exptoning = v;
wavelet.expnoise = v;
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
wavelet.c[i] = v;
}
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
wavelet.ch[i] = v;
}
@@ -520,7 +523,7 @@ void ParamsEdited::set (bool v)
dirpyrequalizer.cbdlMethod = v;
- for(int i = 0; i < 6; i++) {
+ for (int i = 0; i < 6; i++) {
dirpyrequalizer.mult[i] = v;
}
@@ -724,6 +727,9 @@ void ParamsEdited::initFrom (const std::vector
colorappearance.curveMode = colorappearance.curveMode && p.colorappearance.curveMode == other.colorappearance.curveMode;
colorappearance.curveMode2 = colorappearance.curveMode2 && p.colorappearance.curveMode2 == other.colorappearance.curveMode2;
colorappearance.curveMode3 = colorappearance.curveMode3 && p.colorappearance.curveMode3 == other.colorappearance.curveMode3;
+ colorappearance.tempout = colorappearance.tempout && p.colorappearance.tempout == other.colorappearance.tempout;
+ colorappearance.greenout = colorappearance.greenout && p.colorappearance.greenout == other.colorappearance.greenout;
+ colorappearance.ybout = colorappearance.ybout && p.colorappearance.ybout == other.colorappearance.ybout;
//colorBoost.amount = colorBoost.amount && p.colorBoost.amount == other.colorBoost.amount;
//colorBoost.avoidclip = colorBoost.avoidclip && p.colorBoost.avoidclip == other.colorBoost.avoidclip;
@@ -1025,11 +1031,11 @@ void ParamsEdited::initFrom (const std::vector
wavelet.exptoning = wavelet.exptoning && p.wavelet.exptoning == other.wavelet.exptoning;
wavelet.expnoise = wavelet.expnoise && p.wavelet.expnoise == other.wavelet.expnoise;
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
wavelet.c[i] = wavelet.c[i] && p.wavelet.c[i] == other.wavelet.c[i];
}
- for(int i = 0; i < 9; i++) {
+ for (int i = 0; i < 9; i++) {
wavelet.ch[i] = wavelet.ch[i] && p.wavelet.ch[i] == other.wavelet.ch[i];
}
@@ -1037,7 +1043,7 @@ void ParamsEdited::initFrom (const std::vector
dirpyrequalizer.gamutlab = dirpyrequalizer.gamutlab && p.dirpyrequalizer.gamutlab == other.dirpyrequalizer.gamutlab;
dirpyrequalizer.cbdlMethod = dirpyrequalizer.cbdlMethod && p.dirpyrequalizer.cbdlMethod == other.dirpyrequalizer.cbdlMethod;
- for(int i = 0; i < 6; i++) {
+ for (int i = 0; i < 6; i++) {
dirpyrequalizer.mult[i] = dirpyrequalizer.mult[i] && p.dirpyrequalizer.mult[i] == other.dirpyrequalizer.mult[i];
}
@@ -1733,6 +1739,18 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.colorappearance.algo = mods.colorappearance.algo;
}
+ if (colorappearance.tempout) {
+ toEdit.colorappearance.tempout = mods.colorappearance.tempout;
+ }
+
+ if (colorappearance.greenout) {
+ toEdit.colorappearance.greenout = mods.colorappearance.greenout;
+ }
+
+ if (colorappearance.ybout) {
+ toEdit.colorappearance.ybout = mods.colorappearance.ybout;
+ }
+
if (colorappearance.jlight) {
toEdit.colorappearance.jlight = dontforceSet && options.baBehav[ADDSET_CAT_LIGHT] ? toEdit.colorappearance.jlight + mods.colorappearance.jlight : mods.colorappearance.jlight;
}
@@ -2771,14 +2789,14 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.wavelet.expnoise = mods.wavelet.expnoise;
}
- for(int i = 0; i < 9; i++) {
- if(wavelet.c[i]) {
+ for (int i = 0; i < 9; i++) {
+ if (wavelet.c[i]) {
toEdit.wavelet.c[i] = dontforceSet && options.baBehav[ADDSET_WA] ? toEdit.wavelet.c[i] + mods.wavelet.c[i] : mods.wavelet.c[i];
}
}
- for(int i = 0; i < 9; i++) {
- if(wavelet.ch[i]) {
+ for (int i = 0; i < 9; i++) {
+ if (wavelet.ch[i]) {
toEdit.wavelet.ch[i] = dontforceSet && options.baBehav[ADDSET_WA] ? toEdit.wavelet.ch[i] + mods.wavelet.ch[i] : mods.wavelet.ch[i];
}
}
@@ -2884,8 +2902,8 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.dirpyrequalizer.cbdlMethod = mods.dirpyrequalizer.cbdlMethod;
}
- for(int i = 0; i < 6; i++) {
- if(dirpyrequalizer.mult[i]) {
+ for (int i = 0; i < 6; i++) {
+ if (dirpyrequalizer.mult[i]) {
toEdit.dirpyrequalizer.mult[i] = dontforceSet && options.baBehav[ADDSET_DIRPYREQ] ? toEdit.dirpyrequalizer.mult[i] + mods.dirpyrequalizer.mult[i] : mods.dirpyrequalizer.mult[i];
}
}
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index d6388119e..1ec6bac6c 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -311,6 +311,10 @@ public:
bool datacie;
bool tonecie;
// bool sharpcie;
+ bool tempout;
+ bool greenout;
+ bool ybout;
+
};
class DirPyrDenoiseParamsEdited
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index d211add4f..bac6a08d1 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -36,8 +36,8 @@ extern Glib::ustring argv0;
Glib::RefPtr themecss;
Glib::RefPtr fontcss;
-Preferences::Preferences (RTWindow *rtwindow)
- : Gtk::Dialog (M("MAIN_BUTTON_PREFERENCES"), *rtwindow, true)
+Preferences::Preferences (RTWindow *rtwindow)
+ : Gtk::Dialog (M ("MAIN_BUTTON_PREFERENCES"), *rtwindow, true)
, splash (nullptr)
, rprofiles (nullptr)
, iprofiles (nullptr)
@@ -45,7 +45,7 @@ Preferences::Preferences (RTWindow *rtwindow)
, newFont (false)
, newCPFont (false)
{
- regex = Glib::Regex::create(THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS);
+ regex = Glib::Regex::create (THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS);
moptions.copyFrom (&options);
@@ -66,7 +66,7 @@ Preferences::Preferences (RTWindow *rtwindow)
Gtk::Box* mainBox = get_content_area ();
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
- mainBox->set_spacing(8);
+ mainBox->set_spacing (8);
#endif
//GTK318
//set_has_separator (false);
@@ -75,32 +75,32 @@ Preferences::Preferences (RTWindow *rtwindow)
nb->set_name ("PrefNotebook");
mainBox->pack_start (*nb);
- Gtk::Button* about = Gtk::manage (new Gtk::Button (M("GENERAL_ABOUT")));
- Gtk::Button* ok = Gtk::manage (new Gtk::Button (M("GENERAL_OK")));
- Gtk::Button* cancel = Gtk::manage (new Gtk::Button (M("GENERAL_CANCEL")));
+ Gtk::Button* about = Gtk::manage (new Gtk::Button (M ("GENERAL_ABOUT")));
+ Gtk::Button* ok = Gtk::manage (new Gtk::Button (M ("GENERAL_OK")));
+ Gtk::Button* cancel = Gtk::manage (new Gtk::Button (M ("GENERAL_CANCEL")));
- about->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::aboutPressed) );
- ok->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::okPressed) );
- cancel->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::cancelPressed) );
+ about->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::aboutPressed) );
+ ok->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::okPressed) );
+ cancel->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::cancelPressed) );
get_action_area()->pack_start (*about);
get_action_area()->pack_end (*ok);
get_action_area()->pack_end (*cancel);
- nb->append_page (*getGeneralPanel(), M("PREFERENCES_TAB_GENERAL"));
- nb->append_page (*getProcParamsPanel(), M("PREFERENCES_TAB_IMPROC"));
- nb->append_page (*getDynProfilePanel(), M("PREFERENCES_TAB_DYNAMICPROFILE"));
- nb->append_page (*getFileBrowserPanel(), M("PREFERENCES_TAB_BROWSER"));
- nb->append_page (*getColorManagementPanel(), M("PREFERENCES_TAB_COLORMGR"));
- nb->append_page (*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING"));
- nb->append_page (*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE"));
+ nb->append_page (*getGeneralPanel(), M ("PREFERENCES_TAB_GENERAL"));
+ nb->append_page (*getProcParamsPanel(), M ("PREFERENCES_TAB_IMPROC"));
+ nb->append_page (*getDynProfilePanel(), M ("PREFERENCES_TAB_DYNAMICPROFILE"));
+ nb->append_page (*getFileBrowserPanel(), M ("PREFERENCES_TAB_BROWSER"));
+ nb->append_page (*getColorManagementPanel(), M ("PREFERENCES_TAB_COLORMGR"));
+ nb->append_page (*getBatchProcPanel(), M ("PREFERENCES_BATCH_PROCESSING"));
+ nb->append_page (*getPerformancePanel(), M ("PREFERENCES_TAB_PERFORMANCE"));
// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
- nb->append_page (*getSoundPanel(), M("PREFERENCES_TAB_SOUND"));
+ nb->append_page (*getSoundPanel(), M ("PREFERENCES_TAB_SOUND"));
#endif
nb->set_current_page (0);
- ProfileStore::getInstance()->addListener(this);
+ ProfileStore::getInstance()->addListener (this);
fillPreferences ();
@@ -111,20 +111,21 @@ Preferences::Preferences (RTWindow *rtwindow)
Preferences::~Preferences ()
{
- ProfileStore::getInstance()->removeListener(this);
- get_size(options.preferencesWidth, options.preferencesHeight);
+ ProfileStore::getInstance()->removeListener (this);
+ get_size (options.preferencesWidth, options.preferencesHeight);
}
-int Preferences::getThemeRowNumber(Glib::ustring& longThemeFName)
+int Preferences::getThemeRowNumber (Glib::ustring& longThemeFName)
{
- if (regex->match(longThemeFName + ".css", matchInfo)) {
- for (size_t i=0 ; imatch (longThemeFName + ".css", matchInfo)) {
+ for (size_t i = 0 ; i < themeFNames.size(); ++i) {
+ if (themeFNames.at (i).longFName == longThemeFName) {
return (int)i;
}
}
}
+
return -1;
}
@@ -135,10 +136,10 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
Gtk::ScrolledWindow* behscrollw = Gtk::manage (new Gtk::ScrolledWindow ());
behscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- behscrollw->set_size_request(-1, 60);
- Gtk::VBox* vbbeh = Gtk::manage( new Gtk::VBox () );
+ behscrollw->set_size_request (-1, 60);
+ Gtk::VBox* vbbeh = Gtk::manage ( new Gtk::VBox () );
vbbeh->pack_start (*behscrollw, Gtk::PACK_EXPAND_WIDGET);
- Gtk::Frame* behFrame = Gtk::manage (new Gtk::Frame (M("PREFERENCES_BEHAVIOR")));
+ Gtk::Frame* behFrame = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_BEHAVIOR")));
behFrame->add (*vbbeh);
//mvbpp->pack_start (*behFrame);
mvbpp->pack_start (*behFrame, Gtk::PACK_EXPAND_WIDGET, 4);
@@ -148,244 +149,244 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
behModel = Gtk::TreeStore::create (behavColumns);
behTreeView->set_model (behModel);
- behTreeView->append_column (M("PREFERENCES_PROPERTY"), behavColumns.label);
- behTreeView->append_column_editable (M("PREFERENCES_ADD"), behavColumns.badd);
- behTreeView->append_column_editable (M("PREFERENCES_SET"), behavColumns.bset);
+ behTreeView->append_column (M ("PREFERENCES_PROPERTY"), behavColumns.label);
+ behTreeView->append_column_editable (M ("PREFERENCES_ADD"), behavColumns.badd);
+ behTreeView->append_column_editable (M ("PREFERENCES_SET"), behavColumns.bset);
Gtk::CellRendererToggle* cr_add = static_cast (behTreeView->get_column (1)->get_first_cell());
Gtk::CellRendererToggle* cr_set = static_cast (behTreeView->get_column (2)->get_first_cell());
cr_add->set_radio (true);
- cr_add->set_property("xalign", 0.0f);
+ cr_add->set_property ("xalign", 0.0f);
sigc::connection addc = cr_add->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::behAddRadioToggled));
cr_set->set_radio (true);
- cr_set->set_property("xalign", 0.0f);
+ cr_set->set_property ("xalign", 0.0f);
sigc::connection setc = cr_set->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::behSetRadioToggled));
behTreeView->get_column (1)->add_attribute (*cr_add, "visible", behavColumns.visible);
- behTreeView->get_column (1)->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ behTreeView->get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
behTreeView->get_column (1)->set_fixed_width (50);
behTreeView->get_column (2)->add_attribute (*cr_set, "visible", behavColumns.visible);
- behTreeView->get_column (2)->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED);
+ behTreeView->get_column (2)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
behTreeView->get_column (2)->set_fixed_width (50);
// fill model
Gtk::TreeModel::iterator mi, ci;
/*
- * The TRUE/FALSE values of appendBehavList are replaced by the one defined in options.cc,
+ * The TRUE/FALSE values of appendBehavList are replaced by the one defined in options.cc,
*/
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_EXPOSURE_LABEL"));
- appendBehavList (mi, M("TP_EXPOSURE_EXPCOMP"), ADDSET_TC_EXPCOMP, false);
- appendBehavList (mi, M("TP_EXPOSURE_COMPRHIGHLIGHTS"), ADDSET_TC_HLCOMPAMOUNT, false);
- appendBehavList (mi, M("TP_EXPOSURE_COMPRHIGHLIGHTSTHRESHOLD"), ADDSET_TC_HLCOMPTHRESH, false);
- appendBehavList (mi, M("TP_EXPOSURE_BLACKLEVEL"), ADDSET_TC_BLACKLEVEL, false);
- appendBehavList (mi, M("TP_EXPOSURE_COMPRSHADOWS"), ADDSET_TC_SHCOMP, false);
- appendBehavList (mi, M("TP_EXPOSURE_BRIGHTNESS"), ADDSET_TC_BRIGHTNESS, false);
- appendBehavList (mi, M("TP_EXPOSURE_CONTRAST"), ADDSET_TC_CONTRAST, false);
- appendBehavList (mi, M("TP_EXPOSURE_SATURATION"), ADDSET_TC_SATURATION, false);
+ mi->set_value (behavColumns.label, M ("TP_EXPOSURE_LABEL"));
+ appendBehavList (mi, M ("TP_EXPOSURE_EXPCOMP"), ADDSET_TC_EXPCOMP, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_COMPRHIGHLIGHTS"), ADDSET_TC_HLCOMPAMOUNT, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_COMPRHIGHLIGHTSTHRESHOLD"), ADDSET_TC_HLCOMPTHRESH, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_BLACKLEVEL"), ADDSET_TC_BLACKLEVEL, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_COMPRSHADOWS"), ADDSET_TC_SHCOMP, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_BRIGHTNESS"), ADDSET_TC_BRIGHTNESS, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_CONTRAST"), ADDSET_TC_CONTRAST, false);
+ appendBehavList (mi, M ("TP_EXPOSURE_SATURATION"), ADDSET_TC_SATURATION, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_RETINEX_LABEL"));
- appendBehavList (mi, M("TP_RETINEX_STRENGTH"), ADDSET_RETI_STR, false);
- appendBehavList (mi, M("TP_RETINEX_NEIGHBOR"), ADDSET_RETI_NEIGH, false);
- appendBehavList (mi, M("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false);
- appendBehavList (mi, M("TP_RETINEX_GAMMA"), ADDSET_RETI_GAM, false);
- appendBehavList (mi, M("TP_RETINEX_SLOPE"), ADDSET_RETI_SLO, false);
- appendBehavList (mi, M("TP_RETINEX_GAIN"), ADDSET_RETI_GAIN, false);
- appendBehavList (mi, M("TP_RETINEX_OFFSET"), ADDSET_RETI_OFFS, false);
- appendBehavList (mi, M("TP_RETINEX_THRESHOLD"), ADDSET_RETI_LIMD, false);
+ mi->set_value (behavColumns.label, M ("TP_RETINEX_LABEL"));
+ appendBehavList (mi, M ("TP_RETINEX_STRENGTH"), ADDSET_RETI_STR, false);
+ appendBehavList (mi, M ("TP_RETINEX_NEIGHBOR"), ADDSET_RETI_NEIGH, false);
+ appendBehavList (mi, M ("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false);
+ appendBehavList (mi, M ("TP_RETINEX_GAMMA"), ADDSET_RETI_GAM, false);
+ appendBehavList (mi, M ("TP_RETINEX_SLOPE"), ADDSET_RETI_SLO, false);
+ appendBehavList (mi, M ("TP_RETINEX_GAIN"), ADDSET_RETI_GAIN, false);
+ appendBehavList (mi, M ("TP_RETINEX_OFFSET"), ADDSET_RETI_OFFS, false);
+ appendBehavList (mi, M ("TP_RETINEX_THRESHOLD"), ADDSET_RETI_LIMD, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_SHADOWSHLIGHTS_LABEL"));
- appendBehavList (mi, M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), ADDSET_SH_HIGHLIGHTS, false);
- appendBehavList (mi, M("TP_SHADOWSHLIGHTS_SHADOWS"), ADDSET_SH_SHADOWS, false);
- appendBehavList (mi, M("TP_SHADOWSHLIGHTS_LOCALCONTR"), ADDSET_SH_LOCALCONTRAST, false);
+ mi->set_value (behavColumns.label, M ("TP_SHADOWSHLIGHTS_LABEL"));
+ appendBehavList (mi, M ("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), ADDSET_SH_HIGHLIGHTS, false);
+ appendBehavList (mi, M ("TP_SHADOWSHLIGHTS_SHADOWS"), ADDSET_SH_SHADOWS, false);
+ appendBehavList (mi, M ("TP_SHADOWSHLIGHTS_LOCALCONTR"), ADDSET_SH_LOCALCONTRAST, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_LABCURVE_LABEL"));
- appendBehavList (mi, M("TP_LABCURVE_BRIGHTNESS"), ADDSET_LC_BRIGHTNESS, false);
- appendBehavList (mi, M("TP_LABCURVE_CONTRAST"), ADDSET_LC_CONTRAST, false);
- appendBehavList (mi, M("TP_LABCURVE_CHROMATICITY"), ADDSET_LC_CHROMATICITY, false);
+ mi->set_value (behavColumns.label, M ("TP_LABCURVE_LABEL"));
+ appendBehavList (mi, M ("TP_LABCURVE_BRIGHTNESS"), ADDSET_LC_BRIGHTNESS, false);
+ appendBehavList (mi, M ("TP_LABCURVE_CONTRAST"), ADDSET_LC_CONTRAST, false);
+ appendBehavList (mi, M ("TP_LABCURVE_CHROMATICITY"), ADDSET_LC_CHROMATICITY, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_SHARPENING_LABEL"));
- appendBehavList (mi, M("TP_SHARPENING_AMOUNT"), ADDSET_SHARP_AMOUNT, false);
+ mi->set_value (behavColumns.label, M ("TP_SHARPENING_LABEL"));
+ appendBehavList (mi, M ("TP_SHARPENING_AMOUNT"), ADDSET_SHARP_AMOUNT, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_SHARPENEDGE_LABEL"));
- appendBehavList (mi, M("TP_SHARPENEDGE_PASSES"), ADDSET_SHARPENEDGE_PASS, false);
- appendBehavList (mi, M("TP_SHARPENEDGE_AMOUNT"), ADDSET_SHARPENEDGE_AMOUNT, false);
+ mi->set_value (behavColumns.label, M ("TP_SHARPENEDGE_LABEL"));
+ appendBehavList (mi, M ("TP_SHARPENEDGE_PASSES"), ADDSET_SHARPENEDGE_PASS, false);
+ appendBehavList (mi, M ("TP_SHARPENEDGE_AMOUNT"), ADDSET_SHARPENEDGE_AMOUNT, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_SHARPENMICRO_LABEL"));
- appendBehavList (mi, M("TP_SHARPENMICRO_AMOUNT"), ADDSET_SHARPENMICRO_AMOUNT, false);
- appendBehavList (mi, M("TP_SHARPENMICRO_UNIFORMITY"), ADDSET_SHARPENMICRO_UNIFORMITY, false);
+ mi->set_value (behavColumns.label, M ("TP_SHARPENMICRO_LABEL"));
+ appendBehavList (mi, M ("TP_SHARPENMICRO_AMOUNT"), ADDSET_SHARPENMICRO_AMOUNT, false);
+ appendBehavList (mi, M ("TP_SHARPENMICRO_UNIFORMITY"), ADDSET_SHARPENMICRO_UNIFORMITY, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_DIRPYRDENOISE_LABEL"));
- // appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA"), ADDSET_DIRPYRDN_LUMA, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_LDETAIL"), ADDSET_DIRPYRDN_LUMDET, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHROMA, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_RED"), ADDSET_DIRPYRDN_CHROMARED, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_BLUE"), ADDSET_DIRPYRDN_CHROMABLUE, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_GAMMA"), ADDSET_DIRPYRDN_GAMMA, true);
- appendBehavList (mi, M("TP_DIRPYRDENOISE_PASSES"), ADDSET_DIRPYRDN_PASSES, true);
+ mi->set_value (behavColumns.label, M ("TP_DIRPYRDENOISE_LABEL"));
+ //appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMA"), ADDSET_DIRPYRDN_LUMA, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_LDETAIL"), ADDSET_DIRPYRDN_LUMDET, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHROMA, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_RED"), ADDSET_DIRPYRDN_CHROMARED, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_BLUE"), ADDSET_DIRPYRDN_CHROMABLUE, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_GAMMA"), ADDSET_DIRPYRDN_GAMMA, true);
+ appendBehavList (mi, M ("TP_DIRPYRDENOISE_PASSES"), ADDSET_DIRPYRDN_PASSES, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_WBALANCE_LABEL"));
- appendBehavList (mi, M("TP_WBALANCE_TEMPERATURE"), ADDSET_WB_TEMPERATURE, true);
- appendBehavList (mi, M("TP_WBALANCE_GREEN"), ADDSET_WB_GREEN, true);
- appendBehavList (mi, M("TP_WBALANCE_EQBLUERED"), ADDSET_WB_EQUAL, true);
- appendBehavList (mi, M("TP_WBALANCE_TEMPBIAS"), ADDSET_WB_TEMPBIAS, true);
+ mi->set_value (behavColumns.label, M ("TP_WBALANCE_LABEL"));
+ appendBehavList (mi, M ("TP_WBALANCE_TEMPERATURE"), ADDSET_WB_TEMPERATURE, true);
+ appendBehavList (mi, M ("TP_WBALANCE_GREEN"), ADDSET_WB_GREEN, true);
+ appendBehavList (mi, M ("TP_WBALANCE_EQBLUERED"), ADDSET_WB_EQUAL, true);
+ appendBehavList (mi, M ("TP_WBALANCE_TEMPBIAS"), ADDSET_WB_TEMPBIAS, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_COLORAPP_LABEL"));
- appendBehavList (mi, M("TP_COLORAPP_CIECAT_DEGREE"), ADDSET_CAT_DEGREE, true);
- appendBehavList (mi, M("TP_COLORAPP_ADAPTSCENE"), ADDSET_CAT_ADAPTSCENE, true);
- appendBehavList (mi, M("TP_COLORAPP_LIGHT"), ADDSET_CAT_LIGHT, true);
- appendBehavList (mi, M("TP_COLORAPP_BRIGHT"), ADDSET_CAT_BRIGHT, true);
- appendBehavList (mi, M("TP_COLORAPP_CHROMA"), ADDSET_CAT_CHROMA, true);
- appendBehavList (mi, M("TP_COLORAPP_RSTPRO"), ADDSET_CAT_RSTPRO, true);
- appendBehavList (mi, M("TP_COLORAPP_CONTRAST"), ADDSET_CAT_CONTRAST, true);
- appendBehavList (mi, M("TP_COLORAPP_CONTRAST_Q"), ADDSET_CAT_CONTRAST_Q, true);
- appendBehavList (mi, M("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true);
- appendBehavList (mi, M("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true);
- appendBehavList (mi, M("TP_COLORAPP_HUE"), ADDSET_CAT_HUE, true);
- appendBehavList (mi, M("TP_COLORAPP_ADAPTVIEWING"), ADDSET_CAT_ADAPTVIEWING, true);
- appendBehavList (mi, M("TP_COLORAPP_BADPIXSL"), ADDSET_CAT_BADPIX, true);
+ mi->set_value (behavColumns.label, M ("TP_COLORAPP_LABEL"));
+ appendBehavList (mi, M ("TP_COLORAPP_CIECAT_DEGREE"), ADDSET_CAT_DEGREE, true);
+ appendBehavList (mi, M ("TP_COLORAPP_ADAPTSCENE"), ADDSET_CAT_ADAPTSCENE, true);
+ appendBehavList (mi, M ("TP_COLORAPP_LIGHT"), ADDSET_CAT_LIGHT, true);
+ appendBehavList (mi, M ("TP_COLORAPP_BRIGHT"), ADDSET_CAT_BRIGHT, true);
+ appendBehavList (mi, M ("TP_COLORAPP_CHROMA"), ADDSET_CAT_CHROMA, true);
+ appendBehavList (mi, M ("TP_COLORAPP_RSTPRO"), ADDSET_CAT_RSTPRO, true);
+ appendBehavList (mi, M ("TP_COLORAPP_CONTRAST"), ADDSET_CAT_CONTRAST, true);
+ appendBehavList (mi, M ("TP_COLORAPP_CONTRAST_Q"), ADDSET_CAT_CONTRAST_Q, true);
+ appendBehavList (mi, M ("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true);
+ appendBehavList (mi, M ("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true);
+ appendBehavList (mi, M ("TP_COLORAPP_HUE"), ADDSET_CAT_HUE, true);
+ appendBehavList (mi, M ("TP_COLORAPP_ADAPTVIEWING"), ADDSET_CAT_ADAPTVIEWING, true);
+ appendBehavList (mi, M ("TP_COLORAPP_BADPIXSL"), ADDSET_CAT_BADPIX, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_VIBRANCE_LABEL"));
- appendBehavList (mi, M("TP_VIBRANCE_PASTELS"), ADDSET_VIBRANCE_PASTELS, false);
- appendBehavList (mi, M("TP_VIBRANCE_SATURATED"), ADDSET_VIBRANCE_SATURATED, false);
+ mi->set_value (behavColumns.label, M ("TP_VIBRANCE_LABEL"));
+ appendBehavList (mi, M ("TP_VIBRANCE_PASTELS"), ADDSET_VIBRANCE_PASTELS, false);
+ appendBehavList (mi, M ("TP_VIBRANCE_SATURATED"), ADDSET_VIBRANCE_SATURATED, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_GAMMA_OUTPUT"));
- appendBehavList (mi, M("TP_GAMMA_CURV"), ADDSET_FREE_OUPUT_GAMMA, false);
- appendBehavList (mi, M("TP_GAMMA_SLOP"), ADDSET_FREE_OUTPUT_SLOPE, false);
+ mi->set_value (behavColumns.label, M ("TP_GAMMA_OUTPUT"));
+ appendBehavList (mi, M ("TP_GAMMA_CURV"), ADDSET_FREE_OUPUT_GAMMA, false);
+ appendBehavList (mi, M ("TP_GAMMA_SLOP"), ADDSET_FREE_OUTPUT_SLOPE, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_CHMIXER_LABEL"));
- appendBehavList (mi, M("TP_CHMIXER_RED") + ", " + M("TP_CHMIXER_GREEN") + ", " + M("TP_CHMIXER_BLUE"), ADDSET_CHMIXER, false);
+ mi->set_value (behavColumns.label, M ("TP_CHMIXER_LABEL"));
+ appendBehavList (mi, M ("TP_CHMIXER_RED") + ", " + M ("TP_CHMIXER_GREEN") + ", " + M ("TP_CHMIXER_BLUE"), ADDSET_CHMIXER, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_BWMIX_LABEL"));
- appendBehavList (mi, M("TP_BWMIX_MIXC"), ADDSET_BLACKWHITE_HUES, false);
- appendBehavList (mi, M("TP_BWMIX_GAMMA"), ADDSET_BLACKWHITE_GAMMA, false);
+ mi->set_value (behavColumns.label, M ("TP_BWMIX_LABEL"));
+ appendBehavList (mi, M ("TP_BWMIX_MIXC"), ADDSET_BLACKWHITE_HUES, false);
+ appendBehavList (mi, M ("TP_BWMIX_GAMMA"), ADDSET_BLACKWHITE_GAMMA, false);
mi = behModel->append ();
- mi->set_value( behavColumns.label, M("TP_FILMSIMULATION_LABEL") );
- appendBehavList( mi, M( "TP_FILMSIMULATION_STRENGTH" ), ADDSET_FILMSIMULATION_STRENGTH, true );
+ mi->set_value ( behavColumns.label, M ("TP_FILMSIMULATION_LABEL") );
+ appendBehavList ( mi, M ( "TP_FILMSIMULATION_STRENGTH" ), ADDSET_FILMSIMULATION_STRENGTH, true );
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_COLORTONING_LABEL"));
- appendBehavList (mi, M("TP_COLORTONING_SPLITCOCO"), ADDSET_COLORTONING_SPLIT , true);
- appendBehavList (mi, M("TP_COLORTONING_SATURATIONTHRESHOLD"), ADDSET_COLORTONING_SATTHRESHOLD , true);
- appendBehavList (mi, M("TP_COLORTONING_SATURATEDOPACITY"), ADDSET_COLORTONING_SATOPACITY , true);
- appendBehavList (mi, M("TP_COLORTONING_BALANCE"), ADDSET_COLORTONING_BALANCE , true);
- appendBehavList (mi, M("TP_COLORTONING_STRENGTH"), ADDSET_COLORTONING_STRENGTH , true);
+ mi->set_value (behavColumns.label, M ("TP_COLORTONING_LABEL"));
+ appendBehavList (mi, M ("TP_COLORTONING_SPLITCOCO"), ADDSET_COLORTONING_SPLIT, true);
+ appendBehavList (mi, M ("TP_COLORTONING_SATURATIONTHRESHOLD"), ADDSET_COLORTONING_SATTHRESHOLD, true);
+ appendBehavList (mi, M ("TP_COLORTONING_SATURATEDOPACITY"), ADDSET_COLORTONING_SATOPACITY, true);
+ appendBehavList (mi, M ("TP_COLORTONING_BALANCE"), ADDSET_COLORTONING_BALANCE, true);
+ appendBehavList (mi, M ("TP_COLORTONING_STRENGTH"), ADDSET_COLORTONING_STRENGTH, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_ROTATE_LABEL"));
- appendBehavList (mi, M("TP_ROTATE_DEGREE"), ADDSET_ROTATE_DEGREE, false);
+ mi->set_value (behavColumns.label, M ("TP_ROTATE_LABEL"));
+ appendBehavList (mi, M ("TP_ROTATE_DEGREE"), ADDSET_ROTATE_DEGREE, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_DISTORTION_LABEL"));
- appendBehavList (mi, M("TP_DISTORTION_AMOUNT"), ADDSET_DIST_AMOUNT, false);
+ mi->set_value (behavColumns.label, M ("TP_DISTORTION_LABEL"));
+ appendBehavList (mi, M ("TP_DISTORTION_AMOUNT"), ADDSET_DIST_AMOUNT, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_PERSPECTIVE_LABEL"));
- appendBehavList (mi, M("TP_PERSPECTIVE_HORIZONTAL") + ", " + M("TP_PERSPECTIVE_VERTICAL"), ADDSET_PERSPECTIVE, false);
+ mi->set_value (behavColumns.label, M ("TP_PERSPECTIVE_LABEL"));
+ appendBehavList (mi, M ("TP_PERSPECTIVE_HORIZONTAL") + ", " + M ("TP_PERSPECTIVE_VERTICAL"), ADDSET_PERSPECTIVE, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_GRADIENT_LABEL"));
- appendBehavList (mi, M("TP_GRADIENT_DEGREE"), ADDSET_GRADIENT_DEGREE, false);
- appendBehavList (mi, M("TP_GRADIENT_FEATHER"), ADDSET_GRADIENT_FEATHER, false);
- appendBehavList (mi, M("TP_GRADIENT_STRENGTH"), ADDSET_GRADIENT_STRENGTH, false);
- appendBehavList (mi, M("TP_GRADIENT_CENTER_X") + ", " + M("TP_GRADIENT_CENTER_Y"), ADDSET_GRADIENT_CENTER, false);
+ mi->set_value (behavColumns.label, M ("TP_GRADIENT_LABEL"));
+ appendBehavList (mi, M ("TP_GRADIENT_DEGREE"), ADDSET_GRADIENT_DEGREE, false);
+ appendBehavList (mi, M ("TP_GRADIENT_FEATHER"), ADDSET_GRADIENT_FEATHER, false);
+ appendBehavList (mi, M ("TP_GRADIENT_STRENGTH"), ADDSET_GRADIENT_STRENGTH, false);
+ appendBehavList (mi, M ("TP_GRADIENT_CENTER_X") + ", " + M ("TP_GRADIENT_CENTER_Y"), ADDSET_GRADIENT_CENTER, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_PCVIGNETTE_LABEL"));
- appendBehavList (mi, M("TP_PCVIGNETTE_STRENGTH"), ADDSET_PCVIGNETTE_STRENGTH, false);
- appendBehavList (mi, M("TP_PCVIGNETTE_FEATHER"), ADDSET_PCVIGNETTE_FEATHER, false);
- appendBehavList (mi, M("TP_PCVIGNETTE_ROUNDNESS"), ADDSET_PCVIGNETTE_ROUNDNESS, false);
+ mi->set_value (behavColumns.label, M ("TP_PCVIGNETTE_LABEL"));
+ appendBehavList (mi, M ("TP_PCVIGNETTE_STRENGTH"), ADDSET_PCVIGNETTE_STRENGTH, false);
+ appendBehavList (mi, M ("TP_PCVIGNETTE_FEATHER"), ADDSET_PCVIGNETTE_FEATHER, false);
+ appendBehavList (mi, M ("TP_PCVIGNETTE_ROUNDNESS"), ADDSET_PCVIGNETTE_ROUNDNESS, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_CACORRECTION_LABEL"));
- appendBehavList (mi, M("TP_CACORRECTION_BLUE") + ", " + M("TP_CACORRECTION_RED"), ADDSET_CA, true);
+ mi->set_value (behavColumns.label, M ("TP_CACORRECTION_LABEL"));
+ appendBehavList (mi, M ("TP_CACORRECTION_BLUE") + ", " + M ("TP_CACORRECTION_RED"), ADDSET_CA, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_VIGNETTING_LABEL"));
- appendBehavList (mi, M("TP_VIGNETTING_AMOUNT"), ADDSET_VIGN_AMOUNT, false);
- appendBehavList (mi, M("TP_VIGNETTING_RADIUS"), ADDSET_VIGN_RADIUS, false);
- appendBehavList (mi, M("TP_VIGNETTING_STRENGTH"), ADDSET_VIGN_STRENGTH, false);
- appendBehavList (mi, M("TP_VIGNETTING_CENTER_X") + ", " + M("TP_VIGNETTING_CENTER_Y"), ADDSET_VIGN_CENTER, false);
+ mi->set_value (behavColumns.label, M ("TP_VIGNETTING_LABEL"));
+ appendBehavList (mi, M ("TP_VIGNETTING_AMOUNT"), ADDSET_VIGN_AMOUNT, false);
+ appendBehavList (mi, M ("TP_VIGNETTING_RADIUS"), ADDSET_VIGN_RADIUS, false);
+ appendBehavList (mi, M ("TP_VIGNETTING_STRENGTH"), ADDSET_VIGN_STRENGTH, false);
+ appendBehavList (mi, M ("TP_VIGNETTING_CENTER_X") + ", " + M ("TP_VIGNETTING_CENTER_Y"), ADDSET_VIGN_CENTER, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_DIRPYREQUALIZER_LABEL"));
- appendBehavList (mi, M("TP_EXPOSURE_CONTRAST"), ADDSET_DIRPYREQ, true);
- appendBehavList (mi, M("TP_DIRPYREQUALIZER_THRESHOLD"), ADDSET_DIRPYREQ_THRESHOLD, true);
- appendBehavList (mi, M("TP_DIRPYREQUALIZER_SKIN"), ADDSET_DIRPYREQ_SKINPROTECT, true);
+ mi->set_value (behavColumns.label, M ("TP_DIRPYREQUALIZER_LABEL"));
+ appendBehavList (mi, M ("TP_EXPOSURE_CONTRAST"), ADDSET_DIRPYREQ, true);
+ appendBehavList (mi, M ("TP_DIRPYREQUALIZER_THRESHOLD"), ADDSET_DIRPYREQ_THRESHOLD, true);
+ appendBehavList (mi, M ("TP_DIRPYREQUALIZER_SKIN"), ADDSET_DIRPYREQ_SKINPROTECT, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_WAVELET_LABEL"));
- appendBehavList (mi, M("TP_WAVELET_LEVELS"), ADDSET_WA_THRES, true);
- // appendBehavList (mi, M("TP_WAVELET_CONTRAST"), ADDSET_WA, true);
- appendBehavList (mi, M("TP_WAVELET_THRESHOLD"), ADDSET_WA_THRESHOLD, true);
- appendBehavList (mi, M("TP_WAVELET_THRESHOLD2"), ADDSET_WA_THRESHOLD2, true);
- appendBehavList (mi, M("TP_WAVELET_CHRO"), ADDSET_WA_CHRO, true);
- appendBehavList (mi, M("TP_WAVELET_CHR"), ADDSET_WA_CHROMA, true);
- appendBehavList (mi, M("TP_WAVELET_SKIN"), ADDSET_WA_SKINPROTECT, true);
- appendBehavList (mi, M("TP_WAVELET_EDRAD"), ADDSET_WA_EDGRAD, true);
- appendBehavList (mi, M("TP_WAVELET_EDVAL"), ADDSET_WA_EDGVAL, true);
- appendBehavList (mi, M("TP_WAVELET_RESCON"), ADDSET_WA_RESCON, true);
- appendBehavList (mi, M("TP_WAVELET_THR"), ADDSET_WA_THRR, true);
- appendBehavList (mi, M("TP_WAVELET_RESCONH"), ADDSET_WA_RESCONH, true);
- appendBehavList (mi, M("TP_WAVELET_THRH"), ADDSET_WA_THRRH, true);
- appendBehavList (mi, M("TP_WAVELET_RESCHRO"), ADDSET_WA_RESCHRO, true);
- appendBehavList (mi, M("TP_WAVELET_TMSTRENGTH"), ADDSET_WA_TMRS, true);
- appendBehavList (mi, M("TP_WAVELET_SKY"), ADDSET_WA_SKYPROTECT, true);
- appendBehavList (mi, M("TP_WAVELET_CONTRA"), ADDSET_WA_CONTRAST, true);
- appendBehavList (mi, M("TP_WAVELET_STRENGTH"), ADDSET_WA_STRENGTH, true);
- appendBehavList (mi, M("TP_WAVELET_COMPGAMMA"), ADDSET_WA_GAMMA, true);
- appendBehavList (mi, M("TP_WAVELET_EDGEDETECT"), ADDSET_WA_EDGEDETECT, true);
- appendBehavList (mi, M("TP_WAVELET_EDGEDETECTTHR"), ADDSET_WA_EDGEDETECTTHR, true);
- appendBehavList (mi, M("TP_WAVELET_EDGEDETECTTHR2"), ADDSET_WA_EDGEDETECTTHR2, true);
+ mi->set_value (behavColumns.label, M ("TP_WAVELET_LABEL"));
+ appendBehavList (mi, M ("TP_WAVELET_LEVELS"), ADDSET_WA_THRES, true);
+ //appendBehavList (mi, M("TP_WAVELET_CONTRAST"), ADDSET_WA, true);
+ appendBehavList (mi, M ("TP_WAVELET_THRESHOLD"), ADDSET_WA_THRESHOLD, true);
+ appendBehavList (mi, M ("TP_WAVELET_THRESHOLD2"), ADDSET_WA_THRESHOLD2, true);
+ appendBehavList (mi, M ("TP_WAVELET_CHRO"), ADDSET_WA_CHRO, true);
+ appendBehavList (mi, M ("TP_WAVELET_CHR"), ADDSET_WA_CHROMA, true);
+ appendBehavList (mi, M ("TP_WAVELET_SKIN"), ADDSET_WA_SKINPROTECT, true);
+ appendBehavList (mi, M ("TP_WAVELET_EDRAD"), ADDSET_WA_EDGRAD, true);
+ appendBehavList (mi, M ("TP_WAVELET_EDVAL"), ADDSET_WA_EDGVAL, true);
+ appendBehavList (mi, M ("TP_WAVELET_RESCON"), ADDSET_WA_RESCON, true);
+ appendBehavList (mi, M ("TP_WAVELET_THR"), ADDSET_WA_THRR, true);
+ appendBehavList (mi, M ("TP_WAVELET_RESCONH"), ADDSET_WA_RESCONH, true);
+ appendBehavList (mi, M ("TP_WAVELET_THRH"), ADDSET_WA_THRRH, true);
+ appendBehavList (mi, M ("TP_WAVELET_RESCHRO"), ADDSET_WA_RESCHRO, true);
+ appendBehavList (mi, M ("TP_WAVELET_TMSTRENGTH"), ADDSET_WA_TMRS, true);
+ appendBehavList (mi, M ("TP_WAVELET_SKY"), ADDSET_WA_SKYPROTECT, true);
+ appendBehavList (mi, M ("TP_WAVELET_CONTRA"), ADDSET_WA_CONTRAST, true);
+ appendBehavList (mi, M ("TP_WAVELET_STRENGTH"), ADDSET_WA_STRENGTH, true);
+ appendBehavList (mi, M ("TP_WAVELET_COMPGAMMA"), ADDSET_WA_GAMMA, true);
+ appendBehavList (mi, M ("TP_WAVELET_EDGEDETECT"), ADDSET_WA_EDGEDETECT, true);
+ appendBehavList (mi, M ("TP_WAVELET_EDGEDETECTTHR"), ADDSET_WA_EDGEDETECTTHR, true);
+ appendBehavList (mi, M ("TP_WAVELET_EDGEDETECTTHR2"), ADDSET_WA_EDGEDETECTTHR2, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_PREPROCESS_LABEL"));
- appendBehavList (mi, M("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
- appendBehavList (mi, M("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);
+ mi->set_value (behavColumns.label, M ("TP_PREPROCESS_LABEL"));
+ appendBehavList (mi, M ("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
+ appendBehavList (mi, M ("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_EXPOS_WHITEPOINT_LABEL"));
- appendBehavList (mi, M("TP_RAWEXPOS_LINEAR"), ADDSET_RAWEXPOS_LINEAR, false);
- appendBehavList (mi, M("TP_RAWEXPOS_PRESER"), ADDSET_RAWEXPOS_PRESER, false);
+ mi->set_value (behavColumns.label, M ("TP_EXPOS_WHITEPOINT_LABEL"));
+ appendBehavList (mi, M ("TP_RAWEXPOS_LINEAR"), ADDSET_RAWEXPOS_LINEAR, false);
+ appendBehavList (mi, M ("TP_RAWEXPOS_PRESER"), ADDSET_RAWEXPOS_PRESER, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_RAWEXPOS_BLACKS"));
- appendBehavList (mi, M("TP_RAWEXPOS_RGB"), ADDSET_RAWEXPOS_BLACKS, false);
+ mi->set_value (behavColumns.label, M ("TP_RAWEXPOS_BLACKS"));
+ appendBehavList (mi, M ("TP_RAWEXPOS_RGB"), ADDSET_RAWEXPOS_BLACKS, false);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_FLATFIELD_LABEL"));
- appendBehavList (mi, M("TP_FLATFIELD_CLIPCONTROL"), ADDSET_RAWFFCLIPCONTROL, true);
+ mi->set_value (behavColumns.label, M ("TP_FLATFIELD_LABEL"));
+ appendBehavList (mi, M ("TP_FLATFIELD_CLIPCONTROL"), ADDSET_RAWFFCLIPCONTROL, true);
mi = behModel->append ();
- mi->set_value (behavColumns.label, M("TP_CHROMATABERR_LABEL"));
- appendBehavList (mi, M("TP_RAWCACORR_CARED") + ", " + M("TP_RAWCACORR_CABLUE"), ADDSET_RAWCACORR, true);
+ mi->set_value (behavColumns.label, M ("TP_CHROMATABERR_LABEL"));
+ appendBehavList (mi, M ("TP_RAWCACORR_CARED") + ", " + M ("TP_RAWCACORR_CABLUE"), ADDSET_RAWCACORR, true);
behTreeView->expand_all ();
- behAddAll = Gtk::manage( new Gtk::Button (M("PREFERENCES_BEHADDALL")) );
- behSetAll = Gtk::manage( new Gtk::Button (M("PREFERENCES_BEHSETALL")) );
- behAddAll->set_tooltip_markup (M("PREFERENCES_BEHADDALLHINT"));
- behSetAll->set_tooltip_markup (M("PREFERENCES_BEHSETALLHINT"));
+ behAddAll = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_BEHADDALL")) );
+ behSetAll = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_BEHSETALL")) );
+ behAddAll->set_tooltip_markup (M ("PREFERENCES_BEHADDALLHINT"));
+ behSetAll->set_tooltip_markup (M ("PREFERENCES_BEHSETALLHINT"));
- behAddAll->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::behAddAllPressed) );
- behSetAll->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::behSetAllPressed) );
+ behAddAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::behAddAllPressed) );
+ behSetAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::behSetAllPressed) );
Gtk::HBox* buttonpanel1 = Gtk::manage (new Gtk::HBox ());
//buttonpanel1->set_spacing(8);
@@ -393,8 +394,8 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
buttonpanel1->pack_end (*behAddAll, Gtk::PACK_SHRINK, 4);
vbbeh->pack_start (*buttonpanel1, Gtk::PACK_SHRINK, 4);
- chOverwriteOutputFile = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_OVERWRITEOUTPUTFILE")) );
- mvbpp->pack_start(*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4);
+ chOverwriteOutputFile = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_OVERWRITEOUTPUTFILE")) );
+ mvbpp->pack_start (*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4);
return mvbpp;
}
@@ -431,7 +432,7 @@ void Preferences::behSetRadioToggled (const Glib::ustring& path)
Gtk::Widget *Preferences::getDynProfilePanel()
{
- dynProfilePanel = Gtk::manage(new DynamicProfilePanel());
+ dynProfilePanel = Gtk::manage (new DynamicProfilePanel());
return dynProfilePanel;
}
@@ -441,43 +442,43 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ());
- Gtk::Frame* fpp = Gtk::manage (new Gtk::Frame (M("PREFERENCES_IMPROCPARAMS")));
+ Gtk::Frame* fpp = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_IMPROCPARAMS")));
Gtk::VBox* vbpp = Gtk::manage (new Gtk::VBox ());
- Gtk::Label* drlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START));
+ Gtk::Label* drlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START));
rprofiles = Gtk::manage (new ProfileStoreComboBox ());
const ProfileStoreEntry* dynpse = ProfileStore::getInstance()->getInternalDynamicPSE();
- rprofiles->addRow(dynpse);
- setExpandAlignProperties(rprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- rprofiles->set_size_request(50, -1);
- rpconn = rprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forRAWComboChanged) );
- Gtk::Label* drimg = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORIMAGE") + ":", Gtk::ALIGN_START));
+ rprofiles->addRow (dynpse);
+ setExpandAlignProperties (rprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ rprofiles->set_size_request (50, -1);
+ rpconn = rprofiles->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::forRAWComboChanged) );
+ Gtk::Label* drimg = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FORIMAGE") + ":", Gtk::ALIGN_START));
iprofiles = Gtk::manage (new ProfileStoreComboBox ());
- iprofiles->addRow(dynpse);
- iprofiles->set_size_request(50, -1);
- setExpandAlignProperties(iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- ipconn = iprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forImageComboChanged) );
+ iprofiles->addRow (dynpse);
+ iprofiles->set_size_request (50, -1);
+ setExpandAlignProperties (iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ ipconn = iprofiles->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::forImageComboChanged) );
Gtk::Table* defpt = Gtk::manage (new Gtk::Table (2, 2));
defpt->attach (*drlab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
defpt->attach (*rprofiles, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
defpt->attach (*drimg, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
defpt->attach (*iprofiles, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
vbpp->pack_start (*defpt, Gtk::PACK_SHRINK, 4);
- useBundledProfiles = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_USEBUNDLEDPROFILES")));
- bpconn = useBundledProfiles->signal_clicked().connect ( sigc::mem_fun(*this, &Preferences::bundledProfilesChanged) );
+ useBundledProfiles = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_USEBUNDLEDPROFILES")));
+ bpconn = useBundledProfiles->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::bundledProfilesChanged) );
vbpp->pack_start (*useBundledProfiles, Gtk::PACK_SHRINK, 4);
fpp->add (*vbpp);
mvbpp->pack_start (*fpp, Gtk::PACK_SHRINK, 4);
// Custom profile builder box
- Gtk::Frame* cpfrm = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CUSTPROFBUILD")) );
- Gtk::Label* cplab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CUSTPROFBUILDPATH") + ":", Gtk::ALIGN_START) );
- txtCustProfBuilderPath = Gtk::manage( new Gtk::Entry () );
- txtCustProfBuilderPath->set_tooltip_markup (M("PREFERENCES_CUSTPROFBUILDHINT"));
- Gtk::Label* cpltypelab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT") + ":", Gtk::ALIGN_START) );
+ Gtk::Frame* cpfrm = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CUSTPROFBUILD")) );
+ Gtk::Label* cplab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CUSTPROFBUILDPATH") + ":", Gtk::ALIGN_START) );
+ txtCustProfBuilderPath = Gtk::manage ( new Gtk::Entry () );
+ txtCustProfBuilderPath->set_tooltip_markup (M ("PREFERENCES_CUSTPROFBUILDHINT"));
+ Gtk::Label* cpltypelab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CUSTPROFBUILDKEYFORMAT") + ":", Gtk::ALIGN_START) );
custProfBuilderLabelType = Gtk::manage (new Gtk::ComboBoxText ());
- custProfBuilderLabelType->append (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID"));
- custProfBuilderLabelType->append (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
- custProfBuilderLabelType->append (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID") + "_" + M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
+ custProfBuilderLabelType->append (M ("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID"));
+ custProfBuilderLabelType->append (M ("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
+ custProfBuilderLabelType->append (M ("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID") + "_" + M ("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
Gtk::Table* cpbt = Gtk::manage (new Gtk::Table (2, 2));
cpbt->attach (*cplab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
cpbt->attach (*txtCustProfBuilderPath, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
@@ -486,72 +487,72 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
cpfrm->add (*cpbt);
mvbpp->pack_start (*cpfrm, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* fdp = Gtk::manage (new Gtk::Frame (M("PREFERENCES_PROFILEHANDLING")));
+ Gtk::Frame* fdp = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_PROFILEHANDLING")));
Gtk::Table* vbdp = Gtk::manage (new Gtk::Table (2, 2));
saveParamsPreference = Gtk::manage (new Gtk::ComboBoxText ());
- saveParamsPreference->append(M("PREFERENCES_PROFILESAVEINPUT"));
- saveParamsPreference->append(M("PREFERENCES_PROFILESAVECACHE"));
- saveParamsPreference->append(M("PREFERENCES_PROFILESAVEBOTH"));
- Gtk::Label *splab = Gtk::manage(new Gtk::Label(M("PREFERENCES_PROFILESAVELOCATION") + ":"));
- vbdp->attach(*splab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
- vbdp->attach(*saveParamsPreference, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
- Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M("PREFERENCES_PROFILELOADPR") + ":"));
+ saveParamsPreference->append (M ("PREFERENCES_PROFILESAVEINPUT"));
+ saveParamsPreference->append (M ("PREFERENCES_PROFILESAVECACHE"));
+ saveParamsPreference->append (M ("PREFERENCES_PROFILESAVEBOTH"));
+ Gtk::Label *splab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILESAVELOCATION") + ":"));
+ vbdp->attach (*splab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
+ vbdp->attach (*saveParamsPreference, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+ Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILELOADPR") + ":"));
loadParamsPreference = Gtk::manage (new Gtk::ComboBoxText ());
- loadParamsPreference->append (M("PREFERENCES_PROFILEPRCACHE"));
- loadParamsPreference->append (M("PREFERENCES_PROFILEPRFILE"));
- vbdp->attach(*lplab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
- vbdp->attach(*loadParamsPreference, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+ loadParamsPreference->append (M ("PREFERENCES_PROFILEPRCACHE"));
+ loadParamsPreference->append (M ("PREFERENCES_PROFILEPRFILE"));
+ vbdp->attach (*lplab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
+ vbdp->attach (*loadParamsPreference, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
fdp->add (*vbdp);
mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M("PREFERENCES_DARKFRAME")) );
+ Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) );
Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ());
- darkFrameDir = Gtk::manage(new Gtk::FileChooserButton(M("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
- Gtk::Label *dfLab = Gtk::manage(new Gtk::Label(M("PREFERENCES_DIRDARKFRAMES") + ":"));
- hb42->pack_start(*dfLab , Gtk::PACK_SHRINK, 4 );
- hb42->pack_start(*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4);
- dfLabel = Gtk::manage(new Gtk::Label("Found:"));
+ darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+ Gtk::Label *dfLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_DIRDARKFRAMES") + ":"));
+ hb42->pack_start (*dfLab, Gtk::PACK_SHRINK, 4 );
+ hb42->pack_start (*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4);
+ dfLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbdf = Gtk::manage (new Gtk::VBox ());
- vbdf->pack_start( *hb42, Gtk::PACK_SHRINK, 4);
- vbdf->pack_start( *dfLabel, Gtk::PACK_SHRINK, 4 );
- fdf->add( *vbdf );
- mvbpp->pack_start ( *fdf , Gtk::PACK_SHRINK, 4);
+ vbdf->pack_start (*hb42, Gtk::PACK_SHRINK, 4);
+ vbdf->pack_start (*dfLabel, Gtk::PACK_SHRINK, 4 );
+ fdf->add (*vbdf );
+ mvbpp->pack_start (*fdf, Gtk::PACK_SHRINK, 4);
//dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
- dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
+ dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true);
// FLATFIELD
- Gtk::Frame* fff = Gtk::manage (new Gtk::Frame (M("PREFERENCES_FLATFIELD")) );
+ Gtk::Frame* fff = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FLATFIELD")) );
Gtk::HBox* hb43 = Gtk::manage (new Gtk::HBox ());
- flatFieldDir = Gtk::manage(new Gtk::FileChooserButton(M("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
- Gtk::Label *ffLab = Gtk::manage(new Gtk::Label(M("PREFERENCES_FLATFIELDSDIR") + ":"));
- hb43->pack_start(*ffLab , Gtk::PACK_SHRINK, 4 );
- hb43->pack_start(*flatFieldDir);
- ffLabel = Gtk::manage(new Gtk::Label("Found:"));
+ flatFieldDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+ Gtk::Label *ffLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FLATFIELDSDIR") + ":"));
+ hb43->pack_start (*ffLab, Gtk::PACK_SHRINK, 4 );
+ hb43->pack_start (*flatFieldDir);
+ ffLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbff = Gtk::manage (new Gtk::VBox ());
- vbff->pack_start( *hb43, Gtk::PACK_SHRINK, 4);
- vbff->pack_start( *ffLabel, Gtk::PACK_SHRINK, 4 );
- fff->add( *vbff );
- mvbpp->pack_start ( *fff , Gtk::PACK_SHRINK, 4);
+ vbff->pack_start (*hb43, Gtk::PACK_SHRINK, 4);
+ vbff->pack_start (*ffLabel, Gtk::PACK_SHRINK, 4 );
+ fff->add (*vbff );
+ mvbpp->pack_start (*fff, Gtk::PACK_SHRINK, 4);
//ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
- ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
+ ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true);
//Cluts Dir
- Gtk::Frame* clutsDirFrame = Gtk::manage (new Gtk::Frame (M("PREFERENCES_FILMSIMULATION")) );
+ Gtk::Frame* clutsDirFrame = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FILMSIMULATION")) );
Gtk::HBox* clutsDirBox = Gtk::manage (new Gtk::HBox ());
- clutsDir = Gtk::manage(new Gtk::FileChooserButton(M("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
- Gtk::Label *clutsDirLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_CLUTSDIR") + ":"));
- Gtk::Label* clutsRestartNeeded = Gtk::manage( new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
- clutsDirBox->pack_start( *clutsDirLabel, Gtk::PACK_SHRINK, 4 );
- clutsDirBox->pack_start( *clutsDir );
- clutsDirBox->pack_start( *clutsRestartNeeded, Gtk::PACK_SHRINK, 4 );
- clutsDirFrame->add( *clutsDirBox );
- mvbpp->pack_start( *clutsDirFrame, Gtk::PACK_SHRINK, 4 );
+ clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+ Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":"));
+ Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
+ clutsDirBox->pack_start (*clutsDirLabel, Gtk::PACK_SHRINK, 4 );
+ clutsDirBox->pack_start (*clutsDir );
+ clutsDirBox->pack_start (*clutsRestartNeeded, Gtk::PACK_SHRINK, 4 );
+ clutsDirFrame->add (*clutsDirBox );
+ mvbpp->pack_start (*clutsDirFrame, Gtk::PACK_SHRINK, 4 );
- Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M("PREFERENCES_METADATA")));
+ Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA")));
Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ());
- ckbTunnelMetaData = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_TUNNELMETADATA")));
+ ckbTunnelMetaData = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_TUNNELMETADATA")));
vbmd->pack_start (*ckbTunnelMetaData, Gtk::PACK_SHRINK, 4);
fmd->add (*vbmd);
mvbpp->pack_start (*fmd, Gtk::PACK_SHRINK, 4);
@@ -561,37 +562,37 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
Gtk::Widget* Preferences::getPerformancePanel ()
{
- Gtk::VBox* mainContainer = Gtk::manage( new Gtk::VBox () );
- mainContainer->set_spacing(4);
+ Gtk::VBox* mainContainer = Gtk::manage ( new Gtk::VBox () );
+ mainContainer->set_spacing (4);
- Gtk::Frame* fprevdemo = Gtk::manage (new Gtk::Frame (M("PREFERENCES_PREVDEMO")));
+ Gtk::Frame* fprevdemo = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_PREVDEMO")));
Gtk::HBox* hbprevdemo = Gtk::manage (new Gtk::HBox (false, 4));
- Gtk::Label* lprevdemo = Gtk::manage (new Gtk::Label (M("PREFERENCES_PREVDEMO_LABEL")));
+ Gtk::Label* lprevdemo = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PREVDEMO_LABEL")));
cprevdemo = Gtk::manage (new Gtk::ComboBoxText ());
- cprevdemo->append (M("PREFERENCES_PREVDEMO_FAST"));
- cprevdemo->append (M("PREFERENCES_PREVDEMO_SIDECAR"));
+ cprevdemo->append (M ("PREFERENCES_PREVDEMO_FAST"));
+ cprevdemo->append (M ("PREFERENCES_PREVDEMO_SIDECAR"));
cprevdemo->set_active (1);
hbprevdemo->pack_start (*lprevdemo, Gtk::PACK_SHRINK);
hbprevdemo->pack_start (*cprevdemo);
fprevdemo->add (*hbprevdemo);
mainContainer->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M("PREFERENCES_SERIALIZE_TIFF_READ")));
+ Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_SERIALIZE_TIFF_READ")));
Gtk::HBox* htiffserialize = Gtk::manage (new Gtk::HBox (false, 4));
- ctiffserialize = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")) );
- ctiffserialize->set_tooltip_text(M("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
+ ctiffserialize = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")) );
+ ctiffserialize->set_tooltip_text (M ("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
htiffserialize->pack_start (*ctiffserialize);
ftiffserialize->add (*htiffserialize);
mainContainer->pack_start (*ftiffserialize, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* fclut = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLUTSCACHE")) );
- Gtk::HBox* clutCacheSizeHB = Gtk::manage( new Gtk::HBox () );
- clutCacheSizeHB->set_spacing(4);
- Gtk::Label* CLUTLl = Gtk::manage( new Gtk::Label (M("PREFERENCES_CLUTSCACHE_LABEL") + ":", Gtk::ALIGN_START));
- clutCacheSizeSB = Gtk::manage( new Gtk::SpinButton () );
+ Gtk::Frame* fclut = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CLUTSCACHE")) );
+ Gtk::HBox* clutCacheSizeHB = Gtk::manage ( new Gtk::HBox () );
+ clutCacheSizeHB->set_spacing (4);
+ Gtk::Label* CLUTLl = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CLUTSCACHE_LABEL") + ":", Gtk::ALIGN_START));
+ clutCacheSizeSB = Gtk::manage ( new Gtk::SpinButton () );
clutCacheSizeSB->set_digits (0);
clutCacheSizeSB->set_increments (1, 5);
- clutCacheSizeSB->set_max_length(2); // Will this be sufficient? :)
+ clutCacheSizeSB->set_max_length (2); // Will this be sufficient? :)
#ifdef _OPENMP
clutCacheSizeSB->set_range (1, 3 * omp_get_num_procs());
#else
@@ -602,32 +603,32 @@ Gtk::Widget* Preferences::getPerformancePanel ()
fclut->add (*clutCacheSizeHB);
mainContainer->pack_start (*fclut, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* finspect = Gtk::manage( new Gtk::Frame (M("PREFERENCES_INSPECT_LABEL")) );
- Gtk::HBox* maxIBuffersHB = Gtk::manage( new Gtk::HBox () );
- maxIBuffersHB->set_spacing(4);
- maxIBuffersHB->set_tooltip_text(M("PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP"));
- Gtk::Label* maxIBufferLbl = Gtk::manage( new Gtk::Label (M("PREFERENCES_INSPECT_MAXBUFFERS_LABEL") + ":", Gtk::ALIGN_START));
- maxInspectorBuffersSB = Gtk::manage( new Gtk::SpinButton () );
+ Gtk::Frame* finspect = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_INSPECT_LABEL")) );
+ Gtk::HBox* maxIBuffersHB = Gtk::manage ( new Gtk::HBox () );
+ maxIBuffersHB->set_spacing (4);
+ maxIBuffersHB->set_tooltip_text (M ("PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP"));
+ Gtk::Label* maxIBufferLbl = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_INSPECT_MAXBUFFERS_LABEL") + ":", Gtk::ALIGN_START));
+ maxInspectorBuffersSB = Gtk::manage ( new Gtk::SpinButton () );
maxInspectorBuffersSB->set_digits (0);
maxInspectorBuffersSB->set_increments (1, 5);
- maxInspectorBuffersSB->set_max_length(2);
- maxInspectorBuffersSB->set_range (1, 12); // ... we have to set a limit, 12 seem to be enough even for systems with tons of RAM
+ maxInspectorBuffersSB->set_max_length (2);
+ maxInspectorBuffersSB->set_range (1, 12); // ... we have to set a limit, 12 seem to be enough even for systems with tons of RAM
maxIBuffersHB->pack_start (*maxIBufferLbl, Gtk::PACK_SHRINK, 0);
maxIBuffersHB->pack_end (*maxInspectorBuffersSB, Gtk::PACK_SHRINK, 0);
- finspect->add(*maxIBuffersHB);
- mainContainer->pack_start(*finspect, Gtk::PACK_SHRINK, 4);
+ finspect->add (*maxIBuffersHB);
+ mainContainer->pack_start (*finspect, Gtk::PACK_SHRINK, 4);
- Gtk::Frame* fdenoise = Gtk::manage( new Gtk::Frame (M("PREFERENCES_NOISE")) );
- Gtk::VBox* vbdenoise = Gtk::manage( new Gtk::VBox (Gtk::PACK_SHRINK, 4) );
+ Gtk::Frame* fdenoise = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_NOISE")) );
+ Gtk::VBox* vbdenoise = Gtk::manage ( new Gtk::VBox (Gtk::PACK_SHRINK, 4) );
- Gtk::Label* lreloadneeded2 = Gtk::manage (new Gtk::Label (M("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
+ Gtk::Label* lreloadneeded2 = Gtk::manage (new Gtk::Label (M ("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
Gtk::HBox* threadLimitHB = Gtk::manage (new Gtk::HBox (Gtk::PACK_SHRINK, 4));
- threadLimitHB->set_tooltip_text(M("PREFERENCES_RGBDTL_TOOLTIP"));
- Gtk::Label* RGBDTLl = Gtk::manage( new Gtk::Label (M("PREFERENCES_RGBDTL_LABEL") + ":", Gtk::ALIGN_START));
- rgbDenoiseTreadLimitSB = Gtk::manage( new Gtk::SpinButton () );
+ threadLimitHB->set_tooltip_text (M ("PREFERENCES_RGBDTL_TOOLTIP"));
+ Gtk::Label* RGBDTLl = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_RGBDTL_LABEL") + ":", Gtk::ALIGN_START));
+ rgbDenoiseTreadLimitSB = Gtk::manage ( new Gtk::SpinButton () );
rgbDenoiseTreadLimitSB->set_digits (0);
rgbDenoiseTreadLimitSB->set_increments (1, 5);
- rgbDenoiseTreadLimitSB->set_max_length(2); // Will this be sufficient? :)
+ rgbDenoiseTreadLimitSB->set_max_length (2); // Will this be sufficient? :)
#ifdef _OPENMP
int maxThreadNumber = omp_get_max_threads();
#else
@@ -637,40 +638,40 @@ Gtk::Widget* Preferences::getPerformancePanel ()
threadLimitHB->pack_start (*RGBDTLl, Gtk::PACK_SHRINK, 2);
threadLimitHB->pack_end (*rgbDenoiseTreadLimitSB, Gtk::PACK_SHRINK, 2);
- Gtk::Label* dnlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_LEVDN") + ":", Gtk::ALIGN_START));
- Gtk::Label* dnautlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_LEVAUTDN") + ":", Gtk::ALIGN_START));
- Gtk::Label* dnautsimpllab = Gtk::manage (new Gtk::Label (M("PREFERENCES_SIMPLAUT") + ":", Gtk::ALIGN_START));
- Gtk::Label* dntilab = Gtk::manage (new Gtk::Label (M("PREFERENCES_TINB") + ":", Gtk::ALIGN_START));
- Gtk::Label* dnwavlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_WAVLEV") + ":", Gtk::ALIGN_START));
- Gtk::Label* dnlisslab = Gtk::manage (new Gtk::Label (M("PREFERENCES_LISS") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dnlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LEVDN") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dnautlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LEVAUTDN") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dnautsimpllab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SIMPLAUT") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dntilab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_TINB") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dnwavlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_WAVLEV") + ":", Gtk::ALIGN_START));
+ Gtk::Label* dnlisslab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LISS") + ":", Gtk::ALIGN_START));
dnv = Gtk::manage (new Gtk::ComboBoxText ());
- dnv->append (M("PREFERENCES_MIN"));
- dnv->append (M("PREFERENCES_SMA"));
- dnv->append (M("PREFERENCES_MED"));
- dnv->append (M("PREFERENCES_MAX"));
+ dnv->append (M ("PREFERENCES_MIN"));
+ dnv->append (M ("PREFERENCES_SMA"));
+ dnv->append (M ("PREFERENCES_MED"));
+ dnv->append (M ("PREFERENCES_MAX"));
dnaut = Gtk::manage (new Gtk::ComboBoxText ());
- dnaut->append (M("PREFERENCES_AUTLOW"));
- dnaut->append (M("PREFERENCES_AUTSTD"));
+ dnaut->append (M ("PREFERENCES_AUTLOW"));
+ dnaut->append (M ("PREFERENCES_AUTSTD"));
dnautsimpl = Gtk::manage (new Gtk::ComboBoxText ());
- dnautsimpl->append (M("PREFERENCES_STDAUT"));
- dnautsimpl->append (M("PREFERENCES_EXPAUT"));
+ dnautsimpl->append (M ("PREFERENCES_STDAUT"));
+ dnautsimpl->append (M ("PREFERENCES_EXPAUT"));
dnliss = Gtk::manage (new Gtk::ComboBoxText ());
- dnliss->append (M("PREFERENCES_AUTLISVLOW"));//very low
- dnliss->append (M("PREFERENCES_AUTLISLOW"));//low
- dnliss->append (M("PREFERENCES_AUTLISSTD"));//med
- dnliss->append (M("PREFERENCES_AUTLISMAX"));//max
+ dnliss->append (M ("PREFERENCES_AUTLISVLOW")); //very low
+ dnliss->append (M ("PREFERENCES_AUTLISLOW")); //low
+ dnliss->append (M ("PREFERENCES_AUTLISSTD")); //med
+ dnliss->append (M ("PREFERENCES_AUTLISMAX")); //max
dnti = Gtk::manage (new Gtk::ComboBoxText ());
- dnti->append (M("PREFERENCES_TISTD"));
- dnti->append (M("PREFERENCES_TIMAX"));
+ dnti->append (M ("PREFERENCES_TISTD"));
+ dnti->append (M ("PREFERENCES_TIMAX"));
dnwavlev = Gtk::manage (new Gtk::ComboBoxText ());
- dnwavlev->append (M("PREFERENCES_WLZER"));
- dnwavlev->append (M("PREFERENCES_WLONE"));
- dnwavlev->append (M("PREFERENCES_WLTWO"));
+ dnwavlev->append (M ("PREFERENCES_WLZER"));
+ dnwavlev->append (M ("PREFERENCES_WLONE"));
+ dnwavlev->append (M ("PREFERENCES_WLTWO"));
Gtk::Table* colon = Gtk::manage (new Gtk::Table (6, 2));
colon->attach (*dnlab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
@@ -688,10 +689,10 @@ Gtk::Widget* Preferences::getPerformancePanel ()
vbdenoise->pack_start (*lreloadneeded2, Gtk::PACK_SHRINK);
vbdenoise->pack_start (*colon, Gtk::PACK_SHRINK);
- vbdenoise->pack_start(*threadLimitHB, Gtk::PACK_SHRINK);
+ vbdenoise->pack_start (*threadLimitHB, Gtk::PACK_SHRINK);
// <--- To be hard-coded and removed once tested
- cbdaubech = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_DAUB_LABEL"), Gtk::ALIGN_START));
- cbdaubech->set_tooltip_markup (M("PREFERENCES_DAUB_TOOLTIP"));
+ cbdaubech = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_DAUB_LABEL"), Gtk::ALIGN_START));
+ cbdaubech->set_tooltip_markup (M ("PREFERENCES_DAUB_TOOLTIP"));
// vbdenoise->pack_start (*cbdaubech, Gtk::PACK_SHRINK);
// --->
fdenoise->add (*vbdenoise);
@@ -706,10 +707,10 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
Gtk::VBox* mvbcm = Gtk::manage (new Gtk::VBox ());
mvbcm->set_spacing (4);
- iccDir = Gtk::manage (new Gtk::FileChooserButton (M("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
- setExpandAlignProperties(iccDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::Label* pdlabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_ICCDIR") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(pdlabel, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ iccDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+ setExpandAlignProperties (iccDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ Gtk::Label* pdlabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_ICCDIR") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (pdlabel, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
Gtk::Grid* iccdgrid = Gtk::manage (new Gtk::Grid ());
setExpandAlignProperties (iccdgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
@@ -720,56 +721,57 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
iccDir->signal_selection_changed ().connect (sigc::mem_fun (this, &Preferences::iccDirChanged));
- mvbcm->pack_start(*iccdgrid, Gtk::PACK_SHRINK);
+ mvbcm->pack_start (*iccdgrid, Gtk::PACK_SHRINK);
- //------------------------- MONITOR ----------------------
+ //------------------------- MONITOR ----------------------
- Gtk::Frame* fmonitor = Gtk::manage( new Gtk::Frame (M("PREFERENCES_MONITOR")) );
- Gtk::Grid* gmonitor = Gtk::manage( new Gtk::Grid () );
+ Gtk::Frame* fmonitor = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_MONITOR")) );
+ Gtk::Grid* gmonitor = Gtk::manage ( new Gtk::Grid () );
gmonitor->set_column_spacing (4);
monProfile = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(monProfile, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::Label* mplabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONPROFILE") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(mplabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties (monProfile, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ Gtk::Label* mplabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_MONPROFILE") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (mplabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
monIntent = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(monIntent, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::Label* milabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONINTENT")+":", Gtk::ALIGN_START));
- setExpandAlignProperties(milabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties (monIntent, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ Gtk::Label* milabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_MONINTENT") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (milabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- monProfile->append (M("PREFERENCES_PROFILE_NONE"));
+ monProfile->append (M ("PREFERENCES_PROFILE_NONE"));
monProfile->set_active (0);
const std::vector profiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
+
for (const auto profile : profiles) {
- if (profile.find("file:") != 0) {
+ if (profile.find ("file:") != 0) {
monProfile->append (profile);
}
}
// same order as the enum
- monIntent->append (M("PREFERENCES_INTENT_PERCEPTUAL"));
- monIntent->append (M("PREFERENCES_INTENT_RELATIVE"));
- monIntent->append (M("PREFERENCES_INTENT_ABSOLUTE"));
+ monIntent->append (M ("PREFERENCES_INTENT_PERCEPTUAL"));
+ monIntent->append (M ("PREFERENCES_INTENT_RELATIVE"));
+ monIntent->append (M ("PREFERENCES_INTENT_ABSOLUTE"));
monIntent->set_active (1);
- monIntent->set_size_request(120, -1);
+ monIntent->set_size_request (120, -1);
- monBPC = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_CMMBPC")));
- setExpandAlignProperties(monBPC, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ monBPC = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CMMBPC")));
+ setExpandAlignProperties (monBPC, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
monBPC->set_active (true);
//#if defined(WIN32) // Auto-detection not implemented for Linux, see issue 851
- cbAutoMonProfile = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_AUTOMONPROFILE")));
- setExpandAlignProperties(cbAutoMonProfile, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- autoMonProfileConn = cbAutoMonProfile->signal_toggled().connect (sigc::mem_fun(*this, &Preferences::autoMonProfileToggled));
+ cbAutoMonProfile = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_AUTOMONPROFILE")));
+ setExpandAlignProperties (cbAutoMonProfile, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ autoMonProfileConn = cbAutoMonProfile->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::autoMonProfileToggled));
//#endif
int row = 0;
gmonitor->attach (*mplabel, 0, row, 1, 1);
#if defined(__APPLE__) // monitor profile not supported on apple
- Gtk::Label *osxwarn = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONPROFILE_WARNOSX"), Gtk::ALIGN_START));
- setExpandAlignProperties(osxwarn, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
+ Gtk::Label *osxwarn = Gtk::manage (new Gtk::Label (M ("PREFERENCES_MONPROFILE_WARNOSX"), Gtk::ALIGN_START));
+ setExpandAlignProperties (osxwarn, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
gmonitor->attach (*osxwarn, 1, row, 1, 1);
#else
gmonitor->attach (*monProfile, 1, row, 1, 1);
@@ -788,40 +790,42 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
autoMonProfileToggled();
//#endif
- fmonitor->add(*gmonitor);
+ fmonitor->add (*gmonitor);
- mvbcm->pack_start(*fmonitor, Gtk::PACK_SHRINK);
+ mvbcm->pack_start (*fmonitor, Gtk::PACK_SHRINK);
- //------------------------- PRINTER ----------------------
+ //------------------------- PRINTER ----------------------
- Gtk::Frame* fprinter = Gtk::manage( new Gtk::Frame (M("PREFERENCES_PRINTER")) );
- Gtk::Grid* gprinter = Gtk::manage( new Gtk::Grid () );
+ Gtk::Frame* fprinter = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_PRINTER")) );
+ Gtk::Grid* gprinter = Gtk::manage ( new Gtk::Grid () );
gprinter->set_column_spacing (4);
prtProfile = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(prtProfile, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::Label* pplabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_PRTPROFILE") + ":"));
- setExpandAlignProperties(pplabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties (prtProfile, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ Gtk::Label* pplabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PRTPROFILE") + ":"));
+ setExpandAlignProperties (pplabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
prtIntent = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(prtIntent, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- Gtk::Label* pilabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_PRTINTENT")+":"));
- setExpandAlignProperties(pilabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties (prtIntent, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ Gtk::Label* pilabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PRTINTENT") + ":"));
+ setExpandAlignProperties (pilabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- prtProfile->append (M("PREFERENCES_PROFILE_NONE"));
+ prtProfile->append (M ("PREFERENCES_PROFILE_NONE"));
prtProfile->set_active (0);
const std::vector prtprofiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::PRINTER);
- for (const auto prtprofile : prtprofiles)
+
+ for (const auto prtprofile : prtprofiles) {
prtProfile->append (prtprofile);
+ }
// same order as the enum
- prtIntent->append (M("PREFERENCES_INTENT_PERCEPTUAL"));
- prtIntent->append (M("PREFERENCES_INTENT_RELATIVE"));
- prtIntent->append (M("PREFERENCES_INTENT_ABSOLUTE"));
+ prtIntent->append (M ("PREFERENCES_INTENT_PERCEPTUAL"));
+ prtIntent->append (M ("PREFERENCES_INTENT_RELATIVE"));
+ prtIntent->append (M ("PREFERENCES_INTENT_ABSOLUTE"));
prtIntent->set_active (1);
- prtBPC = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_CMMBPC")));
- setExpandAlignProperties(prtBPC, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ prtBPC = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CMMBPC")));
+ setExpandAlignProperties (prtBPC, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
prtBPC->set_active (true);
row = 0;
@@ -837,63 +841,71 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
autoMonProfileToggled();
//#endif
- fprinter->add(*gprinter);
+ fprinter->add (*gprinter);
- mvbcm->pack_start(*fprinter, Gtk::PACK_SHRINK);
+ mvbcm->pack_start (*fprinter, Gtk::PACK_SHRINK);
- //------------------------- CIECAM ----------------------
+ //------------------------- CIECAM ----------------------
- Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ /*
+ Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- view = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(view, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- view->append (M("PREFERENCES_D50"));
- view->append (M("PREFERENCES_D55"));
- view->append (M("PREFERENCES_D60"));
- view->append (M("PREFERENCES_D65"));
- view->append (M("PREFERENCES_BLACKBODY"));
- view->append (M("PREFERENCES_FLUOF2"));
- view->append (M("PREFERENCES_FLUOF7"));
- view->append (M("PREFERENCES_FLUOF11"));
+ view = Gtk::manage (new Gtk::ComboBoxText ());
+ setExpandAlignProperties (view, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ view->append (M("PREFERENCES_D50_MENU"));
- Gtk::Label* greylab = Gtk::manage (new Gtk::Label (M("PREFERENCES_GREY") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(greylab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- grey = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(grey, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- grey->append (M("PREFERENCES_GREY05"));
- grey->append (M("PREFERENCES_GREY10"));
- grey->append (M("PREFERENCES_GREY15"));
- grey->append (M("PREFERENCES_GREY18"));
- grey->append (M("PREFERENCES_GREY23"));
- grey->append (M("PREFERENCES_GREY30"));
- grey->append (M("PREFERENCES_GREY40"));
+ view->append (M ("PREFERENCES_D50"));
+ view->append (M("PREFERENCES_D55"));
+ view->append (M("PREFERENCES_D60"));
+ view->append (M("PREFERENCES_D65"));
+ view->append (M("PREFERENCES_BLACKBODY"));
+ view->append (M("PREFERENCES_FLUOF2"));
+ view->append (M("PREFERENCES_FLUOF7"));
+ view->append (M("PREFERENCES_FLUOF11"));
- Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ Gtk::Label* greylab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREY") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (greylab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ grey = Gtk::manage (new Gtk::ComboBoxText ());
+ setExpandAlignProperties (grey, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ grey->append (M("PREFERENCES_GREY05"));
+ grey->append (M("PREFERENCES_GREY10"));
+ grey->append (M("PREFERENCES_GREY15"));
+ grey->append (M ("PREFERENCES_GREY18"));
+ grey->append (M("PREFERENCES_GREY18_MENU"));
+
+ grey->append (M("PREFERENCES_GREY23"));
+ grey->append (M("PREFERENCES_GREY30"));
+ grey->append (M("PREFERENCES_GREY40"));
+ */
+
+ Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
greySc = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(greySc, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- greySc->append (M("PREFERENCES_GREYSCA"));
- greySc->append (M("PREFERENCES_GREYSC18"));
+ setExpandAlignProperties (greySc, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ greySc->append (M ("PREFERENCES_GREYSCA"));
+ greySc->append (M ("PREFERENCES_GREYSC18"));
- Gtk::Frame* fcielab = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CIEART_FRAME")) );
- setExpandAlignProperties(fcielab, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
+ Gtk::Frame* fcielab = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CIEART_FRAME")) );
+ setExpandAlignProperties (fcielab, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
Gtk::Grid* colo = Gtk::manage (new Gtk::Grid ());
- setExpandAlignProperties(colo, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
- setExpandAlignProperties(lreloadneeded1, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- colo->attach (*lreloadneeded1, 0, 0, 2, 1);
- colo->attach (*viewlab, 0, 1, 1, 1);
- colo->attach (*view, 1, 1, 1, 1);
- colo->attach (*greylab, 0, 2, 1, 1);
- colo->attach (*grey, 1, 2, 1, 1);
- colo->attach (*greySclab, 0, 3, 1, 1);
- colo->attach (*greySc, 1, 3, 1, 1);
- cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_CIEART_LABEL")));
- setExpandAlignProperties(cbciecamfloat, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ setExpandAlignProperties (colo, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M ("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
+ setExpandAlignProperties (lreloadneeded1, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ colo->attach (*lreloadneeded1, 0, 0, 2, 1);
+ /*
+ colo->attach (*viewlab, 0, 1, 1, 1);
+ colo->attach (*view, 1, 1, 1, 1);
+ colo->attach (*greylab, 0, 2, 1, 1);
+ colo->attach (*grey, 1, 2, 1, 1);
+ */
+ colo->attach (*greySclab, 0, 3, 1, 1);
+ colo->attach (*greySc, 1, 3, 1, 1);
+ cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL")));
+ setExpandAlignProperties (cbciecamfloat, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
colo->attach (*cbciecamfloat, 0, 4, 2, 1);
- cbciecamfloat->set_tooltip_markup (M("PREFERENCES_CIEART_TOOLTIP"));
+ cbciecamfloat->set_tooltip_markup (M ("PREFERENCES_CIEART_TOOLTIP"));
fcielab->add (*colo);
mvbcm->pack_start (*fcielab, Gtk::PACK_SHRINK, 4);
@@ -904,96 +916,96 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
Gtk::Widget* Preferences::getGeneralPanel ()
{
- Gtk::Grid* mvbsd = Gtk::manage( new Gtk::Grid () );
- mvbsd->set_column_spacing(4);
- mvbsd->set_row_spacing(4);
+ Gtk::Grid* mvbsd = Gtk::manage ( new Gtk::Grid () );
+ mvbsd->set_column_spacing (4);
+ mvbsd->set_row_spacing (4);
- Gtk::Frame* fworklflow = Gtk::manage (new Gtk::Frame (M("PREFERENCES_WORKFLOW")));
- setExpandAlignProperties(fworklflow, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
+ Gtk::Frame* fworklflow = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_WORKFLOW")));
+ setExpandAlignProperties (fworklflow, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
Gtk::Grid* workflowGrid = Gtk::manage (new Gtk::Grid());
- workflowGrid->set_column_spacing(4);
- workflowGrid->set_row_spacing(4);
- setExpandAlignProperties(workflowGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ workflowGrid->set_column_spacing (4);
+ workflowGrid->set_row_spacing (4);
+ setExpandAlignProperties (workflowGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Label* flayoutlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_EDITORLAYOUT") + ":"));
- setExpandAlignProperties(flayoutlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ Gtk::Label* flayoutlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_EDITORLAYOUT") + ":"));
+ setExpandAlignProperties (flayoutlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
editorLayout = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(editorLayout, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- editorLayout->append (M("PREFERENCES_SINGLETAB"));
- editorLayout->append (M("PREFERENCES_SINGLETABVERTAB"));
- editorLayout->append (M("PREFERENCES_MULTITAB"));
- editorLayout->append (M("PREFERENCES_MULTITABDUALMON"));
+ setExpandAlignProperties (editorLayout, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ editorLayout->append (M ("PREFERENCES_SINGLETAB"));
+ editorLayout->append (M ("PREFERENCES_SINGLETABVERTAB"));
+ editorLayout->append (M ("PREFERENCES_MULTITAB"));
+ editorLayout->append (M ("PREFERENCES_MULTITABDUALMON"));
editorLayout->set_active (2);
- Gtk::CellRendererText* cellRenderer = dynamic_cast(editorLayout->get_first_cell());
+ Gtk::CellRendererText* cellRenderer = dynamic_cast (editorLayout->get_first_cell());
cellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE;
cellRenderer->property_ellipsize_set() = true;
- editorLayout->signal_changed().connect (sigc::mem_fun(*this, &Preferences::layoutComboChanged));
+ editorLayout->signal_changed().connect (sigc::mem_fun (*this, &Preferences::layoutComboChanged));
layoutComboChanged(); // update the tooltip
- Gtk::Label* lNextStart = Gtk::manage( new Gtk::Label (Glib::ustring("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
- setExpandAlignProperties(lNextStart, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- workflowGrid->attach_next_to(*flayoutlab, Gtk::POS_LEFT, 1, 1);
- workflowGrid->attach_next_to(*editorLayout, *flayoutlab, Gtk::POS_RIGHT, 1, 1);
- workflowGrid->attach_next_to(*lNextStart, *editorLayout, Gtk::POS_RIGHT, 1, 1);
+ Gtk::Label* lNextStart = Gtk::manage ( new Gtk::Label (Glib::ustring ("(") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
+ setExpandAlignProperties (lNextStart, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ workflowGrid->attach_next_to (*flayoutlab, Gtk::POS_LEFT, 1, 1);
+ workflowGrid->attach_next_to (*editorLayout, *flayoutlab, Gtk::POS_RIGHT, 1, 1);
+ workflowGrid->attach_next_to (*lNextStart, *editorLayout, Gtk::POS_RIGHT, 1, 1);
- Gtk::Label* curveBBoxPosL = Gtk::manage (new Gtk::Label (M("PREFERENCES_CURVEBBOXPOS") + ":"));
- setExpandAlignProperties(curveBBoxPosL, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ Gtk::Label* curveBBoxPosL = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CURVEBBOXPOS") + ":"));
+ setExpandAlignProperties (curveBBoxPosL, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
curveBBoxPosC = Gtk::manage (new Gtk::ComboBoxText ());
- setExpandAlignProperties(curveBBoxPosC, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- curveBBoxPosC->append (M("PREFERENCES_CURVEBBOXPOS_ABOVE"));
- curveBBoxPosC->append (M("PREFERENCES_CURVEBBOXPOS_RIGHT"));
- curveBBoxPosC->append (M("PREFERENCES_CURVEBBOXPOS_BELOW"));
- curveBBoxPosC->append (M("PREFERENCES_CURVEBBOXPOS_LEFT"));
+ setExpandAlignProperties (curveBBoxPosC, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ curveBBoxPosC->append (M ("PREFERENCES_CURVEBBOXPOS_ABOVE"));
+ curveBBoxPosC->append (M ("PREFERENCES_CURVEBBOXPOS_RIGHT"));
+ curveBBoxPosC->append (M ("PREFERENCES_CURVEBBOXPOS_BELOW"));
+ curveBBoxPosC->append (M ("PREFERENCES_CURVEBBOXPOS_LEFT"));
curveBBoxPosC->set_active (1);
- Gtk::Label* curveBBoxPosRestartL = Gtk::manage (new Gtk::Label (Glib::ustring("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")"));
- setExpandAlignProperties(curveBBoxPosRestartL, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- workflowGrid->attach_next_to(*curveBBoxPosL, *flayoutlab, Gtk::POS_BOTTOM, 1, 1);
- workflowGrid->attach_next_to(*curveBBoxPosC, *editorLayout, Gtk::POS_BOTTOM, 1, 1);
- workflowGrid->attach_next_to(*curveBBoxPosRestartL, *lNextStart, Gtk::POS_BOTTOM, 1, 1);
+ Gtk::Label* curveBBoxPosRestartL = Gtk::manage (new Gtk::Label (Glib::ustring ("(") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")"));
+ setExpandAlignProperties (curveBBoxPosRestartL, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ workflowGrid->attach_next_to (*curveBBoxPosL, *flayoutlab, Gtk::POS_BOTTOM, 1, 1);
+ workflowGrid->attach_next_to (*curveBBoxPosC, *editorLayout, Gtk::POS_BOTTOM, 1, 1);
+ workflowGrid->attach_next_to (*curveBBoxPosRestartL, *lNextStart, Gtk::POS_BOTTOM, 1, 1);
- ckbHistogramPositionLeft = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_HISTOGRAMPOSITIONLEFT")) );
- setExpandAlignProperties(ckbHistogramPositionLeft, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- ckbHistogramWorking = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_HISTOGRAMWORKING")) );
- setExpandAlignProperties(ckbHistogramWorking, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- ckbHistogramWorking->set_tooltip_markup (M("PREFERENCES_HISTOGRAM_TOOLTIP"));
- workflowGrid->attach_next_to(*ckbHistogramPositionLeft, *curveBBoxPosL, Gtk::POS_BOTTOM, 1, 1);
- workflowGrid->attach_next_to(*ckbHistogramWorking, *curveBBoxPosC, Gtk::POS_BOTTOM, 2, 1);
+ ckbHistogramPositionLeft = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_HISTOGRAMPOSITIONLEFT")) );
+ setExpandAlignProperties (ckbHistogramPositionLeft, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ ckbHistogramWorking = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_HISTOGRAMWORKING")) );
+ setExpandAlignProperties (ckbHistogramWorking, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ ckbHistogramWorking->set_tooltip_markup (M ("PREFERENCES_HISTOGRAM_TOOLTIP"));
+ workflowGrid->attach_next_to (*ckbHistogramPositionLeft, *curveBBoxPosL, Gtk::POS_BOTTOM, 1, 1);
+ workflowGrid->attach_next_to (*ckbHistogramWorking, *curveBBoxPosC, Gtk::POS_BOTTOM, 2, 1);
- ckbFileBrowserToolbarSingleRow = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) );
- setExpandAlignProperties(ckbFileBrowserToolbarSingleRow, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
- ckbShowFilmStripToolBar = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWFILMSTRIPTOOLBAR")) );
- setExpandAlignProperties(ckbShowFilmStripToolBar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
- workflowGrid->attach_next_to(*ckbFileBrowserToolbarSingleRow, *ckbHistogramPositionLeft, Gtk::POS_BOTTOM, 1, 1);
- workflowGrid->attach_next_to(*ckbShowFilmStripToolBar, *ckbHistogramWorking, Gtk::POS_BOTTOM, 2, 1);
+ ckbFileBrowserToolbarSingleRow = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) );
+ setExpandAlignProperties (ckbFileBrowserToolbarSingleRow, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
+ ckbShowFilmStripToolBar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SHOWFILMSTRIPTOOLBAR")) );
+ setExpandAlignProperties (ckbShowFilmStripToolBar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
+ workflowGrid->attach_next_to (*ckbFileBrowserToolbarSingleRow, *ckbHistogramPositionLeft, Gtk::POS_BOTTOM, 1, 1);
+ workflowGrid->attach_next_to (*ckbShowFilmStripToolBar, *ckbHistogramWorking, Gtk::POS_BOTTOM, 2, 1);
- Gtk::Label* hb4label = Gtk::manage( new Gtk::Label (M("PREFERENCES_TP_LABEL")) );
- setExpandAlignProperties(hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- ckbHideTPVScrollbar = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_TP_VSCROLLBAR")) );
- setExpandAlignProperties(ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- ckbUseIconNoText = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_TP_USEICONORTEXT")) );
- setExpandAlignProperties(ckbUseIconNoText, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- workflowGrid->attach_next_to(*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);
- workflowGrid->attach_next_to(*ckbHideTPVScrollbar, *hb4label, Gtk::POS_RIGHT, 1, 1);
- workflowGrid->attach_next_to(*ckbUseIconNoText, *ckbHideTPVScrollbar, Gtk::POS_RIGHT, 1, 1);
+ Gtk::Label* hb4label = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_TP_LABEL")) );
+ setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ ckbHideTPVScrollbar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_VSCROLLBAR")) );
+ setExpandAlignProperties (ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ ckbUseIconNoText = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_USEICONORTEXT")) );
+ setExpandAlignProperties (ckbUseIconNoText, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);
+ workflowGrid->attach_next_to (*ckbHideTPVScrollbar, *hb4label, Gtk::POS_RIGHT, 1, 1);
+ workflowGrid->attach_next_to (*ckbUseIconNoText, *ckbHideTPVScrollbar, Gtk::POS_RIGHT, 1, 1);
fworklflow->add (*workflowGrid);
- mvbsd->attach_next_to(*fworklflow, Gtk::POS_TOP, 2, 1);
+ mvbsd->attach_next_to (*fworklflow, Gtk::POS_TOP, 2, 1);
// ---------------------------------------------
- Gtk::Frame* flang = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTLANG")) );
- setExpandAlignProperties(flang, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
- Gtk::Grid* langGrid = Gtk::manage( new Gtk::Grid() );
- langGrid->set_column_spacing(4);
- langGrid->set_row_spacing(4);
- setExpandAlignProperties(langGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ Gtk::Frame* flang = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_DEFAULTLANG")) );
+ setExpandAlignProperties (flang, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
+ Gtk::Grid* langGrid = Gtk::manage ( new Gtk::Grid() );
+ langGrid->set_column_spacing (4);
+ langGrid->set_row_spacing (4);
+ setExpandAlignProperties (langGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- ckbLangAutoDetect = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_LANGAUTODETECT")) );
- setExpandAlignProperties(ckbLangAutoDetect, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ ckbLangAutoDetect = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_LANGAUTODETECT")) );
+ setExpandAlignProperties (ckbLangAutoDetect, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- Gtk::Label* langlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTLANG") + ":") );
- setExpandAlignProperties(langlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- languages = Gtk::manage( new Gtk::ComboBoxText () );
- setExpandAlignProperties(languages, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ Gtk::Label* langlab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_SELECTLANG") + ":") );
+ setExpandAlignProperties (langlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ languages = Gtk::manage ( new Gtk::ComboBoxText () );
+ setExpandAlignProperties (languages, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
std::vector langs;
parseDir (argv0 + "/languages", langs, "");
@@ -1004,214 +1016,216 @@ Gtk::Widget* Preferences::getGeneralPanel ()
}
}
- Gtk::Label* langw = Gtk::manage( new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
- setExpandAlignProperties(langw, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- langGrid->attach_next_to(*ckbLangAutoDetect, Gtk::POS_LEFT, 3, 1);
- langGrid->attach_next_to(*langlab, *ckbLangAutoDetect, Gtk::POS_BOTTOM, 1, 1);
- langGrid->attach_next_to(*languages, *langlab, Gtk::POS_RIGHT, 1, 1);
- langGrid->attach_next_to(*langw, *languages, Gtk::POS_RIGHT, 1, 1);
+ Gtk::Label* langw = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
+ setExpandAlignProperties (langw, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ langGrid->attach_next_to (*ckbLangAutoDetect, Gtk::POS_LEFT, 3, 1);
+ langGrid->attach_next_to (*langlab, *ckbLangAutoDetect, Gtk::POS_BOTTOM, 1, 1);
+ langGrid->attach_next_to (*languages, *langlab, Gtk::POS_RIGHT, 1, 1);
+ langGrid->attach_next_to (*langw, *languages, Gtk::POS_RIGHT, 1, 1);
flang->add (*langGrid);
- mvbsd->attach_next_to(*flang, *fworklflow, Gtk::POS_BOTTOM, 2, 1);
+ mvbsd->attach_next_to (*flang, *fworklflow, Gtk::POS_BOTTOM, 2, 1);
// ---------------------------------------------
- Gtk::Frame* ftheme = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTTHEME")) );
- setExpandAlignProperties(ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
- Gtk::Grid* themeGrid = Gtk::manage( new Gtk::Grid() );
- themeGrid->set_column_spacing(4);
- themeGrid->set_row_spacing(4);
- setExpandAlignProperties(themeGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Frame* ftheme = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_DEFAULTTHEME")) );
+ setExpandAlignProperties (ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
+ Gtk::Grid* themeGrid = Gtk::manage ( new Gtk::Grid() );
+ themeGrid->set_column_spacing (4);
+ themeGrid->set_row_spacing (4);
+ setExpandAlignProperties (themeGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Label* themelab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTTHEME") + ":") );
- setExpandAlignProperties(themelab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- theme = Gtk::manage( new Gtk::ComboBoxText () );
- setExpandAlignProperties(theme, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ Gtk::Label* themelab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_SELECTTHEME") + ":") );
+ setExpandAlignProperties (themelab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ theme = Gtk::manage ( new Gtk::ComboBoxText () );
+ setExpandAlignProperties (theme, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
theme->set_active (0);
- parseThemeDir (Glib::build_filename(argv0, "themes"));
+ parseThemeDir (Glib::build_filename (argv0, "themes"));
for (size_t i = 0; i < themeFNames.size(); i++) {
- theme->append (themeFNames.at(i).shortFName);
+ theme->append (themeFNames.at (i).shortFName);
}
- themeGrid->attach_next_to(*themelab, Gtk::POS_LEFT, 1, 1);
- themeGrid->attach_next_to(*theme, *themelab, Gtk::POS_RIGHT, 1, 1);
+ themeGrid->attach_next_to (*themelab, Gtk::POS_LEFT, 1, 1);
+ themeGrid->attach_next_to (*theme, *themelab, Gtk::POS_RIGHT, 1, 1);
+
+ Gtk::Label* fontlab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_SELECTFONT")) );
+ setExpandAlignProperties (fontlab, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ fontButton = Gtk::manage ( new Gtk::FontButton ());
+ setExpandAlignProperties (fontButton, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ fontButton->set_use_size (true);
- Gtk::Label* fontlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTFONT")) );
- setExpandAlignProperties(fontlab, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- fontButton = Gtk::manage( new Gtk::FontButton ());
- setExpandAlignProperties(fontButton, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- fontButton->set_use_size(true);
if (options.fontFamily == "default") {
- fontButton->set_font_name (Glib::ustring::compose("%1 %2", initialFontFamily, initialFontSize));
+ fontButton->set_font_name (Glib::ustring::compose ("%1 %2", initialFontFamily, initialFontSize));
} else {
- fontButton->set_font_name (Glib::ustring::compose("%1 %2", options.fontFamily, options.fontSize));
+ fontButton->set_font_name (Glib::ustring::compose ("%1 %2", options.fontFamily, options.fontSize));
}
- themeGrid->attach_next_to(*fontlab, *theme, Gtk::POS_RIGHT, 1, 1);
- themeGrid->attach_next_to(*fontButton, *fontlab, Gtk::POS_RIGHT, 1, 1);
+ themeGrid->attach_next_to (*fontlab, *theme, Gtk::POS_RIGHT, 1, 1);
+ themeGrid->attach_next_to (*fontButton, *fontlab, Gtk::POS_RIGHT, 1, 1);
+
+ Gtk::Label* cpfontlab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_SELECTFONT_COLPICKER") + ":") );
+ setExpandAlignProperties (cpfontlab, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ colorPickerFontButton = Gtk::manage ( new Gtk::FontButton ());
+ setExpandAlignProperties (fontButton, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ colorPickerFontButton->set_use_size (true);
- Gtk::Label* cpfontlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTFONT_COLPICKER") + ":") );
- setExpandAlignProperties(cpfontlab, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- colorPickerFontButton = Gtk::manage( new Gtk::FontButton ());
- setExpandAlignProperties(fontButton, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
- colorPickerFontButton->set_use_size(true);
if (options.fontFamily == "default") {
- colorPickerFontButton->set_font_name (Glib::ustring::compose("%1 %2", initialFontFamily, initialFontSize));
+ colorPickerFontButton->set_font_name (Glib::ustring::compose ("%1 %2", initialFontFamily, initialFontSize));
} else {
- colorPickerFontButton->set_font_name (Glib::ustring::compose("%1 %2", options.CPFontFamily, options.CPFontSize));
+ colorPickerFontButton->set_font_name (Glib::ustring::compose ("%1 %2", options.CPFontFamily, options.CPFontSize));
}
- themeGrid->attach_next_to(*cpfontlab, *fontButton, Gtk::POS_RIGHT, 1, 1);
- themeGrid->attach_next_to(*colorPickerFontButton, *cpfontlab, Gtk::POS_RIGHT, 1, 1);
+ themeGrid->attach_next_to (*cpfontlab, *fontButton, Gtk::POS_RIGHT, 1, 1);
+ themeGrid->attach_next_to (*colorPickerFontButton, *cpfontlab, Gtk::POS_RIGHT, 1, 1);
- Gtk::Label* cutOverlayLabel = Gtk::manage( new Gtk::Label (M("PREFERENCES_CUTOVERLAYBRUSH") + ":") );
- setExpandAlignProperties(cutOverlayLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- butCropCol = Gtk::manage( new Gtk::ColorButton() );
- setExpandAlignProperties(butCropCol, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- butCropCol->set_use_alpha(true);
- themeGrid->attach_next_to(*cutOverlayLabel, *themelab, Gtk::POS_BOTTOM, 1, 1);
- themeGrid->attach_next_to(*butCropCol, *cutOverlayLabel, Gtk::POS_RIGHT, 1, 1);
+ Gtk::Label* cutOverlayLabel = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CUTOVERLAYBRUSH") + ":") );
+ setExpandAlignProperties (cutOverlayLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ butCropCol = Gtk::manage ( new Gtk::ColorButton() );
+ setExpandAlignProperties (butCropCol, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ butCropCol->set_use_alpha (true);
+ themeGrid->attach_next_to (*cutOverlayLabel, *themelab, Gtk::POS_BOTTOM, 1, 1);
+ themeGrid->attach_next_to (*butCropCol, *cutOverlayLabel, Gtk::POS_RIGHT, 1, 1);
- Gtk::Label* navGuideLabel = Gtk::manage( new Gtk::Label (M("PREFERENCES_NAVGUIDEBRUSH") + ":") );
- setExpandAlignProperties(navGuideLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- butNavGuideCol = Gtk::manage( new Gtk::ColorButton() );
- setExpandAlignProperties(butNavGuideCol, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- butNavGuideCol->set_use_alpha(true);
- themeGrid->attach_next_to(*navGuideLabel, *butCropCol, Gtk::POS_RIGHT, 2, 1);
- themeGrid->attach_next_to(*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1);
+ Gtk::Label* navGuideLabel = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_NAVGUIDEBRUSH") + ":") );
+ setExpandAlignProperties (navGuideLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ butNavGuideCol = Gtk::manage ( new Gtk::ColorButton() );
+ setExpandAlignProperties (butNavGuideCol, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ butNavGuideCol->set_use_alpha (true);
+ themeGrid->attach_next_to (*navGuideLabel, *butCropCol, Gtk::POS_RIGHT, 2, 1);
+ themeGrid->attach_next_to (*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1);
ftheme->add (*themeGrid);
- mvbsd->attach_next_to(*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1);
+ mvbsd->attach_next_to (*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1);
// ---------------------------------------------
- Gtk::Frame* fclip = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLIPPINGIND")));
- setExpandAlignProperties(fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Grid* clipGrid = Gtk::manage( new Gtk::Grid() );
- clipGrid->set_column_spacing(4);
- clipGrid->set_row_spacing(4);
- setExpandAlignProperties(clipGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Frame* fclip = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CLIPPINGIND")));
+ setExpandAlignProperties (fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Grid* clipGrid = Gtk::manage ( new Gtk::Grid() );
+ clipGrid->set_column_spacing (4);
+ clipGrid->set_row_spacing (4);
+ setExpandAlignProperties (clipGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Label* hll = Gtk::manage( new Gtk::Label (M("PREFERENCES_HLTHRESHOLD") + ": "));
- setExpandAlignProperties(hll, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- hlThresh = Gtk::manage( new Gtk::SpinButton () );
- setExpandAlignProperties(hlThresh, false, false, Gtk::ALIGN_END, Gtk::ALIGN_BASELINE);
+ Gtk::Label* hll = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_HLTHRESHOLD") + ": "));
+ setExpandAlignProperties (hll, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ hlThresh = Gtk::manage ( new Gtk::SpinButton () );
+ setExpandAlignProperties (hlThresh, false, false, Gtk::ALIGN_END, Gtk::ALIGN_BASELINE);
hlThresh->set_digits (0);
hlThresh->set_increments (1, 10);
hlThresh->set_range (0, 255);
- clipGrid->attach_next_to(*hll, Gtk::POS_LEFT, 1, 1);
- clipGrid->attach_next_to(*hlThresh, *hll, Gtk::POS_RIGHT, 1, 1);
+ clipGrid->attach_next_to (*hll, Gtk::POS_LEFT, 1, 1);
+ clipGrid->attach_next_to (*hlThresh, *hll, Gtk::POS_RIGHT, 1, 1);
- Gtk::Label* shl = Gtk::manage( new Gtk::Label (M("PREFERENCES_SHTHRESHOLD") + ": ") );
- setExpandAlignProperties(shl, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- shThresh = Gtk::manage( new Gtk::SpinButton () );
- setExpandAlignProperties(shThresh, false, false, Gtk::ALIGN_END, Gtk::ALIGN_BASELINE);
+ Gtk::Label* shl = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_SHTHRESHOLD") + ": ") );
+ setExpandAlignProperties (shl, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ shThresh = Gtk::manage ( new Gtk::SpinButton () );
+ setExpandAlignProperties (shThresh, false, false, Gtk::ALIGN_END, Gtk::ALIGN_BASELINE);
shThresh->show ();
shThresh->set_digits (0);
shThresh->set_increments (1, 10);
shThresh->set_range (0, 255);
- clipGrid->attach_next_to(*shl, *hll, Gtk::POS_BOTTOM, 1, 1);
- clipGrid->attach_next_to(*shThresh, *shl, Gtk::POS_RIGHT, 1, 1);
+ clipGrid->attach_next_to (*shl, *hll, Gtk::POS_BOTTOM, 1, 1);
+ clipGrid->attach_next_to (*shThresh, *shl, Gtk::POS_RIGHT, 1, 1);
fclip->add (*clipGrid);
- mvbsd->attach_next_to(*fclip, *ftheme, Gtk::POS_BOTTOM, 1, 1);
+ mvbsd->attach_next_to (*fclip, *ftheme, Gtk::POS_BOTTOM, 1, 1);
// ---------------------------------------------
- Gtk::Frame* fnav = Gtk::manage( new Gtk::Frame (M("PREFERENCES_NAVIGATIONFRAME")) );
- setExpandAlignProperties(fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Grid* navigationGrid = Gtk::manage( new Gtk::Grid() );
- navigationGrid->set_column_spacing(4);
- navigationGrid->set_row_spacing(4);
- setExpandAlignProperties(fclip, false, false, Gtk::ALIGN_START, Gtk::ALIGN_FILL);
+ Gtk::Frame* fnav = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_NAVIGATIONFRAME")) );
+ setExpandAlignProperties (fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Grid* navigationGrid = Gtk::manage ( new Gtk::Grid() );
+ navigationGrid->set_column_spacing (4);
+ navigationGrid->set_row_spacing (4);
+ setExpandAlignProperties (fclip, false, false, Gtk::ALIGN_START, Gtk::ALIGN_FILL);
- Gtk::Label* panFactorLabel = Gtk::manage( new Gtk::Label (M("PREFERENCES_PANFACTORLABEL") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(panFactorLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- panFactor = Gtk::manage( new Gtk::SpinButton () );
- setExpandAlignProperties(panFactor, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ Gtk::Label* panFactorLabel = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_PANFACTORLABEL") + ":", Gtk::ALIGN_START));
+ setExpandAlignProperties (panFactorLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ panFactor = Gtk::manage ( new Gtk::SpinButton () );
+ setExpandAlignProperties (panFactor, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
panFactor->set_digits (0);
panFactor->set_increments (1, 5);
panFactor->set_range (1, 10);
- navigationGrid->attach_next_to(*panFactorLabel, Gtk::POS_LEFT, 1, 1);
- navigationGrid->attach_next_to(*panFactor, *panFactorLabel, Gtk::POS_RIGHT, 1, 1);
+ navigationGrid->attach_next_to (*panFactorLabel, Gtk::POS_LEFT, 1, 1);
+ navigationGrid->attach_next_to (*panFactor, *panFactorLabel, Gtk::POS_RIGHT, 1, 1);
- rememberZoomPanCheckbutton = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_REMEMBERZOOMPAN")) );
- setExpandAlignProperties(rememberZoomPanCheckbutton, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
- rememberZoomPanCheckbutton->set_tooltip_text(M("PREFERENCES_REMEMBERZOOMPAN_TOOLTIP"));
+ rememberZoomPanCheckbutton = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_REMEMBERZOOMPAN")) );
+ setExpandAlignProperties (rememberZoomPanCheckbutton, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
+ rememberZoomPanCheckbutton->set_tooltip_text (M ("PREFERENCES_REMEMBERZOOMPAN_TOOLTIP"));
- navigationGrid->attach_next_to(*rememberZoomPanCheckbutton, *panFactorLabel, Gtk::POS_BOTTOM, 2, 1);
+ navigationGrid->attach_next_to (*rememberZoomPanCheckbutton, *panFactorLabel, Gtk::POS_BOTTOM, 2, 1);
fnav->add (*navigationGrid);
- mvbsd->attach_next_to(*fnav, *fclip, Gtk::POS_RIGHT, 1, 1);
+ mvbsd->attach_next_to (*fnav, *fclip, Gtk::POS_RIGHT, 1, 1);
// ---------------------------------------------
- Gtk::Frame* fdg = Gtk::manage( new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR")) );
- setExpandAlignProperties(fdg, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- Gtk::Grid* externaleditorGrid = Gtk::manage( new Gtk::Grid() );
- externaleditorGrid->set_column_spacing(4);
- externaleditorGrid->set_row_spacing(4);
- setExpandAlignProperties(externaleditorGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Frame* fdg = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_EXTERNALEDITOR")) );
+ setExpandAlignProperties (fdg, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
+ Gtk::Grid* externaleditorGrid = Gtk::manage ( new Gtk::Grid() );
+ externaleditorGrid->set_column_spacing (4);
+ externaleditorGrid->set_row_spacing (4);
+ setExpandAlignProperties (externaleditorGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
- edOther = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_EDITORCMDLINE") + ":"));
- setExpandAlignProperties(edOther, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- editorToSendTo = Gtk::manage( new Gtk::Entry () );
- setExpandAlignProperties(editorToSendTo, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+ edOther = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_EDITORCMDLINE") + ":"));
+ setExpandAlignProperties (edOther, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ editorToSendTo = Gtk::manage ( new Gtk::Entry () );
+ setExpandAlignProperties (editorToSendTo, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
Gtk::RadioButton::Group ge = edOther->get_group();
#ifdef __APPLE__
- edGimp = Gtk::manage( new Gtk::RadioButton ("GIMP") );
- setExpandAlignProperties(edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ edGimp = Gtk::manage ( new Gtk::RadioButton ("GIMP") );
+ setExpandAlignProperties (edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
edGimp->set_group (ge);
- externaleditorGrid->attach_next_to(*edGimp, Gtk::POS_TOP, 2, 1);
+ externaleditorGrid->attach_next_to (*edGimp, Gtk::POS_TOP, 2, 1);
- edPS = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_PSPATH") + ":"));
- setExpandAlignProperties(edPS, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- psDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
- setExpandAlignProperties(psDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- externaleditorGrid->attach_next_to(*edPS, *edGimp, Gtk::POS_BOTTOM, 1, 1);
- externaleditorGrid->attach_next_to(*psDir, *edPS, Gtk::POS_RIGHT, 1, 1);
+ edPS = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_PSPATH") + ":"));
+ setExpandAlignProperties (edPS, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ psDir = Gtk::manage ( new Gtk::FileChooserButton (M ("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
+ setExpandAlignProperties (psDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ externaleditorGrid->attach_next_to (*edPS, *edGimp, Gtk::POS_BOTTOM, 1, 1);
+ externaleditorGrid->attach_next_to (*psDir, *edPS, Gtk::POS_RIGHT, 1, 1);
edPS->set_group (ge);
- externaleditorGrid->attach_next_to(*edOther, *edPS, Gtk::POS_BOTTOM, 1, 1);
- externaleditorGrid->attach_next_to(*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
+ externaleditorGrid->attach_next_to (*edOther, *edPS, Gtk::POS_BOTTOM, 1, 1);
+ externaleditorGrid->attach_next_to (*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
#elif defined WIN32
- edGimp = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_GIMPPATH") + ":") );
- setExpandAlignProperties(edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- gimpDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_GIMPPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
- setExpandAlignProperties(gimpDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- externaleditorGrid->attach_next_to(*edGimp, Gtk::POS_TOP, 1, 1);
- externaleditorGrid->attach_next_to(*gimpDir, *edGimp, Gtk::POS_RIGHT, 1, 1);
+ edGimp = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_GIMPPATH") + ":") );
+ setExpandAlignProperties (edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ gimpDir = Gtk::manage ( new Gtk::FileChooserButton (M ("PREFERENCES_GIMPPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
+ setExpandAlignProperties (gimpDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ externaleditorGrid->attach_next_to (*edGimp, Gtk::POS_TOP, 1, 1);
+ externaleditorGrid->attach_next_to (*gimpDir, *edGimp, Gtk::POS_RIGHT, 1, 1);
edGimp->set_group (ge);
- edPS = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_PSPATH") + ":") );
- setExpandAlignProperties(edPS, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- psDir = Gtk::manage( new Gtk::FileChooserButton (M("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
- setExpandAlignProperties(psDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
- externaleditorGrid->attach_next_to(*edPS, *edGimp, Gtk::POS_BOTTOM, 1, 1);
- externaleditorGrid->attach_next_to(*psDir, *edPS, Gtk::POS_RIGHT, 1, 1);
+ edPS = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_PSPATH") + ":") );
+ setExpandAlignProperties (edPS, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ psDir = Gtk::manage ( new Gtk::FileChooserButton (M ("PREFERENCES_PSPATH"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER) );
+ setExpandAlignProperties (psDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+ externaleditorGrid->attach_next_to (*edPS, *edGimp, Gtk::POS_BOTTOM, 1, 1);
+ externaleditorGrid->attach_next_to (*psDir, *edPS, Gtk::POS_RIGHT, 1, 1);
edPS->set_group (ge);
- externaleditorGrid->attach_next_to(*edOther, *edPS, Gtk::POS_BOTTOM, 1, 1);
- externaleditorGrid->attach_next_to(*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
+ externaleditorGrid->attach_next_to (*edOther, *edPS, Gtk::POS_BOTTOM, 1, 1);
+ externaleditorGrid->attach_next_to (*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
#else
- edGimp = Gtk::manage( new Gtk::RadioButton ("GIMP") );
- setExpandAlignProperties(edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
- externaleditorGrid->attach_next_to(*edGimp, Gtk::POS_TOP, 2, 1);
+ edGimp = Gtk::manage ( new Gtk::RadioButton ("GIMP") );
+ setExpandAlignProperties (edGimp, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+ externaleditorGrid->attach_next_to (*edGimp, Gtk::POS_TOP, 2, 1);
edGimp->set_group (ge);
- externaleditorGrid->attach_next_to(*edOther, *edGimp, Gtk::POS_BOTTOM, 1, 1);
- externaleditorGrid->attach_next_to(*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
+ externaleditorGrid->attach_next_to (*edOther, *edGimp, Gtk::POS_BOTTOM, 1, 1);
+ externaleditorGrid->attach_next_to (*editorToSendTo, *edOther, Gtk::POS_RIGHT, 1, 1);
#endif
fdg->add (*externaleditorGrid);
- mvbsd->attach_next_to(*fdg, *fclip, Gtk::POS_BOTTOM, 2, 1);
+ mvbsd->attach_next_to (*fdg, *fclip, Gtk::POS_BOTTOM, 2, 1);
- langAutoDetectConn = ckbLangAutoDetect->signal_toggled().connect (sigc::mem_fun(*this, &Preferences::langAutoDetectToggled));
- tconn = theme->signal_changed().connect( sigc::mem_fun(*this, &Preferences::themeChanged) );
- fconn = fontButton->signal_font_set().connect( sigc::mem_fun(*this, &Preferences::fontChanged) );
- cpfconn = colorPickerFontButton->signal_font_set().connect( sigc::mem_fun(*this, &Preferences::cpFontChanged) );
+ langAutoDetectConn = ckbLangAutoDetect->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::langAutoDetectToggled));
+ tconn = theme->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::themeChanged) );
+ fconn = fontButton->signal_font_set().connect ( sigc::mem_fun (*this, &Preferences::fontChanged) );
+ cpfconn = colorPickerFontButton->signal_font_set().connect ( sigc::mem_fun (*this, &Preferences::cpFontChanged) );
return mvbsd;
}
@@ -1219,29 +1233,29 @@ Gtk::Widget* Preferences::getGeneralPanel ()
Gtk::Widget* Preferences::getFileBrowserPanel ()
{
- Gtk::VBox* mvbfb = Gtk::manage( new Gtk::VBox () );
+ Gtk::VBox* mvbfb = Gtk::manage ( new Gtk::VBox () );
- Gtk::Frame* fsd = Gtk::manage( new Gtk::Frame (M("PREFERENCES_STARTUPIMDIR")) );
+ Gtk::Frame* fsd = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_STARTUPIMDIR")) );
- sdcurrent = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRSOFTWARE")) );
- sdlast = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRLAST")) );
- sdhome = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIRHOME")) );
- sdother = Gtk::manage( new Gtk::RadioButton (M("PREFERENCES_DIROTHER") + ": ") );
- startupdir = Gtk::manage( new Gtk::Entry () );
+ sdcurrent = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_DIRSOFTWARE")) );
+ sdlast = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_DIRLAST")) );
+ sdhome = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_DIRHOME")) );
+ sdother = Gtk::manage ( new Gtk::RadioButton (M ("PREFERENCES_DIROTHER") + ": ") );
+ startupdir = Gtk::manage ( new Gtk::Entry () );
- Gtk::Button* sdselect = Gtk::manage( new Gtk::Button () );
- sdselect->set_image (*Gtk::manage(new RTImage ("gtk-open.png")));
+ Gtk::Button* sdselect = Gtk::manage ( new Gtk::Button () );
+ sdselect->set_image (*Gtk::manage (new RTImage ("gtk-open.png")));
Gtk::RadioButton::Group opts = sdcurrent->get_group();
sdlast->set_group (opts);
sdhome->set_group (opts);
sdother->set_group (opts);
- Gtk::VBox* vbsd = Gtk::manage( new Gtk::VBox () );
+ Gtk::VBox* vbsd = Gtk::manage ( new Gtk::VBox () );
vbsd->pack_start (*sdcurrent, Gtk::PACK_SHRINK, 0);
vbsd->pack_start (*sdlast, Gtk::PACK_SHRINK, 0);
vbsd->pack_start (*sdhome, Gtk::PACK_SHRINK, 0);
- Gtk::HBox* otherbox = Gtk::manage( new Gtk::HBox () );
+ Gtk::HBox* otherbox = Gtk::manage ( new Gtk::HBox () );
otherbox->pack_start (*sdother, Gtk::PACK_SHRINK);
otherbox->pack_start (*startupdir);
otherbox->pack_end (*sdselect, Gtk::PACK_SHRINK, 4);
@@ -1250,29 +1264,29 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
fsd->add (*vbsd);
mvbfb->pack_start (*fsd, Gtk::PACK_SHRINK, 4);
- sdselect->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::selectStartupDir) );
+ sdselect->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::selectStartupDir) );
//---
- Gtk::Frame* fro = Gtk::manage( new Gtk::Frame (M("PREFERENCES_FBROWSEROPTS")) );
- showDateTime = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWDATETIME")) );
- showBasicExif = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWBASICEXIF")) );
- showExpComp = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWEXPOSURECOMPENSATION")) );
- Gtk::VBox* vbro = Gtk::manage( new Gtk::VBox () );
- Gtk::HBox* hbro1 = Gtk::manage( new Gtk::HBox () );
- Gtk::HBox* hbro0 = Gtk::manage( new Gtk::HBox () );
- overlayedFileNames = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_OVERLAY_FILENAMES")) );
- filmStripOverlayedFileNames = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP")) );
- sameThumbSize = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT")) );
- sameThumbSize->set_tooltip_text(M("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT"));
- ckbInternalThumbIfUntouched = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_INTERNALTHUMBIFUNTOUCHED")));
+ Gtk::Frame* fro = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_FBROWSEROPTS")) );
+ showDateTime = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SHOWDATETIME")) );
+ showBasicExif = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SHOWBASICEXIF")) );
+ showExpComp = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_SHOWEXPOSURECOMPENSATION")) );
+ Gtk::VBox* vbro = Gtk::manage ( new Gtk::VBox () );
+ Gtk::HBox* hbro1 = Gtk::manage ( new Gtk::HBox () );
+ Gtk::HBox* hbro0 = Gtk::manage ( new Gtk::HBox () );
+ overlayedFileNames = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_OVERLAY_FILENAMES")) );
+ filmStripOverlayedFileNames = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_OVERLAY_FILENAMES_FILMSTRIP")) );
+ sameThumbSize = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT")) );
+ sameThumbSize->set_tooltip_text (M ("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT"));
+ ckbInternalThumbIfUntouched = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_INTERNALTHUMBIFUNTOUCHED")));
vbro->pack_start (*showDateTime, Gtk::PACK_SHRINK, 0);
- Gtk::Label* dflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_DATEFORMAT") + ":", Gtk::ALIGN_START));
- dateformat = Gtk::manage( new Gtk::Entry () );
- dateformat->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));
- dflab->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));
+ Gtk::Label* dflab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_DATEFORMAT") + ":", Gtk::ALIGN_START));
+ dateformat = Gtk::manage ( new Gtk::Entry () );
+ dateformat->set_tooltip_markup (M ("PREFERENCES_DATEFORMATHINT"));
+ dflab->set_tooltip_markup (M ("PREFERENCES_DATEFORMATHINT"));
hbro0->pack_start (*dflab, Gtk::PACK_SHRINK, 4);
hbro0->pack_start (*dateformat, Gtk::PACK_SHRINK, 0);
@@ -1285,9 +1299,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
vbro->pack_start (*sameThumbSize, Gtk::PACK_SHRINK, 0);
vbro->pack_start (*ckbInternalThumbIfUntouched, Gtk::PACK_SHRINK, 0);
- Gtk::HBox* hbrecent = Gtk::manage( new Gtk::HBox () );
- Gtk::Label* labrecent = Gtk::manage( new Gtk::Label (M("PREFERENCES_MAXRECENTFOLDERS") + ":") );
- maxRecentFolders = Gtk::manage( new Gtk::SpinButton () );
+ Gtk::HBox* hbrecent = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Label* labrecent = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_MAXRECENTFOLDERS") + ":") );
+ maxRecentFolders = Gtk::manage ( new Gtk::SpinButton () );
hbrecent->pack_start (*labrecent, Gtk::PACK_SHRINK, 4);
hbrecent->pack_start (*maxRecentFolders, Gtk::PACK_SHRINK, 4);
maxRecentFolders->set_digits (0);
@@ -1298,13 +1312,13 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
fro->add (*vbro);
- Gtk::Frame* frmnu = Gtk::manage( new Gtk::Frame (M("PREFERENCES_MENUOPTIONS")) );
- ckbmenuGroupRank = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPRANK")) );
- ckbmenuGroupLabel = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPLABEL")) );
- ckbmenuGroupFileOperations = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPFILEOPERATIONS")) );
- ckbmenuGroupProfileOperations = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPPROFILEOPERATIONS")) );
- ckbmenuGroupExtProg = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPEXTPROGS")) );
- Gtk::VBox* vbmnu = Gtk::manage( new Gtk::VBox () );
+ Gtk::Frame* frmnu = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_MENUOPTIONS")) );
+ ckbmenuGroupRank = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPRANK")) );
+ ckbmenuGroupLabel = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPLABEL")) );
+ ckbmenuGroupFileOperations = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPFILEOPERATIONS")) );
+ ckbmenuGroupProfileOperations = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPPROFILEOPERATIONS")) );
+ ckbmenuGroupExtProg = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPEXTPROGS")) );
+ Gtk::VBox* vbmnu = Gtk::manage ( new Gtk::VBox () );
vbmnu->pack_start (*ckbmenuGroupRank, Gtk::PACK_SHRINK, 0);
vbmnu->pack_start (*ckbmenuGroupLabel, Gtk::PACK_SHRINK, 0);
@@ -1315,27 +1329,27 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
frmnu->add (*vbmnu);
- Gtk::Frame* fre = Gtk::manage( new Gtk::Frame (M("PREFERENCES_PARSEDEXT")) );
- Gtk::VBox* vbre = Gtk::manage( new Gtk::VBox () );
- Gtk::HBox* hb0 = Gtk::manage( new Gtk::HBox () );
- Gtk::Label* elab = Gtk::manage( new Gtk::Label (M("PREFERENCES_PARSEDEXTADD") + ":") );
+ Gtk::Frame* fre = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_PARSEDEXT")) );
+ Gtk::VBox* vbre = Gtk::manage ( new Gtk::VBox () );
+ Gtk::HBox* hb0 = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Label* elab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_PARSEDEXTADD") + ":") );
hb0->pack_start (*elab, Gtk::PACK_SHRINK, 4);
- extension = Gtk::manage( new Gtk::Entry () );
- extension->set_width_chars(5);
- extension->set_max_width_chars(5);
+ extension = Gtk::manage ( new Gtk::Entry () );
+ extension->set_width_chars (5);
+ extension->set_max_width_chars (5);
hb0->pack_start (*extension);
- addExt = Gtk::manage( new Gtk::Button () );
- delExt = Gtk::manage( new Gtk::Button () );
- moveExtUp = Gtk::manage( new Gtk::Button () );
- moveExtDown = Gtk::manage( new Gtk::Button () );
- addExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTADDHINT"));
- delExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTDELHINT"));
- moveExtUp->set_tooltip_text (M("PREFERENCES_PARSEDEXTUPHINT"));
- moveExtDown->set_tooltip_text (M("PREFERENCES_PARSEDEXTDOWNHINT"));
- Gtk::Image* addExtImg = Gtk::manage( new RTImage ("list-add-small.png") );
- Gtk::Image* delExtImg = Gtk::manage( new RTImage ("list-remove-red-small.png") );
- Gtk::Image* moveExtUpImg = Gtk::manage( new RTImage ("arrow-up-small.png") );
- Gtk::Image* moveExtDownImg = Gtk::manage( new RTImage ("arrow-down-small.png") );
+ addExt = Gtk::manage ( new Gtk::Button () );
+ delExt = Gtk::manage ( new Gtk::Button () );
+ moveExtUp = Gtk::manage ( new Gtk::Button () );
+ moveExtDown = Gtk::manage ( new Gtk::Button () );
+ addExt->set_tooltip_text (M ("PREFERENCES_PARSEDEXTADDHINT"));
+ delExt->set_tooltip_text (M ("PREFERENCES_PARSEDEXTDELHINT"));
+ moveExtUp->set_tooltip_text (M ("PREFERENCES_PARSEDEXTUPHINT"));
+ moveExtDown->set_tooltip_text (M ("PREFERENCES_PARSEDEXTDOWNHINT"));
+ Gtk::Image* addExtImg = Gtk::manage ( new RTImage ("list-add-small.png") );
+ Gtk::Image* delExtImg = Gtk::manage ( new RTImage ("list-remove-red-small.png") );
+ Gtk::Image* moveExtUpImg = Gtk::manage ( new RTImage ("arrow-up-small.png") );
+ Gtk::Image* moveExtDownImg = Gtk::manage ( new RTImage ("arrow-down-small.png") );
addExt->add (*addExtImg);
delExt->add (*delExtImg);
moveExtUp->set_image (*moveExtUpImg);
@@ -1344,27 +1358,27 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
hb0->pack_end (*moveExtUp, Gtk::PACK_SHRINK, 4);
hb0->pack_end (*delExt, Gtk::PACK_SHRINK, 4);
hb0->pack_end (*addExt, Gtk::PACK_SHRINK, 4);
- extensions = Gtk::manage( new Gtk::TreeView () );
- Gtk::ScrolledWindow* hscrollw = Gtk::manage( new Gtk::ScrolledWindow () );
+ extensions = Gtk::manage ( new Gtk::TreeView () );
+ Gtk::ScrolledWindow* hscrollw = Gtk::manage ( new Gtk::ScrolledWindow () );
hscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
hscrollw->add (*extensions);
extensionModel = Gtk::ListStore::create (extensionColumns);
extensions->set_model (extensionModel);
- extensions->append_column_editable("Enabled", extensionColumns.enabled);
- extensions->append_column("Extension", extensionColumns.ext);
+ extensions->append_column_editable ("Enabled", extensionColumns.enabled);
+ extensions->append_column ("Extension", extensionColumns.ext);
extensions->set_headers_visible (false);
vbre->pack_start (*hscrollw);
vbre->pack_start (*hb0, Gtk::PACK_SHRINK, 4);
fre->add (*vbre);
- Gtk::Frame* frc = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CACHEOPTS")) );
- Gtk::VBox* vbc = Gtk::manage( new Gtk::VBox () );
+ Gtk::Frame* frc = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CACHEOPTS")) );
+ Gtk::VBox* vbc = Gtk::manage ( new Gtk::VBox () );
frc->add (*vbc);
- Gtk::HBox* hb3 = Gtk::manage( new Gtk::HBox () );
- Gtk::Label* chlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBHEIGHT") + ":") );
- maxThumbSize = Gtk::manage( new Gtk::SpinButton () );
+ Gtk::HBox* hb3 = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Label* chlab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CACHETHUMBHEIGHT") + ":") );
+ maxThumbSize = Gtk::manage ( new Gtk::SpinButton () );
hb3->pack_start (*chlab, Gtk::PACK_SHRINK, 4);
hb3->pack_start (*maxThumbSize, Gtk::PACK_SHRINK, 4);
@@ -1373,9 +1387,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
maxThumbSize->set_range (40, 800);
vbc->pack_start (*hb3, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hb4 = Gtk::manage( new Gtk::HBox () );
- Gtk::Label* celab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHEMAXENTRIES") + ":") );
- maxCacheEntries = Gtk::manage( new Gtk::SpinButton () );
+ Gtk::HBox* hb4 = Gtk::manage ( new Gtk::HBox () );
+ Gtk::Label* celab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CACHEMAXENTRIES") + ":") );
+ maxCacheEntries = Gtk::manage ( new Gtk::SpinButton () );
hb4->pack_start (*celab, Gtk::PACK_SHRINK, 4);
hb4->pack_start (*maxCacheEntries, Gtk::PACK_SHRINK, 4);
@@ -1384,24 +1398,24 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
maxCacheEntries->set_range (10, 100000);
vbc->pack_start (*hb4, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hb5 = Gtk::manage( new Gtk::HBox () );
- clearThumbnails = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARTHUMBS")) );
- clearProfiles = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARPROFILES")) );
- clearAll = Gtk::manage( new Gtk::Button (M("PREFERENCES_CACHECLEARALL")) );
+ Gtk::HBox* hb5 = Gtk::manage ( new Gtk::HBox () );
+ clearThumbnails = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARTHUMBS")) );
+ clearProfiles = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARPROFILES")) );
+ clearAll = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARALL")) );
hb5->pack_start (*clearThumbnails, Gtk::PACK_SHRINK, 4);
hb5->pack_start (*clearProfiles, Gtk::PACK_SHRINK, 4);
hb5->pack_start (*clearAll, Gtk::PACK_SHRINK, 4);
vbc->pack_start (*hb5, Gtk::PACK_SHRINK, 4);
- Gtk::HBox* hb6 = Gtk::manage( new Gtk::HBox () );
- Gtk::VBox* vb6 = Gtk::manage( new Gtk::VBox () );
+ Gtk::HBox* hb6 = Gtk::manage ( new Gtk::HBox () );
+ Gtk::VBox* vb6 = Gtk::manage ( new Gtk::VBox () );
vb6->pack_start (*fro);
vb6->pack_start (*frmnu);
vb6->pack_end (*frc);
hb6->pack_start (*vb6);
hb6->pack_start (*fre);
- hb6->set_spacing(4);
+ hb6->set_spacing (4);
mvbfb->pack_start (*hb6, Gtk::PACK_SHRINK, 4);
@@ -1409,14 +1423,14 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
// mvbfb->pack_start (*fre);
// mvbfb->pack_start (*frc, Gtk::PACK_SHRINK, 4);
- addExt->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::addExtPressed) );
- delExt->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::delExtPressed) );
- moveExtUp->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::moveExtUpPressed) );
- moveExtDown->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::moveExtDownPressed) );
- extension->signal_activate().connect( sigc::mem_fun(*this, &Preferences::addExtPressed) );
- clearThumbnails->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::clearThumbImagesPressed) );
- clearProfiles->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::clearProfilesPressed) );
- clearAll->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::clearAllPressed) );
+ addExt->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::addExtPressed) );
+ delExt->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::delExtPressed) );
+ moveExtUp->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::moveExtUpPressed) );
+ moveExtDown->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::moveExtDownPressed) );
+ extension->signal_activate().connect ( sigc::mem_fun (*this, &Preferences::addExtPressed) );
+ clearThumbnails->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearThumbImagesPressed) );
+ clearProfiles->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearProfilesPressed) );
+ clearAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearAllPressed) );
return mvbfb;
}
@@ -1425,40 +1439,40 @@ Gtk::Widget* Preferences::getSoundPanel ()
{
Gtk::VBox* pSnd = new Gtk::VBox ();
- ckbSndEnable = Gtk::manage( new Gtk::CheckButton (M("GENERAL_ENABLE")));
- sndEnableConn = ckbSndEnable->signal_toggled().connect (sigc::mem_fun(*this, &Preferences::sndEnableToggled));
+ ckbSndEnable = Gtk::manage ( new Gtk::CheckButton (M ("GENERAL_ENABLE")));
+ sndEnableConn = ckbSndEnable->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::sndEnableToggled));
pSnd->pack_start (*ckbSndEnable, Gtk::PACK_SHRINK, 4);
Gtk::HBox* hblSndHelp = Gtk::manage (new Gtk::HBox ());
- Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_HELP")));
+ Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_HELP")));
hblSndHelp->pack_start (*lSndHelp, Gtk::PACK_SHRINK, 4);
pSnd->pack_start (*hblSndHelp, Gtk::PACK_SHRINK, 4);
// BatchQueueDone
- Gtk::HBox* pBatchQueueDone = Gtk::manage( new Gtk::HBox() );
+ Gtk::HBox* pBatchQueueDone = Gtk::manage ( new Gtk::HBox() );
- Gtk::Label* lSndBatchQueueDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_BATCHQUEUEDONE") + Glib::ustring(":")));
+ Gtk::Label* lSndBatchQueueDone = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_BATCHQUEUEDONE") + Glib::ustring (":")));
pBatchQueueDone->pack_start (*lSndBatchQueueDone, Gtk::PACK_SHRINK, 4);
- txtSndBatchQueueDone = Gtk::manage (new Gtk::Entry());
+ txtSndBatchQueueDone = Gtk::manage (new Gtk::Entry());
pBatchQueueDone->pack_end (*txtSndBatchQueueDone, Gtk::PACK_EXPAND_WIDGET, 4);
pSnd->pack_start (*pBatchQueueDone, Gtk::PACK_SHRINK, 4);
// LngEditProcDone
- Gtk::HBox* pSndLngEditProcDone = Gtk::manage( new Gtk::HBox() );
+ Gtk::HBox* pSndLngEditProcDone = Gtk::manage ( new Gtk::HBox() );
- Gtk::Label* lSndLngEditProcDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_LNGEDITPROCDONE") + Glib::ustring(":")));
+ Gtk::Label* lSndLngEditProcDone = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_LNGEDITPROCDONE") + Glib::ustring (":")));
pSndLngEditProcDone->pack_start (*lSndLngEditProcDone, Gtk::PACK_SHRINK, 4);
- txtSndLngEditProcDone = Gtk::manage (new Gtk::Entry());
+ txtSndLngEditProcDone = Gtk::manage (new Gtk::Entry());
pSndLngEditProcDone->pack_start (*txtSndLngEditProcDone, Gtk::PACK_EXPAND_WIDGET, 4);
- Gtk::Label* lSndLngEditProcDoneSecs = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_TRESHOLDSECS") + Glib::ustring(":")));
+ Gtk::Label* lSndLngEditProcDoneSecs = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_TRESHOLDSECS") + Glib::ustring (":")));
pSndLngEditProcDone->pack_start (*lSndLngEditProcDoneSecs, Gtk::PACK_SHRINK, 12);
- spbSndLngEditProcDoneSecs = Gtk::manage( new Gtk::SpinButton () );
+ spbSndLngEditProcDoneSecs = Gtk::manage ( new Gtk::SpinButton () );
spbSndLngEditProcDoneSecs->set_digits (1);
spbSndLngEditProcDoneSecs->set_increments (0.5, 1);
spbSndLngEditProcDoneSecs->set_range (0, 10);
@@ -1488,16 +1502,16 @@ void Preferences::parseDir (Glib::ustring dirname, std::vector& i
}
for (Glib::DirIterator i = dir->begin(); i != dir->end(); ++i) {
- Glib::ustring fname = Glib::build_filename(dirname, *i);
+ Glib::ustring fname = Glib::build_filename (dirname, *i);
Glib::ustring sname = *i;
// ignore directories
if (!Glib::file_test (fname, Glib::FILE_TEST_IS_DIR) && sname.size() >= ext.size() && sname.substr (sname.size() - ext.size(), ext.size()).casefold() == ext) {
- items.push_back (sname.substr(0, sname.size() - ext.size()));
+ items.push_back (sname.substr (0, sname.size() - ext.size()));
}
}
- std::sort(items.begin(), items.end());
+ std::sort (items.begin(), items.end());
delete dir;
}
@@ -1518,37 +1532,41 @@ void Preferences::parseThemeDir (Glib::ustring dirname)
}
for (Glib::DirIterator i = dir->begin(); i != dir->end(); ++i) {
- Glib::ustring fname = Glib::build_filename(dirname, *i);
+ Glib::ustring fname = Glib::build_filename (dirname, *i);
Glib::ustring sname = *i;
// ignore directories and filter out unsupported theme
- if (regex->match(sname, matchInfo) && !Glib::file_test (fname, Glib::FILE_TEST_IS_DIR) && sname.size() >= 4) {
+ if (regex->match (sname, matchInfo) && !Glib::file_test (fname, Glib::FILE_TEST_IS_DIR) && sname.size() >= 4) {
bool keepIt = false;
- Glib::ustring fname2 = matchInfo.fetch(1);
- Glib::ustring minMinor = matchInfo.fetch(2);
- Glib::ustring maxMinor = matchInfo.fetch(3);
+ Glib::ustring fname2 = matchInfo.fetch (1);
+ Glib::ustring minMinor = matchInfo.fetch (2);
+ Glib::ustring maxMinor = matchInfo.fetch (3);
if (!minMinor.empty()) {
- guint64 minMinorVal = g_ascii_strtoll(minMinor.c_str(), 0, 0);
+ guint64 minMinorVal = g_ascii_strtoll (minMinor.c_str(), 0, 0);
+
if ((guint64)GTK_MINOR_VERSION >= minMinorVal) {
keepIt = true;
}
}
+
if (!maxMinor.empty()) {
- guint64 maxMinorVal = g_ascii_strtoll(maxMinor.c_str(), 0, 0);
+ guint64 maxMinorVal = g_ascii_strtoll (maxMinor.c_str(), 0, 0);
+
if ((guint64)GTK_MINOR_VERSION <= maxMinorVal) {
keepIt = true;
}
}
+
if (keepIt) {
- themeFNames.push_back(ThemeFilename(matchInfo.fetch(1), sname.substr(0, sname.size() - 4)));
+ themeFNames.push_back (ThemeFilename (matchInfo.fetch (1), sname.substr (0, sname.size() - 4)));
}
}
}
- std::sort(themeFNames.begin(), themeFNames.end(), [] (const ThemeFilename& firstDir, const ThemeFilename& secondDir)
- {
- return firstDir.longFName < secondDir.longFName;
- });
+
+ std::sort (themeFNames.begin(), themeFNames.end(), [] (const ThemeFilename & firstDir, const ThemeFilename & secondDir) {
+ return firstDir.longFName < secondDir.longFName;
+ });
delete dir;
}
@@ -1556,36 +1574,36 @@ void Preferences::parseThemeDir (Glib::ustring dirname)
void Preferences::storePreferences ()
{
- // With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles,
- // because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available.
- moptions.defProfRaw = rprofiles->getFullPathFromActiveRow();
+// With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles,
+// because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available.
+ moptions.defProfRaw = rprofiles->getFullPathFromActiveRow();
if (moptions.defProfRaw.empty()) {
moptions.defProfRaw = DEFPROFILE_INTERNAL;
}
- moptions.defProfImg = iprofiles->getFullPathFromActiveRow();
+ moptions.defProfImg = iprofiles->getFullPathFromActiveRow();
if (moptions.defProfImg.empty()) {
moptions.defProfImg = DEFPROFILE_INTERNAL;
}
- moptions.dateFormat = dateformat->get_text();
- moptions.panAccelFactor = (int)panFactor->get_value();
+ moptions.dateFormat = dateformat->get_text();
+ moptions.panAccelFactor = (int)panFactor->get_value();
moptions.rememberZoomAndPan = rememberZoomPanCheckbutton->get_active();
- moptions.fbShowDateTime = showDateTime->get_active ();
+ moptions.fbShowDateTime = showDateTime->get_active ();
moptions.fbShowBasicExif = showBasicExif->get_active ();
- moptions.fbShowExpComp = showExpComp->get_active ();
- moptions.menuGroupRank = ckbmenuGroupRank->get_active();
- moptions.menuGroupLabel = ckbmenuGroupLabel->get_active();
- moptions.menuGroupFileOperations = ckbmenuGroupFileOperations->get_active();
+ moptions.fbShowExpComp = showExpComp->get_active ();
+ moptions.menuGroupRank = ckbmenuGroupRank->get_active();
+ moptions.menuGroupLabel = ckbmenuGroupLabel->get_active();
+ moptions.menuGroupFileOperations = ckbmenuGroupFileOperations->get_active();
moptions.menuGroupProfileOperations = ckbmenuGroupProfileOperations->get_active();
- moptions.menuGroupExtProg = ckbmenuGroupExtProg->get_active();
+ moptions.menuGroupExtProg = ckbmenuGroupExtProg->get_active();
moptions.highlightThreshold = (int)hlThresh->get_value ();
moptions.shadowThreshold = (int)shThresh->get_value ();
- moptions.language = languages->get_active_text ();
+ moptions.language = languages->get_active_text ();
moptions.languageAutoDetect = ckbLangAutoDetect->get_active ();
- moptions.theme = themeFNames.at(theme->get_active_row_number ()).longFName;
+ moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName;
Gdk::RGBA cropCol = butCropCol->get_rgba();
moptions.cutOverlayBrush[0] = cropCol.get_red();
@@ -1599,23 +1617,25 @@ void Preferences::storePreferences ()
moptions.navGuideBrush[2] = NavGuideCol.get_blue();
moptions.navGuideBrush[3] = butNavGuideCol->get_alpha() / 65535.0;
- Pango::FontDescription fd(fontButton->get_font_name());
+ Pango::FontDescription fd (fontButton->get_font_name());
+
if (newFont) {
- moptions.fontFamily = fd.get_family();
- moptions.fontSize = fd.get_size() / Pango::SCALE;
+ moptions.fontFamily = fd.get_family();
+ moptions.fontSize = fd.get_size() / Pango::SCALE;
}
- Pango::FontDescription cpfd(colorPickerFontButton->get_font_name());
+ Pango::FontDescription cpfd (colorPickerFontButton->get_font_name());
+
if (newCPFont) {
- moptions.CPFontFamily = cpfd.get_family();
- moptions.CPFontSize = cpfd.get_size() / Pango::SCALE;
+ moptions.CPFontFamily = cpfd.get_family();
+ moptions.CPFontSize = cpfd.get_size() / Pango::SCALE;
}
#ifdef WIN32
- moptions.gimpDir = gimpDir->get_filename ();
- moptions.psDir = psDir->get_filename ();
+ moptions.gimpDir = gimpDir->get_filename ();
+ moptions.psDir = psDir->get_filename ();
#elif defined __APPLE__
- moptions.psDir = psDir->get_filename ();
+ moptions.psDir = psDir->get_filename ();
#endif
moptions.customEditorProg = editorToSendTo->get_text ();
@@ -1639,65 +1659,74 @@ void Preferences::storePreferences ()
}
moptions.CPBPath = txtCustProfBuilderPath->get_text();
- moptions.CPBKeys = CPBKeyType(custProfBuilderLabelType->get_active_row_number());
+ moptions.CPBKeys = CPBKeyType (custProfBuilderLabelType->get_active_row_number());
if (!prtProfile->get_active_row_number()) {
moptions.rtSettings.printerProfile = "";
} else {
moptions.rtSettings.printerProfile = prtProfile->get_active_text ();
}
+
switch (prtIntent->get_active_row_number ()) {
- default:
- case 0:
- moptions.rtSettings.printerIntent = rtengine::RI_PERCEPTUAL;
- break;
- case 1:
- moptions.rtSettings.printerIntent = rtengine::RI_RELATIVE;
- break;
- case 2:
- moptions.rtSettings.printerIntent = rtengine::RI_ABSOLUTE;
- break;
+ default:
+ case 0:
+ moptions.rtSettings.printerIntent = rtengine::RI_PERCEPTUAL;
+ break;
+
+ case 1:
+ moptions.rtSettings.printerIntent = rtengine::RI_RELATIVE;
+ break;
+
+ case 2:
+ moptions.rtSettings.printerIntent = rtengine::RI_ABSOLUTE;
+ break;
}
+
moptions.rtSettings.printerBPC = prtBPC->get_active ();
#if !defined(__APPLE__) // monitor profile not supported on apple
+
if (!monProfile->get_active_row_number()) {
moptions.rtSettings.monitorProfile = "";
} else {
moptions.rtSettings.monitorProfile = monProfile->get_active_text ();
}
+
switch (monIntent->get_active_row_number ()) {
- default:
- case 0:
- moptions.rtSettings.monitorIntent = rtengine::RI_PERCEPTUAL;
- break;
- case 1:
- moptions.rtSettings.monitorIntent = rtengine::RI_RELATIVE;
- break;
- case 2:
- moptions.rtSettings.monitorIntent = rtengine::RI_ABSOLUTE;
- break;
+ default:
+ case 0:
+ moptions.rtSettings.monitorIntent = rtengine::RI_PERCEPTUAL;
+ break;
+
+ case 1:
+ moptions.rtSettings.monitorIntent = rtengine::RI_RELATIVE;
+ break;
+
+ case 2:
+ moptions.rtSettings.monitorIntent = rtengine::RI_ABSOLUTE;
+ break;
}
+
moptions.rtSettings.monitorBPC = monBPC->get_active ();
//#if defined(WIN32)
- moptions.rtSettings.autoMonitorProfile = cbAutoMonProfile->get_active ();
+ moptions.rtSettings.autoMonitorProfile = cbAutoMonProfile->get_active ();
//#endif
#endif
- moptions.rtSettings.iccDirectory = iccDir->get_filename ();
- moptions.rtSettings.viewingdevice = view->get_active_row_number ();
- moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number ();
- moptions.rtSettings.viewinggreySc = greySc->get_active_row_number ();
- // moptions.rtSettings.autocielab = cbAutocielab->get_active ();
- moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active ();
- moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active ();
- moptions.rtSettings.leveldnv = dnv->get_active_row_number ();
- moptions.rtSettings.leveldnti = dnti->get_active_row_number ();
- moptions.rtSettings.leveldnliss = dnliss->get_active_row_number ();
- moptions.rtSettings.leveldnaut = dnaut->get_active_row_number ();
- moptions.rtSettings.nrwavlevel = dnwavlev->get_active_row_number ();
- moptions.rtSettings.leveldnautsimpl = dnautsimpl->get_active_row_number ();
- moptions.rtSettings.daubech = cbdaubech->get_active ();
+ moptions.rtSettings.iccDirectory = iccDir->get_filename ();
+// moptions.rtSettings.viewingdevice = view->get_active_row_number ();
+// moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number ();
+ moptions.rtSettings.viewinggreySc = greySc->get_active_row_number ();
+// moptions.rtSettings.autocielab = cbAutocielab->get_active ();
+ moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active ();
+ moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active ();
+ moptions.rtSettings.leveldnv = dnv->get_active_row_number ();
+ moptions.rtSettings.leveldnti = dnti->get_active_row_number ();
+ moptions.rtSettings.leveldnliss = dnliss->get_active_row_number ();
+ moptions.rtSettings.leveldnaut = dnaut->get_active_row_number ();
+ moptions.rtSettings.nrwavlevel = dnwavlev->get_active_row_number ();
+ moptions.rtSettings.leveldnautsimpl = dnautsimpl->get_active_row_number ();
+ moptions.rtSettings.daubech = cbdaubech->get_active ();
moptions.prevdemo = (prevdemo_t)cprevdemo->get_active_row_number ();
moptions.serializeTiffRead = ctiffserialize->get_active();
@@ -1738,15 +1767,15 @@ void Preferences::storePreferences ()
moptions.tunnelMetaData = ckbTunnelMetaData->get_active ();
- moptions.rtSettings.darkFramesPath = darkFrameDir->get_filename();
- moptions.rtSettings.flatFieldsPath = flatFieldDir->get_filename();
+ moptions.rtSettings.darkFramesPath = darkFrameDir->get_filename();
+ moptions.rtSettings.flatFieldsPath = flatFieldDir->get_filename();
moptions.clutsDir = clutsDir->get_filename();
moptions.baBehav.resize (ADDSET_PARAM_NUM);
- for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
- for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++) {
+ for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
+ for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++) {
moptions.baBehav[adjs->get_value (behavColumns.addsetid)] = adjs->get_value (behavColumns.badd);
}
@@ -1767,11 +1796,11 @@ void Preferences::storePreferences ()
moptions.clutCacheSize = clutCacheSizeSB->get_value_as_int();
moptions.maxInspectorBuffers = maxInspectorBuffersSB->get_value_as_int();
- // Sounds only on Windows and Linux
+// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
moptions.sndEnable = ckbSndEnable->get_active ();
moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text ();
- moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text ();
+ moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text ();
moptions.sndLngEditProcDoneSecs = spbSndLngEditProcDoneSecs->get_value ();
#endif
}
@@ -1785,9 +1814,9 @@ void Preferences::fillPreferences ()
sconn.block (true);
dfconn.block (true);
ffconn.block (true);
- rpconn.block(true);
- ipconn.block(true);
- bpconn.block(true);
+ rpconn.block (true);
+ ipconn.block (true);
+ bpconn.block (true);
rprofiles->setActiveRowFromFullPath (moptions.defProfRaw);
forRAWComboChanged(); // update the tooltip
@@ -1796,40 +1825,48 @@ void Preferences::fillPreferences ()
dateformat->set_text (moptions.dateFormat);
panFactor->set_value (moptions.panAccelFactor);
rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
- ctiffserialize->set_active(moptions.serializeTiffRead);
+ ctiffserialize->set_active (moptions.serializeTiffRead);
setActiveTextOrIndex (*prtProfile, moptions.rtSettings.printerProfile, 0);
+
switch (moptions.rtSettings.printerIntent) {
- default:
- case rtengine::RI_PERCEPTUAL:
- prtIntent->set_active (0);
- break;
- case rtengine::RI_RELATIVE:
- prtIntent->set_active (1);
- break;
- case rtengine::RI_ABSOLUTE:
- prtIntent->set_active (2);
- break;
+ default:
+ case rtengine::RI_PERCEPTUAL:
+ prtIntent->set_active (0);
+ break;
+
+ case rtengine::RI_RELATIVE:
+ prtIntent->set_active (1);
+ break;
+
+ case rtengine::RI_ABSOLUTE:
+ prtIntent->set_active (2);
+ break;
}
+
prtBPC->set_active (moptions.rtSettings.printerBPC);
#if !defined(__APPLE__) // monitor profile not supported on apple
setActiveTextOrIndex (*monProfile, moptions.rtSettings.monitorProfile, 0);
+
switch (moptions.rtSettings.monitorIntent) {
- default:
- case rtengine::RI_PERCEPTUAL:
- monIntent->set_active (0);
- break;
- case rtengine::RI_RELATIVE:
- monIntent->set_active (1);
- break;
- case rtengine::RI_ABSOLUTE:
- monIntent->set_active (2);
- break;
+ default:
+ case rtengine::RI_PERCEPTUAL:
+ monIntent->set_active (0);
+ break;
+
+ case rtengine::RI_RELATIVE:
+ monIntent->set_active (1);
+ break;
+
+ case rtengine::RI_ABSOLUTE:
+ monIntent->set_active (2);
+ break;
}
+
monBPC->set_active (moptions.rtSettings.monitorBPC);
//#if defined(WIN32)
- cbAutoMonProfile->set_active(moptions.rtSettings.autoMonitorProfile);
+ cbAutoMonProfile->set_active (moptions.rtSettings.autoMonitorProfile);
//#endif
#endif
@@ -1837,8 +1874,8 @@ void Preferences::fillPreferences ()
iccDir->set_current_folder (moptions.rtSettings.iccDirectory);
}
- view->set_active (moptions.rtSettings.viewingdevice);
- grey->set_active (moptions.rtSettings.viewingdevicegrey);
+// view->set_active (moptions.rtSettings.viewingdevice);
+// grey->set_active (moptions.rtSettings.viewingdevicegrey);
greySc->set_active (moptions.rtSettings.viewinggreySc);
dnv->set_active (moptions.rtSettings.leveldnv);
dnti->set_active (moptions.rtSettings.leveldnti);
@@ -1854,39 +1891,39 @@ void Preferences::fillPreferences ()
ckbHistogramWorking->set_active (moptions.rtSettings.HistogramWorking);
languages->set_active_text (moptions.language);
ckbLangAutoDetect->set_active (moptions.languageAutoDetect);
- int themeNbr = getThemeRowNumber(moptions.theme);
- theme->set_active (themeNbr==-1 ? 0 : themeNbr);
+ int themeNbr = getThemeRowNumber (moptions.theme);
+ theme->set_active (themeNbr == -1 ? 0 : themeNbr);
Gdk::RGBA cropCol;
- cropCol.set_rgba(moptions.cutOverlayBrush[0], moptions.cutOverlayBrush[1], moptions.cutOverlayBrush[2]);
- butCropCol->set_rgba(cropCol);
- butCropCol->set_alpha ( (unsigned short)(moptions.cutOverlayBrush[3] * 65535.0));
+ cropCol.set_rgba (moptions.cutOverlayBrush[0], moptions.cutOverlayBrush[1], moptions.cutOverlayBrush[2]);
+ butCropCol->set_rgba (cropCol);
+ butCropCol->set_alpha ( (unsigned short) (moptions.cutOverlayBrush[3] * 65535.0));
Gdk::RGBA NavGuideCol;
- NavGuideCol.set_rgba(moptions.navGuideBrush[0], moptions.navGuideBrush[1], moptions.navGuideBrush[2]);
- butNavGuideCol->set_rgba(NavGuideCol);
- butNavGuideCol->set_alpha ( (unsigned short)(moptions.navGuideBrush[3] * 65535.0));
+ NavGuideCol.set_rgba (moptions.navGuideBrush[0], moptions.navGuideBrush[1], moptions.navGuideBrush[2]);
+ butNavGuideCol->set_rgba (NavGuideCol);
+ butNavGuideCol->set_alpha ( (unsigned short) (moptions.navGuideBrush[3] * 65535.0));
if (options.fontFamily == "default") {
- fontButton->set_font_name (Glib::ustring::compose("%1 %2", initialFontFamily, initialFontSize));
+ fontButton->set_font_name (Glib::ustring::compose ("%1 %2", initialFontFamily, initialFontSize));
} else {
- fontButton->set_font_name (Glib::ustring::compose("%1 %2", options.fontFamily, options.fontSize));
+ fontButton->set_font_name (Glib::ustring::compose ("%1 %2", options.fontFamily, options.fontSize));
}
if (options.CPFontFamily == "default") {
- colorPickerFontButton->set_font_name (Glib::ustring::compose("%1 %2", initialFontFamily, initialFontSize));
+ colorPickerFontButton->set_font_name (Glib::ustring::compose ("%1 %2", initialFontFamily, initialFontSize));
} else {
- colorPickerFontButton->set_font_name (Glib::ustring::compose("%1 %2", options.CPFontFamily, options.CPFontSize));
+ colorPickerFontButton->set_font_name (Glib::ustring::compose ("%1 %2", options.CPFontFamily, options.CPFontSize));
}
showDateTime->set_active (moptions.fbShowDateTime);
showBasicExif->set_active (moptions.fbShowBasicExif);
showExpComp->set_active (moptions.fbShowExpComp);
- ckbmenuGroupRank->set_active(moptions.menuGroupRank);
- ckbmenuGroupLabel->set_active(moptions.menuGroupLabel);
- ckbmenuGroupFileOperations->set_active(moptions.menuGroupFileOperations);
- ckbmenuGroupProfileOperations->set_active(moptions.menuGroupProfileOperations);
- ckbmenuGroupExtProg->set_active(moptions.menuGroupExtProg);
+ ckbmenuGroupRank->set_active (moptions.menuGroupRank);
+ ckbmenuGroupLabel->set_active (moptions.menuGroupLabel);
+ ckbmenuGroupFileOperations->set_active (moptions.menuGroupFileOperations);
+ ckbmenuGroupProfileOperations->set_active (moptions.menuGroupProfileOperations);
+ ckbmenuGroupExtProg->set_active (moptions.menuGroupExtProg);
hlThresh->set_value (moptions.highlightThreshold);
shThresh->set_value (moptions.shadowThreshold);
@@ -1920,8 +1957,8 @@ void Preferences::fillPreferences ()
#endif
editorToSendTo->set_text (moptions.customEditorProg);
- txtCustProfBuilderPath->set_text(moptions.CPBPath);
- custProfBuilderLabelType->set_active(moptions.CPBKeys);
+ txtCustProfBuilderPath->set_text (moptions.CPBPath);
+ custProfBuilderLabelType->set_active (moptions.CPBKeys);
if (moptions.startupDir == STARTUPDIR_CURRENT) {
@@ -1938,20 +1975,20 @@ void Preferences::fillPreferences ()
extensionModel->clear ();
for (size_t i = 0; i < moptions.parseExtensions.size(); i++) {
- Gtk::TreeRow row = *(extensionModel->append());
+ Gtk::TreeRow row = * (extensionModel->append());
row[extensionColumns.enabled] = moptions.parseExtensionsEnabled[i];
row[extensionColumns.ext] = moptions.parseExtensions[i];
}
maxThumbSize->set_value (moptions.maxThumbnailHeight);
- maxRecentFolders->set_value(moptions.maxRecentFolders);
+ maxRecentFolders->set_value (moptions.maxRecentFolders);
maxCacheEntries->set_value (moptions.maxCacheEntries);
overlayedFileNames->set_active (moptions.overlayedFileNames);
- filmStripOverlayedFileNames->set_active(moptions.filmStripOverlayedFileNames);
- sameThumbSize->set_active(moptions.sameThumbSize);
- ckbInternalThumbIfUntouched->set_active(moptions.internalThumbIfUntouched);
+ filmStripOverlayedFileNames->set_active (moptions.filmStripOverlayedFileNames);
+ sameThumbSize->set_active (moptions.sameThumbSize);
+ ckbInternalThumbIfUntouched->set_active (moptions.internalThumbIfUntouched);
- saveParamsPreference->set_active(moptions.saveParamsFile ? (moptions.saveParamsCache ? 2 : 0) : 1);
+ saveParamsPreference->set_active (moptions.saveParamsFile ? (moptions.saveParamsCache ? 2 : 0) : 1);
loadParamsPreference->set_active (moptions.paramsLoadLocation);
useBundledProfiles->set_active (moptions.useBundledProfiles);
@@ -1959,44 +1996,44 @@ void Preferences::fillPreferences ()
ckbTunnelMetaData->set_active (moptions.tunnelMetaData);
if (!moptions.tabbedUI) {
- editorLayout->set_active(moptions.mainNBVertical ? 1 : 0);
+ editorLayout->set_active (moptions.mainNBVertical ? 1 : 0);
} else {
- editorLayout->set_active(moptions.multiDisplayMode ? 3 : 2);
+ editorLayout->set_active (moptions.multiDisplayMode ? 3 : 2);
}
- curveBBoxPosC->set_active(moptions.curvebboxpos);
- ckbHistogramPositionLeft->set_active(moptions.histogramPosition == 1);
+ curveBBoxPosC->set_active (moptions.curvebboxpos);
+ ckbHistogramPositionLeft->set_active (moptions.histogramPosition == 1);
// ckbHistogramWorking->set_active(moptions.histogramWorking==1);
- ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow);
- ckbShowFilmStripToolBar->set_active(moptions.showFilmStripToolBar);
- ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar);
- ckbUseIconNoText->set_active(moptions.UseIconNoText);
+ ckbFileBrowserToolbarSingleRow->set_active (moptions.FileBrowserToolbarSingleRow);
+ ckbShowFilmStripToolBar->set_active (moptions.showFilmStripToolBar);
+ ckbHideTPVScrollbar->set_active (moptions.hideTPVScrollbar);
+ ckbUseIconNoText->set_active (moptions.UseIconNoText);
- rgbDenoiseTreadLimitSB->set_value(moptions.rgbDenoiseThreadLimit);
- clutCacheSizeSB->set_value(moptions.clutCacheSize);
- maxInspectorBuffersSB->set_value(moptions.maxInspectorBuffers);
+ rgbDenoiseTreadLimitSB->set_value (moptions.rgbDenoiseThreadLimit);
+ clutCacheSizeSB->set_value (moptions.clutCacheSize);
+ maxInspectorBuffersSB->set_value (moptions.maxInspectorBuffers);
- darkFrameDir->set_current_folder( moptions.rtSettings.darkFramesPath );
+ darkFrameDir->set_current_folder ( moptions.rtSettings.darkFramesPath );
darkFrameChanged ();
- flatFieldDir->set_current_folder( moptions.rtSettings.flatFieldsPath );
+ flatFieldDir->set_current_folder ( moptions.rtSettings.flatFieldsPath );
flatFieldChanged ();
- clutsDir->set_current_folder( moptions.clutsDir );
+ clutsDir->set_current_folder ( moptions.clutsDir );
addc.block (true);
setc.block (true);
- if (moptions.baBehav.size() == ADDSET_PARAM_NUM) {
- for (size_t i = 0; i < moptions.baBehav.size(); i++)
- for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
- for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
- if (adjs->get_value (behavColumns.addsetid) == (int)i) {
- adjs->set_value (behavColumns.badd, moptions.baBehav[i] == 1);
- adjs->set_value (behavColumns.bset, moptions.baBehav[i] != 1);
- break;
- }
- }
+ moptions.baBehav.resize (ADDSET_PARAM_NUM);
+
+ for (size_t i = 0; i < moptions.baBehav.size(); i++)
+ for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
+ for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
+ if (adjs->get_value (behavColumns.addsetid) == (int)i) {
+ adjs->set_value (behavColumns.badd, moptions.baBehav[i] == 1);
+ adjs->set_value (behavColumns.bset, moptions.baBehav[i] != 1);
+ break;
+ }
addc.block (false);
setc.block (false);
@@ -2006,9 +2043,9 @@ void Preferences::fillPreferences ()
sconn.block (false);
dfconn.block (false);
ffconn.block (false);
- rpconn.block(true);
- ipconn.block(true);
- bpconn.block(false);
+ rpconn.block (true);
+ ipconn.block (true);
+ bpconn.block (false);
chOverwriteOutputFile->set_active (moptions.overwriteOutputFile);
@@ -2039,7 +2076,7 @@ void Preferences::savePressed () {
//#if defined(WIN32)
void Preferences::autoMonProfileToggled ()
{
- monProfile->set_sensitive(!cbAutoMonProfile->get_active());
+ monProfile->set_sensitive (!cbAutoMonProfile->get_active());
}
//#endif
/*
@@ -2049,14 +2086,14 @@ void Preferences::autocielabToggled () {
*/
void Preferences::sndEnableToggled ()
{
- txtSndBatchQueueDone->set_sensitive(ckbSndEnable->get_active());
- txtSndLngEditProcDone->set_sensitive(ckbSndEnable->get_active());
- spbSndLngEditProcDoneSecs->set_sensitive(ckbSndEnable->get_active());
+ txtSndBatchQueueDone->set_sensitive (ckbSndEnable->get_active());
+ txtSndLngEditProcDone->set_sensitive (ckbSndEnable->get_active());
+ spbSndLngEditProcDoneSecs->set_sensitive (ckbSndEnable->get_active());
}
void Preferences::langAutoDetectToggled ()
{
- languages->set_sensitive(!ckbLangAutoDetect->get_active());
+ languages->set_sensitive (!ckbLangAutoDetect->get_active());
}
void Preferences::okPressed ()
@@ -2074,29 +2111,30 @@ void Preferences::okPressed ()
void Preferences::cancelPressed ()
{
// set the initial theme back
- if (themeFNames.at(theme->get_active_row_number ()).longFName != options.theme) {
- rtengine::setPaths(options);
+ if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) {
+ rtengine::setPaths (options);
RTImage::updateImages();
- switchThemeTo(options.theme);
+ switchThemeTo (options.theme);
}
// set the initial font back
- Pango::FontDescription fd(fontButton->get_font_name());
+ Pango::FontDescription fd (fontButton->get_font_name());
+
if (fd.get_family() != options.fontFamily && (fd.get_size() / Pango::SCALE) != options.fontSize) {
if (options.fontFamily == "default") {
- switchFontTo(initialFontFamily, initialFontSize);
+ switchFontTo (initialFontFamily, initialFontSize);
} else {
- switchFontTo(options.fontFamily, options.fontSize);
+ switchFontTo (options.fontFamily, options.fontSize);
}
}
// update the profileStore
if (useBundledProfiles->get_active () != options.useBundledProfiles) {
// we have to rescan with the old value;
- bpconn.block(true);
+ bpconn.block (true);
useBundledProfiles->set_active (false);
bundledProfilesChanged();
- bpconn.block(false);
+ bpconn.block (false);
}
hide ();
@@ -2105,12 +2143,12 @@ void Preferences::cancelPressed ()
void Preferences::selectStartupDir ()
{
- Gtk::FileChooserDialog dialog (getToplevelWindow (this), M("PREFERENCES_DIRSELECTDLG"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ Gtk::FileChooserDialog dialog (getToplevelWindow (this), M ("PREFERENCES_DIRSELECTDLG"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
// dialog.set_transient_for(*this);
//Add response buttons the the dialog:
- dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
- dialog.add_button(M("GENERAL_OPEN"), Gtk::RESPONSE_OK);
+ dialog.add_button (M ("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
+ dialog.add_button (M ("GENERAL_OPEN"), Gtk::RESPONSE_OK);
int result = dialog.run();
@@ -2124,17 +2162,17 @@ void Preferences::aboutPressed ()
splash = new Splash (*this);
splash->set_transient_for (*this);
- splash->signal_delete_event().connect( sigc::mem_fun(*this, &Preferences::splashClosed) );
+ splash->signal_delete_event().connect ( sigc::mem_fun (*this, &Preferences::splashClosed) );
splash->show ();
}
void Preferences::themeChanged ()
{
- moptions.theme = themeFNames.at(theme->get_active_row_number ()).longFName;
- rtengine::setPaths(moptions);
+ moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName;
+ rtengine::setPaths (moptions);
RTImage::updateImages();
- switchThemeTo(moptions.theme);
+ switchThemeTo (moptions.theme);
}
void Preferences::forRAWComboChanged ()
@@ -2150,14 +2188,14 @@ void Preferences::forRAWComboChanged ()
}
if (selectedEntry->type == PSET_FOLDER) {
- rpconn.block(true);
- rprofiles->set_active(currRawRow);
- rpconn.block(false);
+ rpconn.block (true);
+ rprofiles->set_active (currRawRow);
+ rpconn.block (false);
} else {
currRawRow = rprofiles->get_active();
}
- rprofiles->set_tooltip_text(selectedEntry->label);
+ rprofiles->set_tooltip_text (selectedEntry->label);
}
void Preferences::forImageComboChanged ()
@@ -2173,19 +2211,19 @@ void Preferences::forImageComboChanged ()
}
if (selectedEntry->type == PSET_FOLDER) {
- ipconn.block(true);
- iprofiles->set_active(currImgRow);
- ipconn.block(false);
+ ipconn.block (true);
+ iprofiles->set_active (currImgRow);
+ ipconn.block (false);
} else {
currImgRow = rprofiles->get_active();
}
- iprofiles->set_tooltip_text(iprofiles->getSelectedEntry()->label);
+ iprofiles->set_tooltip_text (iprofiles->getSelectedEntry()->label);
}
void Preferences::layoutComboChanged ()
{
- editorLayout->set_tooltip_text(editorLayout->get_active_text());
+ editorLayout->set_tooltip_text (editorLayout->get_active_text());
}
void Preferences::bundledProfilesChanged ()
@@ -2214,12 +2252,13 @@ void Preferences::iccDirChanged ()
monProfile->remove_all();
- monProfile->append (M("PREFERENCES_PROFILE_NONE"));
+ monProfile->append (M ("PREFERENCES_PROFILE_NONE"));
- for (const auto& profile : profiles)
+ for (const auto& profile : profiles) {
monProfile->append (profile);
+ }
- setActiveTextOrIndex(*monProfile, currentSelection, 0);
+ setActiveTextOrIndex (*monProfile, currentSelection, 0);
}
void Preferences::storeCurrentValue()
@@ -2234,26 +2273,26 @@ void Preferences::updateProfileList()
rprofiles->updateProfileList();
iprofiles->updateProfileList();
const ProfileStoreEntry* dynpse = ProfileStore::getInstance()->getInternalDynamicPSE();
- rprofiles->addRow(dynpse);
- iprofiles->addRow(dynpse);
+ rprofiles->addRow (dynpse);
+ iprofiles->addRow (dynpse);
}
void Preferences::restoreValue()
{
- if (!rprofiles->setActiveRowFromFullPath(storedValueRaw)) {
+ if (!rprofiles->setActiveRowFromFullPath (storedValueRaw)) {
moptions.defProfRaw = DEFPROFILE_INTERNAL;
- rpconn.block(true);
+ rpconn.block (true);
rprofiles->setInternalEntry();
- rpconn.block(false);
+ rpconn.block (false);
}
currRawRow = rprofiles->get_active();
- if (!iprofiles->setActiveRowFromFullPath(storedValueImg)) {
+ if (!iprofiles->setActiveRowFromFullPath (storedValueImg)) {
moptions.defProfImg = DEFPROFILE_INTERNAL;
- ipconn.block(true);
+ ipconn.block (true);
iprofiles->setInternalEntry();
- ipconn.block(false);
+ ipconn.block (false);
}
currImgRow = iprofiles->get_active();
@@ -2262,23 +2301,23 @@ void Preferences::restoreValue()
storedValueImg = "";
}
-void Preferences::switchThemeTo(Glib::ustring newTheme)
+void Preferences::switchThemeTo (Glib::ustring newTheme)
{
- Glib::ustring filename(Glib::build_filename(argv0, "themes", newTheme + ".css"));
+ Glib::ustring filename (Glib::build_filename (argv0, "themes", newTheme + ".css"));
if (!themecss) {
themecss = Gtk::CssProvider::create();
Glib::RefPtr screen = Gdk::Screen::get_default();
- Gtk::StyleContext::add_provider_for_screen(screen, themecss, GTK_STYLE_PROVIDER_PRIORITY_USER);
+ Gtk::StyleContext::add_provider_for_screen (screen, themecss, GTK_STYLE_PROVIDER_PRIORITY_USER);
}
try {
themecss->load_from_path (filename);
} catch (Glib::Error &err) {
- printf("Error: Can't load css file \"%s\"\nMessage: %s\n", filename.c_str(), err.what().c_str());
+ printf ("Error: Can't load css file \"%s\"\nMessage: %s\n", filename.c_str(), err.what().c_str());
} catch (...) {
- printf("Error: Can't load css file \"%s\"\n", filename.c_str());
+ printf ("Error: Can't load css file \"%s\"\n", filename.c_str());
}
}
@@ -2286,8 +2325,8 @@ void Preferences::fontChanged ()
{
newFont = true;
- Pango::FontDescription fd(fontButton->get_font_name());
- switchFontTo(fd.get_family(), fd.get_size() / Pango::SCALE);
+ Pango::FontDescription fd (fontButton->get_font_name());
+ switchFontTo (fd.get_family(), fd.get_size() / Pango::SCALE);
}
void Preferences::cpFontChanged ()
@@ -2296,35 +2335,34 @@ void Preferences::cpFontChanged ()
newCPFont = true;
}
-void Preferences::switchFontTo(const Glib::ustring &newFontFamily, const int newFontSize)
+void Preferences::switchFontTo (const Glib::ustring &newFontFamily, const int newFontSize)
{
if (newFontFamily != "default") {
if (!fontcss) {
fontcss = Gtk::CssProvider::create();
Glib::RefPtr screen = Gdk::Screen::get_default();
- Gtk::StyleContext::add_provider_for_screen(screen, fontcss, GTK_STYLE_PROVIDER_PRIORITY_USER);
+ Gtk::StyleContext::add_provider_for_screen (screen, fontcss, GTK_STYLE_PROVIDER_PRIORITY_USER);
}
try {
//GTK318
- #if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
- fontcss->load_from_data (Glib::ustring::compose("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize));
- #else
- fontcss->load_from_data (Glib::ustring::compose("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize));
- #endif
+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
+ fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize));
+#else
+ fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize));
+#endif
//GTK318
} catch (Glib::Error &err) {
- printf("Error: \"%s\"\n", err.what().c_str());
+ printf ("Error: \"%s\"\n", err.what().c_str());
} catch (...) {
- printf("Error: Can't find the font named \"%s\"\n", newFontFamily.c_str());
+ printf ("Error: Can't find the font named \"%s\"\n", newFontFamily.c_str());
}
- }
- else {
+ } else {
if (fontcss) {
fontcss = Gtk::CssProvider::create();
Glib::RefPtr screen = Gdk::Screen::get_default();
- Gtk::StyleContext::remove_provider_for_screen(screen, fontcss);
+ Gtk::StyleContext::remove_provider_for_screen (screen, fontcss);
}
}
}
@@ -2332,41 +2370,40 @@ void Preferences::switchFontTo(const Glib::ustring &newFontFamily, const int new
void Preferences::workflowUpdate ()
{
- if(moptions.tabbedUI != options.tabbedUI) {
- parent->setEditorMode(moptions.tabbedUI);
+ if (moptions.tabbedUI != options.tabbedUI) {
+ parent->setEditorMode (moptions.tabbedUI);
}
- if(moptions.hideTPVScrollbar != options.hideTPVScrollbar) {
+ if (moptions.hideTPVScrollbar != options.hideTPVScrollbar) {
// Update the tool panels
parent->updateTPVScrollbar (moptions.hideTPVScrollbar);
}
- if(moptions.UseIconNoText != options.UseIconNoText) {
+ if (moptions.UseIconNoText != options.UseIconNoText) {
// Update the tool's tab titles
- parent->updateTabsUsesIcons(moptions.UseIconNoText);
+ parent->updateTabsUsesIcons (moptions.UseIconNoText);
}
- if(moptions.FileBrowserToolbarSingleRow != options.FileBrowserToolbarSingleRow) {
+ if (moptions.FileBrowserToolbarSingleRow != options.FileBrowserToolbarSingleRow) {
// Update the position of the Query toolbar
- parent->updateFBQueryTB(moptions.FileBrowserToolbarSingleRow);
+ parent->updateFBQueryTB (moptions.FileBrowserToolbarSingleRow);
}
- if(moptions.showFilmStripToolBar != options.showFilmStripToolBar) {
+ if (moptions.showFilmStripToolBar != options.showFilmStripToolBar) {
// Update the visibility of FB toolbar
- parent->updateFBToolBarVisibility(moptions.showFilmStripToolBar);
+ parent->updateFBToolBarVisibility (moptions.showFilmStripToolBar);
}
- if(moptions.histogramPosition != options.histogramPosition) {
+ if (moptions.histogramPosition != options.histogramPosition) {
// Update the position of the Histogram
- parent->updateHistogramPosition(options.histogramPosition, moptions.histogramPosition);
+ parent->updateHistogramPosition (options.histogramPosition, moptions.histogramPosition);
}
- if( moptions.rtSettings.printerProfile != options.rtSettings.printerProfile
- ||moptions.rtSettings.printerBPC != options.rtSettings.printerBPC
- ||moptions.rtSettings.printerIntent != options.rtSettings.printerIntent)
- {
+ if ( moptions.rtSettings.printerProfile != options.rtSettings.printerProfile
+ || moptions.rtSettings.printerBPC != options.rtSettings.printerBPC
+ || moptions.rtSettings.printerIntent != options.rtSettings.printerIntent) {
// Update the position of the Histogram
- parent->updateProfiles(moptions.rtSettings.printerProfile, moptions.rtSettings.printerIntent, moptions.rtSettings.printerBPC);
+ parent->updateProfiles (moptions.rtSettings.printerProfile, moptions.rtSettings.printerIntent, moptions.rtSettings.printerBPC);
}
}
@@ -2381,7 +2418,7 @@ void Preferences::addExtPressed ()
return;
}
- Gtk::TreeRow row = *(extensionModel->append());
+ Gtk::TreeRow row = * (extensionModel->append());
row[extensionColumns.enabled] = true;
row[extensionColumns.ext] = extension->get_text ();
@@ -2396,12 +2433,16 @@ void Preferences::delExtPressed ()
void Preferences::moveExtUpPressed ()
{
const Glib::RefPtr selection = extensions->get_selection ();
- if (!selection)
+
+ if (!selection) {
return;
+ }
const Gtk::TreeModel::iterator selected = selection->get_selected ();
- if (!selected || selected == extensionModel->children ().begin ())
+
+ if (!selected || selected == extensionModel->children ().begin ()) {
return;
+ }
Gtk::TreeModel::iterator previous = selected;
--previous;
@@ -2411,16 +2452,22 @@ void Preferences::moveExtUpPressed ()
void Preferences::moveExtDownPressed ()
{
const Glib::RefPtr selection = extensions->get_selection ();
- if (!selection)
+
+ if (!selection) {
return;
+ }
const Gtk::TreeModel::iterator selected = selection->get_selected ();
- if (!selected)
+
+ if (!selected) {
return;
+ }
Gtk::TreeModel::iterator next = selected;
- if (++next)
+
+ if (++next) {
extensionModel->iter_swap (selected, next);
+ }
}
void Preferences::clearProfilesPressed ()
@@ -2444,9 +2491,9 @@ void Preferences::clearAllPressed ()
void Preferences::darkFrameChanged ()
{
//Glib::ustring s(darkFrameDir->get_filename());
- Glib::ustring s(darkFrameDir->get_current_folder());
+ Glib::ustring s (darkFrameDir->get_current_folder());
//if( s.compare( rtengine::dfm.getPathname()) !=0 ){
- rtengine::dfm.init( s );
+ rtengine::dfm.init ( s );
updateDFinfos();
//}
}
@@ -2454,9 +2501,9 @@ void Preferences::darkFrameChanged ()
void Preferences::flatFieldChanged ()
{
//Glib::ustring s(flatFieldDir->get_filename());
- Glib::ustring s(flatFieldDir->get_current_folder());
+ Glib::ustring s (flatFieldDir->get_current_folder());
//if( s.compare( rtengine::ffm.getPathname()) !=0 ){
- rtengine::ffm.init( s );
+ rtengine::ffm.init ( s );
updateFFinfos();
//}
}
@@ -2464,20 +2511,20 @@ void Preferences::flatFieldChanged ()
void Preferences::updateDFinfos()
{
int t1, t2;
- rtengine::dfm.getStat(t1, t2);
- Glib::ustring s = Glib::ustring::compose("%1: %2 %3, %4 %5", M("PREFERENCES_DARKFRAMEFOUND"), t1, M("PREFERENCES_DARKFRAMESHOTS"), t2, M("PREFERENCES_DARKFRAMETEMPLATES"));
- dfLabel->set_text(s);
+ rtengine::dfm.getStat (t1, t2);
+ Glib::ustring s = Glib::ustring::compose ("%1: %2 %3, %4 %5", M ("PREFERENCES_DARKFRAMEFOUND"), t1, M ("PREFERENCES_DARKFRAMESHOTS"), t2, M ("PREFERENCES_DARKFRAMETEMPLATES"));
+ dfLabel->set_text (s);
}
void Preferences::updateFFinfos()
{
int t1, t2;
- rtengine::ffm.getStat(t1, t2);
- Glib::ustring s = Glib::ustring::compose("%1: %2 %3, %4 %5", M("PREFERENCES_FLATFIELDFOUND"), t1, M("PREFERENCES_FLATFIELDSHOTS"), t2, M("PREFERENCES_FLATFIELDTEMPLATES"));
- ffLabel->set_text(s);
+ rtengine::ffm.getStat (t1, t2);
+ Glib::ustring s = Glib::ustring::compose ("%1: %2 %3, %4 %5", M ("PREFERENCES_FLATFIELDFOUND"), t1, M ("PREFERENCES_FLATFIELDSHOTS"), t2, M ("PREFERENCES_FLATFIELDTEMPLATES"));
+ ffLabel->set_text (s);
}
-bool Preferences::splashClosed(GdkEventAny* event)
+bool Preferences::splashClosed (GdkEventAny* event)
{
delete splash;
splash = nullptr;