diff --git a/rtdata/languages/default b/rtdata/languages/default
index 5f1b4666c..d6368127d 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
@@ -1339,6 +1344,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
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 4440129c1..f5ca1c55d 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -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);
@@ -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);
@@ -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..7adf39df5 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,14 +139,14 @@ 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,
0.25, 0.25, 0.35, 0.35,
@@ -153,11 +155,11 @@ void RetinexParams::getDefaultgaintransmissionCurve(std::vector &curve)
};
- 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];
}
}
@@ -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,14 +310,14 @@ 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;
}
@@ -328,11 +330,11 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
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]);
+ 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];
@@ -370,11 +372,11 @@ void ColorToningParams::mixerToCurve(std::vector &colorCurve, std::vecto
}
// 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]);
+ 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];
@@ -412,11 +414,11 @@ 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];
@@ -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,92 +566,92 @@ 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,
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,
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,
1.00, 0.50, 0.35, 0.35
@@ -659,47 +661,47 @@ 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
};
- 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,7 +715,7 @@ void WaveletParams::setDefaults()
balance = 0;
iter = 0;
wavclCurve.clear ();
- wavclCurve.push_back(DCT_Linear);
+ wavclCurve.push_back (DCT_Linear);
Lmethod = "4_";
CHmethod = "without";
@@ -745,8 +747,8 @@ void WaveletParams::setDefaults()
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 +756,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);
+ 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);
+ 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 +778,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 +797,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 +818,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 +830,8 @@ void DirPyrDenoiseParams::getDefaultCCCurve(std::vector &curve)
void DirPyrDenoiseParams::setDefaults()
{
- getDefaultNoisCurve(lcurve);
- getDefaultCCCurve(cccurve);
+ getDefaultNoisCurve (lcurve);
+ getDefaultCCCurve (cccurve);
enabled = false;
enhance = false;
@@ -852,10 +855,10 @@ 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()
@@ -871,9 +874,9 @@ void ToneCurveParams::setDefaults()
hlcomprthresh = 33;
shcompr = 50;
curve.clear ();
- curve.push_back(DCT_Linear);
+ curve.push_back (DCT_Linear);
curve2.clear ();
- curve2.push_back(DCT_Linear);
+ curve2.push_back (DCT_Linear);
curveMode = ToneCurveParams::TC_MODE_STD;
curveMode2 = ToneCurveParams::TC_MODE_STD;
hrenabled = false;
@@ -1028,32 +1031,32 @@ void ProcParams::setDefaults ()
labCurve.lcredsk = true;
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.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();
@@ -1070,7 +1073,7 @@ void ProcParams::setDefaults ()
sharpening.enabled = false;
sharpening.radius = 0.5;
sharpening.amount = 200;
- sharpening.threshold.setValues(20, 80, 2000, 1200);
+ sharpening.threshold.setValues (20, 80, 2000, 1200);
sharpening.edgesonly = false;
sharpening.edges_radius = 1.9;
sharpening.edges_tolerance = 1800;
@@ -1085,7 +1088,7 @@ void ProcParams::setDefaults ()
prsharpening.enabled = false;
prsharpening.radius = 0.5;
prsharpening.amount = 200;
- prsharpening.threshold.setValues(20, 80, 2000, 1200);
+ prsharpening.threshold.setValues (20, 80, 2000, 1200);
prsharpening.edgesonly = false;
prsharpening.edges_radius = 1.9;
prsharpening.edges_tolerance = 1800;
@@ -1100,12 +1103,12 @@ void ProcParams::setDefaults ()
vibrance.enabled = false;
vibrance.pastels = 0;
vibrance.saturated = 0;
- vibrance.psthreshold.setValues(0, 75);
+ 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;
@@ -1138,14 +1141,17 @@ void ProcParams::setDefaults ()
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.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.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;
@@ -1154,31 +1160,31 @@ void ProcParams::setDefaults ()
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();
@@ -1273,10 +1279,10 @@ void ProcParams::setDefaults ()
blackwhite.filter = "None";
blackwhite.setting = "NormalContrast";
blackwhite.beforeCurve.clear ();
- blackwhite.beforeCurve.push_back(DCT_Linear);
+ blackwhite.beforeCurve.push_back (DCT_Linear);
blackwhite.beforeCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
blackwhite.afterCurve.clear ();
- blackwhite.afterCurve.push_back(DCT_Linear);
+ blackwhite.afterCurve.push_back (DCT_Linear);
blackwhite.afterCurveMode = BlackWhiteParams::TC_MODE_STD_BW;
blackwhite.algo = "SP";
@@ -1295,13 +1301,13 @@ 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.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 ();
@@ -1325,54 +1331,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)
@@ -1457,29 +1463,29 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -1489,29 +1495,29 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -1519,12 +1525,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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
@@ -1613,22 +1619,22 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
Glib::ArrayHandle mapcurve = retinex.mapcurve;
- keyFile.set_double_list("Retinex", "MAPCurve", mapcurve);
+ keyFile.set_double_list ("Retinex", "MAPCurve", mapcurve);
}
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) {
Glib::ArrayHandle lhcurve = retinex.lhcurve;
- keyFile.set_double_list("Retinex", "LHCurve", lhcurve);
+ keyFile.set_double_list ("Retinex", "LHCurve", lhcurve);
}
if (!pedited || pedited->retinex.highlights) {
@@ -1653,28 +1659,28 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
Glib::ArrayHandle gaintransmissionCurve = retinex.gaintransmissionCurve;
- keyFile.set_double_list("Retinex", "GainTransmissionCurve", gaintransmissionCurve);
+ keyFile.set_double_list ("Retinex", "GainTransmissionCurve", gaintransmissionCurve);
}
// 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
@@ -1752,28 +1758,28 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -1783,16 +1789,16 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -1800,12 +1806,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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
@@ -1835,47 +1841,47 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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) {
Glib::ArrayHandle clcurve = labCurve.clcurve;
- keyFile.set_double_list("Luminance Curve", "ClCurve", clcurve);
+ keyFile.set_double_list ("Luminance Curve", "ClCurve", clcurve);
}
// save sharpening
@@ -1897,7 +1903,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
@@ -1951,7 +1957,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
@@ -1968,7 +1974,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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
@@ -2125,6 +2131,18 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_boolean ("Color appearance", "Gamut", colorappearance.gamut);
}
+ 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);
@@ -2139,13 +2157,13 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -2155,13 +2173,13 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -2171,17 +2189,17 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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;
}
@@ -2190,17 +2208,17 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
}
@@ -2229,7 +2247,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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
@@ -2268,7 +2286,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
// never save 'auto chroma preview mode' to pp3
if (!pedited || pedited->dirpyrDenoise.Cmethod) {
- if(dirpyrDenoise.Cmethod == "PRE") {
+ if (dirpyrDenoise.Cmethod == "PRE") {
dirpyrDenoise.Cmethod = "MAN";
}
@@ -2276,7 +2294,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
}
if (!pedited || pedited->dirpyrDenoise.C2method) {
- if(dirpyrDenoise.C2method == "PREV") {
+ if (dirpyrDenoise.C2method == "PREV") {
dirpyrDenoise.C2method = "MANU";
}
@@ -2317,12 +2335,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
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.
@@ -2463,7 +2481,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
// 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) {
@@ -2606,7 +2624,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
@@ -2648,7 +2666,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
// 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) {
@@ -2683,22 +2701,22 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
@@ -2823,21 +2841,21 @@ 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]);
}
}
@@ -2851,37 +2869,37 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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);
}
@@ -2951,52 +2969,52 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
Glib::ArrayHandle wavclCurve = wavelet.wavclCurve;
- keyFile.set_double_list("Wavelet", "WavclCurve", wavclCurve);
+ keyFile.set_double_list ("Wavelet", "WavclCurve", wavclCurve);
}
@@ -3027,7 +3045,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
@@ -3087,7 +3105,7 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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) {
@@ -3108,12 +3126,12 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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]);
}
}
@@ -3128,28 +3146,28 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
// 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
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
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,7 +3175,7 @@ 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 );
}
@@ -3167,17 +3185,17 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
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
@@ -3251,12 +3269,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 +3291,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) {
Glib::ArrayHandle clcurve = colorToning.clcurve;
- keyFile.set_double_list("ColorToning", "ClCurve", clcurve);
+ keyFile.set_double_list ("ColorToning", "ClCurve", clcurve);
}
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
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 +3319,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) {
@@ -3567,7 +3585,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 +3626,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 +3637,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");
@@ -3819,7 +3837,8 @@ 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);
+ avoidEmptyCurve (toneCurve.curve);
+
if (pedited) {
pedited->toneCurve.curve = true;
}
@@ -3827,7 +3846,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Exposure", "Curve2")) {
toneCurve.curve2 = keyFile.get_double_list ("Exposure", "Curve2");
- avoidEmptyCurve(toneCurve.curve2);
+ avoidEmptyCurve (toneCurve.curve2);
+
if (pedited) {
pedited->toneCurve.curve2 = true;
}
@@ -3859,10 +3879,11 @@ 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) {
@@ -4013,7 +4034,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -4021,7 +4043,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Black & White", "BeforeCurve")) {
blackwhite.beforeCurve = keyFile.get_double_list ("Black & White", "BeforeCurve");
- avoidEmptyCurve(blackwhite.beforeCurve);
+ avoidEmptyCurve (blackwhite.beforeCurve);
+
if (pedited) {
pedited->blackwhite.beforeCurve = true;
}
@@ -4055,7 +4078,8 @@ 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);
+ avoidEmptyCurve (blackwhite.afterCurve);
+
if (pedited) {
pedited->blackwhite.afterCurve = true;
}
@@ -4242,7 +4266,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Retinex", "CDCurve")) {
retinex.cdcurve = keyFile.get_double_list ("Retinex", "CDCurve");
- avoidEmptyCurve(retinex.cdcurve);
+ avoidEmptyCurve (retinex.cdcurve);
+
if (pedited) {
pedited->retinex.cdcurve = true;
}
@@ -4250,7 +4275,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Retinex", "MAPCurve")) {
retinex.mapcurve = keyFile.get_double_list ("Retinex", "MAPCurve");
- avoidEmptyCurve(retinex.mapcurve);
+ avoidEmptyCurve (retinex.mapcurve);
+
if (pedited) {
pedited->retinex.mapcurve = true;
}
@@ -4258,7 +4284,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Retinex", "CDHCurve")) {
retinex.cdHcurve = keyFile.get_double_list ("Retinex", "CDHCurve");
- avoidEmptyCurve(retinex.cdHcurve);
+ avoidEmptyCurve (retinex.cdHcurve);
+
if (pedited) {
pedited->retinex.cdHcurve = true;
}
@@ -4266,7 +4293,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Retinex", "LHCurve")) {
retinex.lhcurve = keyFile.get_double_list ("Retinex", "LHCurve");
- avoidEmptyCurve(retinex.lhcurve);
+ avoidEmptyCurve (retinex.lhcurve);
+
if (pedited) {
pedited->retinex.lhcurve = true;
}
@@ -4316,7 +4344,8 @@ 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);
+ avoidEmptyCurve (retinex.transmissionCurve);
+
if (pedited) {
pedited->retinex.transmissionCurve = true;
}
@@ -4325,7 +4354,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Retinex", "GainTransmissionCurve")) {
retinex.gaintransmissionCurve = keyFile.get_double_list ("Retinex", "GainTransmissionCurve");
- avoidEmptyCurve(retinex.gaintransmissionCurve);
+ avoidEmptyCurve (retinex.gaintransmissionCurve);
+
if (pedited) {
pedited->retinex.gaintransmissionCurve = true;
}
@@ -4425,7 +4455,8 @@ 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);
+ avoidEmptyCurve (labCurve.lcurve);
+
if (pedited) {
pedited->labCurve.lcurve = true;
}
@@ -4433,7 +4464,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "aCurve")) {
labCurve.acurve = keyFile.get_double_list ("Luminance Curve", "aCurve");
- avoidEmptyCurve(labCurve.acurve);
+ avoidEmptyCurve (labCurve.acurve);
+
if (pedited) {
pedited->labCurve.acurve = true;
}
@@ -4441,7 +4473,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "bCurve")) {
labCurve.bcurve = keyFile.get_double_list ("Luminance Curve", "bCurve");
- avoidEmptyCurve(labCurve.bcurve);
+ avoidEmptyCurve (labCurve.bcurve);
+
if (pedited) {
pedited->labCurve.bcurve = true;
}
@@ -4449,7 +4482,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "ccCurve")) {
labCurve.cccurve = keyFile.get_double_list ("Luminance Curve", "ccCurve");
- avoidEmptyCurve(labCurve.cccurve);
+ avoidEmptyCurve (labCurve.cccurve);
+
if (pedited) {
pedited->labCurve.cccurve = true;
}
@@ -4457,7 +4491,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "chCurve")) {
labCurve.chcurve = keyFile.get_double_list ("Luminance Curve", "chCurve");
- avoidEmptyCurve(labCurve.chcurve);
+ avoidEmptyCurve (labCurve.chcurve);
+
if (pedited) {
pedited->labCurve.chcurve = true;
}
@@ -4465,7 +4500,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "lhCurve")) {
labCurve.lhcurve = keyFile.get_double_list ("Luminance Curve", "lhCurve");
- avoidEmptyCurve(labCurve.lhcurve);
+ avoidEmptyCurve (labCurve.lhcurve);
+
if (pedited) {
pedited->labCurve.lhcurve = true;
}
@@ -4473,7 +4509,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "hhCurve")) {
labCurve.hhcurve = keyFile.get_double_list ("Luminance Curve", "hhCurve");
- avoidEmptyCurve(labCurve.hhcurve);
+ avoidEmptyCurve (labCurve.hhcurve);
+
if (pedited) {
pedited->labCurve.hhcurve = true;
}
@@ -4481,7 +4518,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "LcCurve")) {
labCurve.lccurve = keyFile.get_double_list ("Luminance Curve", "LcCurve");
- avoidEmptyCurve(labCurve.lccurve);
+ avoidEmptyCurve (labCurve.lccurve);
+
if (pedited) {
pedited->labCurve.lccurve = true;
}
@@ -4489,7 +4527,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Luminance Curve", "ClCurve")) {
labCurve.clcurve = keyFile.get_double_list ("Luminance Curve", "ClCurve");
- avoidEmptyCurve(labCurve.clcurve);
+ avoidEmptyCurve (labCurve.clcurve);
+
if (pedited) {
pedited->labCurve.clcurve = true;
}
@@ -4525,12 +4564,13 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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));
}
}
@@ -4719,11 +4759,12 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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]);
}
}
@@ -4758,7 +4799,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Vibrance", "SkinTonesCurve")) {
vibrance.skintonescurve = keyFile.get_double_list ("Vibrance", "SkinTonesCurve");
- avoidEmptyCurve(vibrance.skintonescurve);
+ avoidEmptyCurve (vibrance.skintonescurve);
+
if (pedited) {
pedited->vibrance.skintonescurve = true;
}
@@ -4856,12 +4898,13 @@ 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);
+ avoidEmptyCurve (defringe.huecurve);
+
if (pedited) {
pedited->defringe.huecurve = true;
}
@@ -5039,6 +5082,30 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
+ 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");
@@ -5104,7 +5171,8 @@ 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);
+ avoidEmptyCurve (colorappearance.curve);
+
if (pedited) {
pedited->colorappearance.curve = true;
}
@@ -5112,7 +5180,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Color appearance", "Curve2")) {
colorappearance.curve2 = keyFile.get_double_list ("Color appearance", "Curve2");
- avoidEmptyCurve(colorappearance.curve2);
+ avoidEmptyCurve (colorappearance.curve2);
+
if (pedited) {
pedited->colorappearance.curve2 = true;
}
@@ -5120,7 +5189,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Color appearance", "Curve3")) {
colorappearance.curve3 = keyFile.get_double_list ("Color appearance", "Curve3");
- avoidEmptyCurve(colorappearance.curve3);
+ avoidEmptyCurve (colorappearance.curve3);
+
if (pedited) {
pedited->colorappearance.curve3 = true;
}
@@ -5224,7 +5294,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
// never load 'auto chroma preview mode' from pp3
- if(dirpyrDenoise.Cmethod == "PRE") {
+ if (dirpyrDenoise.Cmethod == "PRE") {
dirpyrDenoise.Cmethod = "MAN";
}
@@ -5236,7 +5306,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- if(dirpyrDenoise.C2method == "PREV") {
+ if (dirpyrDenoise.C2method == "PREV") {
dirpyrDenoise.C2method = "MANU";
}
@@ -5274,7 +5344,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Directional Pyramid Denoising", "LCurve")) {
dirpyrDenoise.lcurve = keyFile.get_double_list ("Directional Pyramid Denoising", "LCurve");
- avoidEmptyCurve(dirpyrDenoise.lcurve);
+ avoidEmptyCurve (dirpyrDenoise.lcurve);
+
if (pedited) {
pedited->dirpyrDenoise.lcurve = true;
}
@@ -5282,7 +5353,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("Directional Pyramid Denoising", "CCCurve")) {
dirpyrDenoise.cccurve = keyFile.get_double_list ("Directional Pyramid Denoising", "CCCurve");
- avoidEmptyCurve(dirpyrDenoise.cccurve);
+ avoidEmptyCurve (dirpyrDenoise.cccurve);
+
if (pedited) {
pedited->dirpyrDenoise.cccurve = true;
}
@@ -5323,7 +5395,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
//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 +5403,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 +5411,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 +5419,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 +5427,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 +5435,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) {
@@ -5481,7 +5553,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "W")) {
- crop.w = std::max(keyFile.get_integer("Crop", "W"), 1);
+ crop.w = std::max (keyFile.get_integer ("Crop", "W"), 1);
if (pedited) {
pedited->crop.w = true;
@@ -5489,7 +5561,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("Crop", "H")) {
- crop.h = std::max(keyFile.get_integer("Crop", "H"), 1);
+ crop.h = std::max (keyFile.get_integer ("Crop", "H"), 1);
if (pedited) {
pedited->crop.h = true;
@@ -5605,7 +5677,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// 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;
@@ -5890,12 +5962,13 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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));
}
}
@@ -5988,7 +6061,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// 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"));
+ icm.input = expandRelativePath (fname, "file:", keyFile.get_string ("Color Management", "InputProfile"));
if (pedited) {
pedited->icm.input = true;
@@ -6548,7 +6621,8 @@ 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;
}
@@ -6556,7 +6630,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6564,7 +6639,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6572,7 +6648,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6580,7 +6657,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6588,7 +6666,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6596,7 +6675,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6604,7 +6684,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -6612,8 +6693,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6623,8 +6705,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6634,8 +6717,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6645,8 +6729,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6656,8 +6741,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6667,8 +6753,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6678,8 +6765,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6689,8 +6777,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6700,8 +6789,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6712,8 +6802,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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) {
@@ -6723,8 +6814,9 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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 +6825,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,11 +6849,11 @@ 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) {
@@ -6770,11 +6862,11 @@ 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 << "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) {
@@ -6857,8 +6949,9 @@ 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")) {
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,12 +6960,12 @@ 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) {
@@ -6891,11 +6984,11 @@ 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 ++) {
+ for (int i = 0; i < 6; i ++) {
std::stringstream ss;
ss << "Mult" << i;
- if(keyFile.has_key ("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) {
@@ -6904,7 +6997,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
- 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 +7005,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) {
@@ -6923,28 +7016,28 @@ 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" );
+ 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 ) {
@@ -6958,7 +7051,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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 +7060,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 +7069,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;
}
@@ -6994,7 +7090,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,7 +7099,8 @@ 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;
}
@@ -7010,7 +7108,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
if (keyFile.has_key ("RGB Curves", "bCurve")) {
rgbCurves.bcurve = keyFile.get_double_list ("RGB Curves", "bCurve");
- avoidEmptyCurve(rgbCurves.bcurve);
+ avoidEmptyCurve (rgbCurves.bcurve);
+
if (pedited) {
pedited->rgbCurves.bcurve = true;
}
@@ -7053,7 +7152,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -7061,7 +7161,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -7101,8 +7202,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 +7214,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) {
@@ -7123,7 +7226,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -7131,7 +7235,8 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
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;
}
@@ -7237,7 +7342,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
// load raw settings
if (keyFile.has_group ("RAW")) {
if (keyFile.has_key ("RAW", "DarkFrame")) {
- raw.dark_frame = expandRelativePath(fname, "", keyFile.get_string ("RAW", "DarkFrame" ));
+ raw.dark_frame = expandRelativePath (fname, "", keyFile.get_string ("RAW", "DarkFrame" ));
if (pedited) {
pedited->raw.darkFrame = true;
@@ -7253,7 +7358,7 @@ 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" ));
+ raw.ff_file = expandRelativePath (fname, "", keyFile.get_string ("RAW", "FlatFieldFile" ));
if (pedited) {
pedited->raw.ff_file = true;
@@ -7358,7 +7463,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreExposure")) {
- raw.expos = keyFile.get_double("RAW", "PreExposure");
+ raw.expos = keyFile.get_double ("RAW", "PreExposure");
if (pedited) {
pedited->raw.exPos = true;
@@ -7366,7 +7471,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PrePreserv")) {
- raw.preser = keyFile.get_double("RAW", "PrePreserv");
+ raw.preser = keyFile.get_double ("RAW", "PrePreserv");
if (pedited) {
pedited->raw.exPreser = true;
@@ -7407,7 +7512,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "DCBIterations")) {
- raw.bayersensor.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations");
+ raw.bayersensor.dcb_iterations = keyFile.get_integer ("RAW", "DCBIterations");
if (pedited) {
pedited->raw.bayersensor.dcbIterations = true;
@@ -7415,7 +7520,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "DCBEnhance")) {
- raw.bayersensor.dcb_enhance = keyFile.get_boolean("RAW", "DCBEnhance");
+ raw.bayersensor.dcb_enhance = keyFile.get_boolean ("RAW", "DCBEnhance");
if (pedited) {
pedited->raw.bayersensor.dcbEnhance = true;
@@ -7423,7 +7528,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "LMMSEIterations")) {
- raw.bayersensor.lmmse_iterations = keyFile.get_integer("RAW", "LMMSEIterations");
+ raw.bayersensor.lmmse_iterations = keyFile.get_integer ("RAW", "LMMSEIterations");
if (pedited) {
pedited->raw.bayersensor.lmmseIterations = true;
@@ -7431,7 +7536,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreBlackzero")) {
- raw.bayersensor.black0 = keyFile.get_double("RAW", "PreBlackzero");
+ raw.bayersensor.black0 = keyFile.get_double ("RAW", "PreBlackzero");
if (pedited) {
pedited->raw.bayersensor.exBlack0 = true;
@@ -7439,7 +7544,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreBlackone")) {
- raw.bayersensor.black1 = keyFile.get_double("RAW", "PreBlackone");
+ raw.bayersensor.black1 = keyFile.get_double ("RAW", "PreBlackone");
if (pedited) {
pedited->raw.bayersensor.exBlack1 = true;
@@ -7447,7 +7552,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreBlacktwo")) {
- raw.bayersensor.black2 = keyFile.get_double("RAW", "PreBlacktwo");
+ raw.bayersensor.black2 = keyFile.get_double ("RAW", "PreBlacktwo");
if (pedited) {
pedited->raw.bayersensor.exBlack2 = true;
@@ -7455,7 +7560,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreBlackthree")) {
- raw.bayersensor.black3 = keyFile.get_double("RAW", "PreBlackthree");
+ raw.bayersensor.black3 = keyFile.get_double ("RAW", "PreBlackthree");
if (pedited) {
pedited->raw.bayersensor.exBlack3 = true;
@@ -7463,7 +7568,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW", "PreTwoGreen")) {
- raw.bayersensor.twogreen = keyFile.get_boolean("RAW", "PreTwoGreen");
+ raw.bayersensor.twogreen = keyFile.get_boolean ("RAW", "PreTwoGreen");
if (pedited) {
pedited->raw.bayersensor.exTwoGreen = true;
@@ -7501,7 +7606,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PreBlack0")) {
- raw.bayersensor.black0 = keyFile.get_double("RAW Bayer", "PreBlack0");
+ raw.bayersensor.black0 = keyFile.get_double ("RAW Bayer", "PreBlack0");
if (pedited) {
pedited->raw.bayersensor.exBlack0 = true;
@@ -7509,7 +7614,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PreBlack1")) {
- raw.bayersensor.black1 = keyFile.get_double("RAW Bayer", "PreBlack1");
+ raw.bayersensor.black1 = keyFile.get_double ("RAW Bayer", "PreBlack1");
if (pedited) {
pedited->raw.bayersensor.exBlack1 = true;
@@ -7517,7 +7622,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PreBlack2")) {
- raw.bayersensor.black2 = keyFile.get_double("RAW Bayer", "PreBlack2");
+ raw.bayersensor.black2 = keyFile.get_double ("RAW Bayer", "PreBlack2");
if (pedited) {
pedited->raw.bayersensor.exBlack2 = true;
@@ -7525,7 +7630,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PreBlack3")) {
- raw.bayersensor.black3 = keyFile.get_double("RAW Bayer", "PreBlack3");
+ raw.bayersensor.black3 = keyFile.get_double ("RAW Bayer", "PreBlack3");
if (pedited) {
pedited->raw.bayersensor.exBlack3 = true;
@@ -7533,7 +7638,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PreTwoGreen")) {
- raw.bayersensor.twogreen = keyFile.get_boolean("RAW Bayer", "PreTwoGreen");
+ raw.bayersensor.twogreen = keyFile.get_boolean ("RAW Bayer", "PreTwoGreen");
if (pedited) {
pedited->raw.bayersensor.exTwoGreen = true;
@@ -7557,7 +7662,7 @@ 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");
+ raw.bayersensor.dcb_iterations = keyFile.get_integer ("RAW Bayer", "DCBIterations");
if (pedited) {
pedited->raw.bayersensor.dcbIterations = true;
@@ -7565,7 +7670,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "DCBEnhance")) {
- raw.bayersensor.dcb_enhance = keyFile.get_boolean("RAW Bayer", "DCBEnhance");
+ raw.bayersensor.dcb_enhance = keyFile.get_boolean ("RAW Bayer", "DCBEnhance");
if (pedited) {
pedited->raw.bayersensor.dcbEnhance = true;
@@ -7573,7 +7678,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "LMMSEIterations")) {
- raw.bayersensor.lmmse_iterations = keyFile.get_integer("RAW Bayer", "LMMSEIterations");
+ raw.bayersensor.lmmse_iterations = keyFile.get_integer ("RAW Bayer", "LMMSEIterations");
if (pedited) {
pedited->raw.bayersensor.lmmseIterations = true;
@@ -7581,7 +7686,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftMotion")) {
- raw.bayersensor.pixelShiftMotion = keyFile.get_integer("RAW Bayer", "PixelShiftMotion");
+ raw.bayersensor.pixelShiftMotion = keyFile.get_integer ("RAW Bayer", "PixelShiftMotion");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMotion = true;
@@ -7589,15 +7694,15 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftMotionCorrection")) {
- raw.bayersensor.pixelShiftMotionCorrection = (RAWParams::BayerSensor::ePSMotionCorrection)keyFile.get_integer("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");
+ raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::ePSMotionCorrectionMethod)keyFile.get_integer ("RAW Bayer", "PixelShiftMotionCorrectionMethod");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMotionCorrectionMethod = true;
@@ -7605,7 +7710,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorGreen")) {
- raw.bayersensor.pixelShiftStddevFactorGreen = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorGreen");
+ raw.bayersensor.pixelShiftStddevFactorGreen = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorGreen");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorGreen = true;
@@ -7613,7 +7718,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorRed")) {
- raw.bayersensor.pixelShiftStddevFactorRed = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorRed");
+ raw.bayersensor.pixelShiftStddevFactorRed = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorRed");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorRed = true;
@@ -7621,7 +7726,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftStddevFactorBlue")) {
- raw.bayersensor.pixelShiftStddevFactorBlue = keyFile.get_double("RAW Bayer", "pixelShiftStddevFactorBlue");
+ raw.bayersensor.pixelShiftStddevFactorBlue = keyFile.get_double ("RAW Bayer", "pixelShiftStddevFactorBlue");
if (pedited) {
pedited->raw.bayersensor.pixelShiftStddevFactorBlue = true;
@@ -7629,7 +7734,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftEperIso")) {
- raw.bayersensor.pixelShiftEperIso = keyFile.get_double("RAW Bayer", "PixelShiftEperIso");
+ raw.bayersensor.pixelShiftEperIso = keyFile.get_double ("RAW Bayer", "PixelShiftEperIso");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEperIso = true;
@@ -7637,7 +7742,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftNreadIso")) {
- raw.bayersensor.pixelShiftNreadIso = keyFile.get_double("RAW Bayer", "PixelShiftNreadIso");
+ raw.bayersensor.pixelShiftNreadIso = keyFile.get_double ("RAW Bayer", "PixelShiftNreadIso");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNreadIso = true;
@@ -7645,7 +7750,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftPrnu")) {
- raw.bayersensor.pixelShiftPrnu = keyFile.get_double("RAW Bayer", "PixelShiftPrnu");
+ raw.bayersensor.pixelShiftPrnu = keyFile.get_double ("RAW Bayer", "PixelShiftPrnu");
if (pedited) {
pedited->raw.bayersensor.pixelShiftPrnu = true;
@@ -7653,7 +7758,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftSigma")) {
- raw.bayersensor.pixelShiftSigma = keyFile.get_double("RAW Bayer", "PixelShiftSigma");
+ raw.bayersensor.pixelShiftSigma = keyFile.get_double ("RAW Bayer", "PixelShiftSigma");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSigma = true;
@@ -7661,7 +7766,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftSum")) {
- raw.bayersensor.pixelShiftSum = keyFile.get_double("RAW Bayer", "PixelShiftSum");
+ raw.bayersensor.pixelShiftSum = keyFile.get_double ("RAW Bayer", "PixelShiftSum");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSum = true;
@@ -7669,7 +7774,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftRedBlueWeight")) {
- raw.bayersensor.pixelShiftRedBlueWeight = keyFile.get_double("RAW Bayer", "PixelShiftRedBlueWeight");
+ raw.bayersensor.pixelShiftRedBlueWeight = keyFile.get_double ("RAW Bayer", "PixelShiftRedBlueWeight");
if (pedited) {
pedited->raw.bayersensor.pixelShiftRedBlueWeight = true;
@@ -7677,7 +7782,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotion")) {
- raw.bayersensor.pixelShiftShowMotion = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotion");
+ raw.bayersensor.pixelShiftShowMotion = keyFile.get_boolean ("RAW Bayer", "PixelShiftShowMotion");
if (pedited) {
pedited->raw.bayersensor.pixelShiftShowMotion = true;
@@ -7685,7 +7790,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "PixelShiftShowMotionMaskOnly")) {
- raw.bayersensor.pixelShiftShowMotionMaskOnly = keyFile.get_boolean("RAW Bayer", "PixelShiftShowMotionMaskOnly");
+ raw.bayersensor.pixelShiftShowMotionMaskOnly = keyFile.get_boolean ("RAW Bayer", "PixelShiftShowMotionMaskOnly");
if (pedited) {
pedited->raw.bayersensor.pixelShiftShowMotionMaskOnly = true;
@@ -7693,7 +7798,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftAutomatic")) {
- raw.bayersensor.pixelShiftAutomatic = keyFile.get_boolean("RAW Bayer", "pixelShiftAutomatic");
+ raw.bayersensor.pixelShiftAutomatic = keyFile.get_boolean ("RAW Bayer", "pixelShiftAutomatic");
if (pedited) {
pedited->raw.bayersensor.pixelShiftAutomatic = true;
@@ -7701,7 +7806,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenHorizontal")) {
- raw.bayersensor.pixelShiftNonGreenHorizontal = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenHorizontal");
+ raw.bayersensor.pixelShiftNonGreenHorizontal = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenHorizontal");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenHorizontal = true;
@@ -7709,7 +7814,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenVertical")) {
- raw.bayersensor.pixelShiftNonGreenVertical = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenVertical");
+ raw.bayersensor.pixelShiftNonGreenVertical = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenVertical");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenVertical = true;
@@ -7717,7 +7822,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftHoleFill")) {
- raw.bayersensor.pixelShiftHoleFill = keyFile.get_boolean("RAW Bayer", "pixelShiftHoleFill");
+ raw.bayersensor.pixelShiftHoleFill = keyFile.get_boolean ("RAW Bayer", "pixelShiftHoleFill");
if (pedited) {
pedited->raw.bayersensor.pixelShiftHoleFill = true;
@@ -7725,7 +7830,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian")) {
- raw.bayersensor.pixelShiftMedian = keyFile.get_boolean("RAW Bayer", "pixelShiftMedian");
+ raw.bayersensor.pixelShiftMedian = keyFile.get_boolean ("RAW Bayer", "pixelShiftMedian");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMedian = true;
@@ -7733,7 +7838,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftMedian3")) {
- raw.bayersensor.pixelShiftMedian3 = keyFile.get_boolean("RAW Bayer", "pixelShiftMedian3");
+ raw.bayersensor.pixelShiftMedian3 = keyFile.get_boolean ("RAW Bayer", "pixelShiftMedian3");
if (pedited) {
pedited->raw.bayersensor.pixelShiftMedian3 = true;
@@ -7741,7 +7846,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftGreen")) {
- raw.bayersensor.pixelShiftGreen = keyFile.get_boolean("RAW Bayer", "pixelShiftGreen");
+ raw.bayersensor.pixelShiftGreen = keyFile.get_boolean ("RAW Bayer", "pixelShiftGreen");
if (pedited) {
pedited->raw.bayersensor.pixelShiftGreen = true;
@@ -7749,7 +7854,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftBlur")) {
- raw.bayersensor.pixelShiftBlur = keyFile.get_boolean("RAW Bayer", "pixelShiftBlur");
+ raw.bayersensor.pixelShiftBlur = keyFile.get_boolean ("RAW Bayer", "pixelShiftBlur");
if (pedited) {
pedited->raw.bayersensor.pixelShiftBlur = true;
@@ -7757,7 +7862,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftSmoothFactor")) {
- raw.bayersensor.pixelShiftSmoothFactor = keyFile.get_double("RAW Bayer", "pixelShiftSmoothFactor");
+ raw.bayersensor.pixelShiftSmoothFactor = keyFile.get_double ("RAW Bayer", "pixelShiftSmoothFactor");
if (pedited) {
pedited->raw.bayersensor.pixelShiftSmooth = true;
@@ -7765,7 +7870,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftExp0")) {
- raw.bayersensor.pixelShiftExp0 = keyFile.get_boolean("RAW Bayer", "pixelShiftExp0");
+ raw.bayersensor.pixelShiftExp0 = keyFile.get_boolean ("RAW Bayer", "pixelShiftExp0");
if (pedited) {
pedited->raw.bayersensor.pixelShiftExp0 = true;
@@ -7773,7 +7878,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftLmmse")) {
- raw.bayersensor.pixelShiftLmmse = keyFile.get_boolean("RAW Bayer", "pixelShiftLmmse");
+ raw.bayersensor.pixelShiftLmmse = keyFile.get_boolean ("RAW Bayer", "pixelShiftLmmse");
if (pedited) {
pedited->raw.bayersensor.pixelShiftLmmse = true;
@@ -7781,7 +7886,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBright")) {
- raw.bayersensor.pixelShiftEqualBright = keyFile.get_boolean("RAW Bayer", "pixelShiftEqualBright");
+ raw.bayersensor.pixelShiftEqualBright = keyFile.get_boolean ("RAW Bayer", "pixelShiftEqualBright");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEqualBright = true;
@@ -7789,7 +7894,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftEqualBrightChannel")) {
- raw.bayersensor.pixelShiftEqualBrightChannel = keyFile.get_boolean("RAW Bayer", "pixelShiftEqualBrightChannel");
+ raw.bayersensor.pixelShiftEqualBrightChannel = keyFile.get_boolean ("RAW Bayer", "pixelShiftEqualBrightChannel");
if (pedited) {
pedited->raw.bayersensor.pixelShiftEqualBrightChannel = true;
@@ -7797,7 +7902,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross")) {
- raw.bayersensor.pixelShiftNonGreenCross = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenCross");
+ raw.bayersensor.pixelShiftNonGreenCross = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenCross");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenCross = true;
@@ -7805,7 +7910,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenCross2")) {
- raw.bayersensor.pixelShiftNonGreenCross2 = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenCross2");
+ raw.bayersensor.pixelShiftNonGreenCross2 = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenCross2");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenCross2 = true;
@@ -7813,7 +7918,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW Bayer", "pixelShiftNonGreenAmaze")) {
- raw.bayersensor.pixelShiftNonGreenAmaze = keyFile.get_boolean("RAW Bayer", "pixelShiftNonGreenAmaze");
+ raw.bayersensor.pixelShiftNonGreenAmaze = keyFile.get_boolean ("RAW Bayer", "pixelShiftNonGreenAmaze");
if (pedited) {
pedited->raw.bayersensor.pixelShiftNonGreenAmaze = true;
@@ -7840,7 +7945,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW X-Trans", "PreBlackRed")) {
- raw.xtranssensor.blackred = keyFile.get_double("RAW X-Trans", "PreBlackRed");
+ raw.xtranssensor.blackred = keyFile.get_double ("RAW X-Trans", "PreBlackRed");
if (pedited) {
pedited->raw.xtranssensor.exBlackRed = true;
@@ -7848,7 +7953,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW X-Trans", "PreBlackGreen")) {
- raw.xtranssensor.blackgreen = keyFile.get_double("RAW X-Trans", "PreBlackGreen");
+ raw.xtranssensor.blackgreen = keyFile.get_double ("RAW X-Trans", "PreBlackGreen");
if (pedited) {
pedited->raw.xtranssensor.exBlackGreen = true;
@@ -7856,7 +7961,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
if (keyFile.has_key ("RAW X-Trans", "PreBlackBlue")) {
- raw.xtranssensor.blackblue = keyFile.get_double("RAW X-Trans", "PreBlackBlue");
+ raw.xtranssensor.blackblue = keyFile.get_double ("RAW X-Trans", "PreBlackBlue");
if (pedited) {
pedited->raw.xtranssensor.exBlackBlue = true;
@@ -7896,7 +8001,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 +8015,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 +8039,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 +8064,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 +8230,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 +8319,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 +8552,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 +8611,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 +8641,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..67259c4f5 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..c9097b33c 100644
--- a/rtgui/colorappearance.h
+++ b/rtgui/colorappearance.h
@@ -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/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..fd953e158 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -37,7 +37,7 @@ Glib::RefPtr themecss;
Glib::RefPtr fontcss;
Preferences::Preferences (RTWindow *rtwindow)
- : Gtk::Dialog (M("MAIN_BUTTON_PREFERENCES"), *rtwindow, true)
+ : 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,25 +149,25 @@ 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
@@ -176,216 +177,216 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
* 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"));
+ 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);
+ 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);
+ 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);
+ 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 );
+ 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 );
+ 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_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 ----------------------
- 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 ----------------------
- 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,52 +841,56 @@ 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 ----------------------
- 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"));
+ 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);
+ 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* 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"));
+ 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"));
- Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START));
- setExpandAlignProperties(greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+// 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);
+ 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);
@@ -890,10 +898,10 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
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);
+ 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 +912,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 +1012,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 +1229,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 +1260,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 +1295,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 +1308,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 +1325,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 +1354,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 +1383,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 +1394,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 +1419,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,20 +1435,20 @@ 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());
@@ -1447,18 +1457,18 @@ Gtk::Widget* Preferences::getSoundPanel ()
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());
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 +1498,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 +1528,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;
}
@@ -1585,7 +1599,7 @@ void Preferences::storePreferences ()
moptions.shadowThreshold = (int)shThresh->get_value ();
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,13 +1613,15 @@ 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;
}
- 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;
@@ -1639,45 +1655,54 @@ 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 ();
@@ -1785,9 +1810,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 +1821,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
@@ -1854,39 +1887,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 +1953,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 +1971,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,30 +1992,30 @@ 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);
@@ -2006,9 +2039,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 +2072,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 +2082,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 +2107,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 +2139,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 +2158,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 +2184,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 +2207,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 +2248,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 +2269,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 +2297,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 +2321,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 +2331,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 +2366,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 +2414,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 +2429,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 +2448,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 +2487,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 +2497,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 +2507,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;