[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] /: polish
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2012-10-31 22:39:04
Message-ID: 20121031223904.09B60A6078 () git ! kde ! org
[Download RAW message or body]
Git commit b48a323c21c37f2422582512745dcf857213573c by Gilles Caulier.
Committed on 31/10/2012 at 23:38.
Pushed by cgilles into branch 'master'.
polish
M +14 -14 libs/dimg/filters/lc/localcontrastcontainer.cpp
M +9 -9 libs/dimg/filters/lc/localcontrastcontainer.h
M +55 -55 libs/dimg/filters/lc/localcontrastfilter.cpp
M +7 -7 libs/dimg/filters/lc/localcontrastfilter.h
M +44 -43 libs/dimg/filters/lc/localcontrastsettings.cpp
M +4 -5 libs/dimg/filters/lc/localcontrastsettings.h
M +64 -64 utilities/queuemanager/basetools/enhance/localcontrast.cpp
http://commits.kde.org/digikam/b48a323c21c37f2422582512745dcf857213573c
diff --git a/libs/dimg/filters/lc/localcontrastcontainer.cpp \
b/libs/dimg/filters/lc/localcontrastcontainer.cpp index f6b019d..0cda0f6 100644
--- a/libs/dimg/filters/lc/localcontrastcontainer.cpp
+++ b/libs/dimg/filters/lc/localcontrastcontainer.cpp
@@ -43,10 +43,10 @@ namespace Digikam
LocalContrastContainer::LocalContrastContainer()
{
- stretch_contrast = true;
- high_saturation = 100;
- low_saturation = 100;
- function_id = 0;
+ stretchContrast = true;
+ highSaturation = 100;
+ lowSaturation = 100;
+ functionId = 0;
for (int i = 0 ; i < TONEMAPPING_MAX_STAGES ; ++i)
{
@@ -55,38 +55,38 @@ LocalContrastContainer::LocalContrastContainer()
stage[i].blur = 80.0;
}
- unsharp_mask.enabled = false;
- unsharp_mask.power = 30.0;
- unsharp_mask.blur = 4.0;
- unsharp_mask.threshold = 0;
+ unsharpMask.enabled = false;
+ unsharpMask.power = 30.0;
+ unsharpMask.blur = 4.0;
+ unsharpMask.threshold = 0;
}
LocalContrastContainer::~LocalContrastContainer()
{
}
-float LocalContrastContainer::get_power(int nstage)
+float LocalContrastContainer::getPower(int nstage) const
{
float power = stage[nstage].power;
power = (float)(qPow(power / 100.0, 1.5) * 100.0);
return power;
}
-float LocalContrastContainer::get_blur(int nstage)
+float LocalContrastContainer::getBlur(int nstage) const
{
return stage[nstage].blur;
}
-float LocalContrastContainer::get_unsharp_mask_power()
+float LocalContrastContainer::getUnsharpMaskPower() const
{
- float power = unsharp_mask.power;
+ float power = unsharpMask.power;
power = (float)(qPow(power / 100.0, 3.0) * 10.0);
return power;
}
-float LocalContrastContainer::get_unsharp_mask_blur()
+float LocalContrastContainer::getUnsharpMaskBlur() const
{
- return unsharp_mask.blur;
+ return unsharpMask.blur;
}
} // namespace Digikam
diff --git a/libs/dimg/filters/lc/localcontrastcontainer.h \
b/libs/dimg/filters/lc/localcontrastcontainer.h index 62645da..b5b3f50 100644
--- a/libs/dimg/filters/lc/localcontrastcontainer.h
+++ b/libs/dimg/filters/lc/localcontrastcontainer.h
@@ -43,19 +43,19 @@ public:
LocalContrastContainer();
~LocalContrastContainer();
- float get_power(int nstage);
- float get_blur(int nstage);
+ float getPower(int nstage) const;
+ float getBlur(int nstage) const;
- float get_unsharp_mask_power();
- float get_unsharp_mask_blur();
+ float getUnsharpMaskPower() const;
+ float getUnsharpMaskBlur() const;
public:
- bool stretch_contrast;
+ bool stretchContrast;
- int low_saturation;
- int high_saturation;
- int function_id;
+ int lowSaturation;
+ int highSaturation;
+ int functionId;
struct
{
@@ -72,7 +72,7 @@ public:
float power; // Amount : 0.0 - 5.0
int threshold; // threshold : 0.00 - 1.00
}
- unsharp_mask;
+ unsharpMask;
};
} // namespace Digikam
diff --git a/libs/dimg/filters/lc/localcontrastfilter.cpp \
b/libs/dimg/filters/lc/localcontrastfilter.cpp index 8e66667..098bc95 100644
--- a/libs/dimg/filters/lc/localcontrastfilter.cpp
+++ b/libs/dimg/filters/lc/localcontrastfilter.cpp
@@ -42,11 +42,11 @@
namespace Digikam
{
-class LocalContrastFilter::LocalContrastFilterPriv
+class LocalContrastFilter::Private
{
public:
- LocalContrastFilterPriv()
+ Private()
{
current_process_power_value = 20.0;
}
@@ -61,14 +61,14 @@ public:
LocalContrastFilter::LocalContrastFilter(QObject* parent)
: DImgThreadedFilter(parent),
- d(new LocalContrastFilterPriv)
+ d(new Private)
{
initFilter();
}
LocalContrastFilter::LocalContrastFilter(DImg* image, QObject* parent, const \
LocalContrastContainer& par) : DImgThreadedFilter(image, parent, "LocalContrast"),
- d(new LocalContrastFilterPriv)
+ d(new Private)
{
d->par = par;
d->generator.seedByTime();
@@ -105,7 +105,7 @@ void LocalContrastFilter::filterImage()
postProgress(10);
- process_16bit_rgb_image(data.data(), m_orgImage.width(), \
m_orgImage.height()); + process16bitRgbImage(data.data(), \
m_orgImage.width(), m_orgImage.height());
for (uint x = 0; runningFlag() && (x < m_orgImage.width()); ++x)
{
@@ -133,7 +133,7 @@ void LocalContrastFilter::filterImage()
postProgress(10);
- process_8bit_rgb_image(data.data(), m_orgImage.width(), \
m_orgImage.height()); + process8bitRgbImage(data.data(), \
m_orgImage.width(), m_orgImage.height());
for (uint x = 0; runningFlag() && (x < m_orgImage.width()); ++x)
{
@@ -149,7 +149,7 @@ void LocalContrastFilter::filterImage()
postProgress(100);
}
-void LocalContrastFilter::process_8bit_rgb_image(unsigned char* img, int sizex, int \
sizey) +void LocalContrastFilter::process8bitRgbImage(unsigned char* const img, int \
sizex, int sizey) {
int size = sizex * sizey;
QScopedArrayPointer<float> tmpimage(new float[size * 3]);
@@ -160,7 +160,7 @@ void LocalContrastFilter::process_8bit_rgb_image(unsigned char* \
img, int sizex, tmpimage[i] = (float)(img[i] / 255.0);
}
- process_rgb_image(tmpimage.data(), sizex, sizey);
+ processRgbImage(tmpimage.data(), sizex, sizey);
// convert back to 8 bits (with dithering)
int pos = 0;
@@ -177,7 +177,7 @@ void LocalContrastFilter::process_8bit_rgb_image(unsigned char* \
img, int sizex, postProgress(90);
}
-void LocalContrastFilter::process_16bit_rgb_image(unsigned short int* img, int \
sizex, int sizey) +void LocalContrastFilter::process16bitRgbImage(unsigned short int* \
const img, int sizex, int sizey) {
int size = sizex * sizey;
QScopedArrayPointer<float> tmpimage(new float[size * 3]);
@@ -188,7 +188,7 @@ void LocalContrastFilter::process_16bit_rgb_image(unsigned short \
int* img, int s tmpimage[i] = (float)(img[i] / 65535.0);
}
- process_rgb_image(tmpimage.data(), sizex, sizey);
+ processRgbImage(tmpimage.data(), sizex, sizey);
// convert back to 16 bits (with dithering)
int pos = 0;
@@ -210,9 +210,9 @@ float LocalContrastFilter::func(float x1, float x2)
float result = 0.5;
float p;
- /*
+/*
//test function
- if (d->par.function_id==1)
+ if (d->par.functionId==1)
{
p=qPow(0.1,qFabs((x2*2.0-1.0))*d->current_process_power_value*0.02);
if (x2<0.5) result=qPow(x1,p);
@@ -220,7 +220,7 @@ float LocalContrastFilter::func(float x1, float x2)
return result;
};
//test function
- if (function_id==1)
+ if (functionId==1)
{
p=d->current_process_power_value*0.3+1e-4;
x2=1.0/(1.0+qExp(-(x2*2.0-1.0)*p*0.5));
@@ -230,9 +230,9 @@ float LocalContrastFilter::func(float x1, float x2)
result=(f-m0)/(m1-m0);
return result;
};
- */
+*/
- switch (d->par.function_id)
+ switch (d->par.functionId)
{
case 0: //power function
{
@@ -261,7 +261,7 @@ float LocalContrastFilter::func(float x1, float x2)
return result;
}
-void LocalContrastFilter::process_rgb_image(float* img, int sizex, int sizey)
+void LocalContrastFilter::processRgbImage(float* const img, int sizex, int sizey)
{
int size = sizex * sizey;
QScopedArrayPointer<float> blurimage(new float[size]);
@@ -272,9 +272,9 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey) srcimg[i] = img[i];
}
- if (d->par.stretch_contrast)
+ if (d->par.stretchContrast)
{
- stretch_contrast(img, size * 3);
+ stretchContrast(img, size * 3);
}
int pos = 0;
@@ -293,11 +293,11 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey) pos += 3;
}
- d->current_process_power_value = d->par.get_power(nstage);
+ d->current_process_power_value = d->par.getPower(nstage);
// blur
- inplace_blur(blurimage.data(), sizex, sizey, d->par.get_blur(nstage));
+ inplaceBlur(blurimage.data(), sizex, sizey, d->par.getBlur(nstage));
pos = 0;
@@ -324,17 +324,17 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey) postProgress(30 + nstage * 10);
}
- int high_saturation_value = 100 - d->par.high_saturation;
- int low_saturation_value = 100 - d->par.low_saturation;
+ int highSaturationValue = 100 - d->par.highSaturation;
+ int lowSaturationValue = 100 - d->par.lowSaturation;
- if ((d->par.high_saturation != 100) || (d->par.low_saturation != 100))
+ if ((d->par.highSaturation != 100) || (d->par.lowSaturation != 100))
{
- kDebug() << "high_saturation : " << d->par.high_saturation;
- kDebug() << "low_saturation : " << d->par.low_saturation;
+ kDebug() << "highSaturation : " << d->par.highSaturation;
+ kDebug() << "lowSaturation : " << d->par.lowSaturation;
float src_h, src_s, src_v;
float dest_h, dest_s, dest_v;
- float dest_saturation, s1;
+ float destSaturation, s1;
int pos = 0;
for (int i = 0 ; runningFlag() && (i < size) ; ++i)
@@ -342,15 +342,15 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey)
rgb2hsv(srcimg[pos], srcimg[pos + 1], srcimg[pos + 2], src_h, src_s, \
src_v);
rgb2hsv(img[pos], img[pos + 1], img[pos + 2], dest_h, dest_s, dest_v);
- dest_saturation = (float)((src_s * high_saturation_value + dest_s * \
(100.0 - high_saturation_value)) * 0.01); + destSaturation = \
(float)((src_s * highSaturationValue + dest_s * (100.0 - highSaturationValue)) * \
0.01);
if (dest_v > src_v)
{
- s1 = (float)(dest_saturation * src_v / (dest_v + 1.0 / \
255.0));
- dest_saturation = (float)((low_saturation_value * s1 + \
d->par.low_saturation * dest_saturation) * 0.01); + s1 = \
(float)(destSaturation * src_v / (dest_v + 1.0 / 255.0)); + \
destSaturation = (float)((lowSaturationValue * s1 + d->par.lowSaturation * \
destSaturation) * 0.01); }
- hsv2rgb(dest_h, dest_saturation, dest_v, img[pos], img[pos + 1], img[pos \
+ 2]); + hsv2rgb(dest_h, destSaturation, dest_v, img[pos], img[pos + 1], \
img[pos + 2]);
pos += 3;
}
@@ -360,7 +360,7 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey)
// Unsharp Mask filter
- if (d->par.unsharp_mask.enabled)
+ if (d->par.unsharpMask.enabled)
{
QScopedArrayPointer<float> val(new float[size]);
@@ -375,12 +375,12 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey) pos += 3;
}
- float blur_value = d->par.get_unsharp_mask_blur();
- inplace_blur(blurimage.data(), sizex, sizey, blur_value);
+ float blur_value = d->par.getUnsharpMaskBlur();
+ inplaceBlur(blurimage.data(), sizex, sizey, blur_value);
pos = 0;
- float pw = (float)(2.5 * d->par.get_unsharp_mask_power());
- float threshold = (float)(d->par.unsharp_mask.threshold * pw / 250.0);
+ float pw = (float)(2.5 * d->par.getUnsharpMaskPower());
+ float threshold = (float)(d->par.unsharpMask.threshold * pw / 250.0);
float threshold2 = threshold / 2;
for (int i = 0 ; runningFlag() && (i < size) ; ++i)
@@ -451,7 +451,7 @@ void LocalContrastFilter::process_rgb_image(float* img, int \
sizex, int sizey) postProgress(80);
}
-void LocalContrastFilter::inplace_blur(float* data, int sizex, int sizey, float \
blur) +void LocalContrastFilter::inplaceBlur(float* const data, int sizex, int sizey, \
float blur) {
if (blur < 0.3)
{
@@ -517,7 +517,7 @@ void LocalContrastFilter::inplace_blur(float* data, int sizex, \
int sizey, float }
}
-void LocalContrastFilter::stretch_contrast(float* data, int datasize)
+void LocalContrastFilter::stretchContrast(float* const data, int datasize)
{
//stretch the contrast
const unsigned int histogram_size = 256;
@@ -705,10 +705,10 @@ FilterAction LocalContrastFilter::filterAction()
FilterAction action(FilterIdentifier(), CurrentVersion());
action.setDisplayableName(DisplayableName());
- action.addParameter("function_id", d->par.function_id);
- action.addParameter("high_saturation", d->par.high_saturation);
- action.addParameter("low_saturation", d->par.low_saturation);
- action.addParameter("stretch_contrast", d->par.stretch_contrast);
+ action.addParameter("functionId", d->par.functionId);
+ action.addParameter("highSaturation", d->par.highSaturation);
+ action.addParameter("lowSaturation", d->par.lowSaturation);
+ action.addParameter("stretchContrast", d->par.stretchContrast);
for (int nstage = 0 ; nstage < TONEMAPPING_MAX_STAGES ; ++nstage)
{
@@ -722,13 +722,13 @@ FilterAction LocalContrastFilter::filterAction()
}
}
- action.addParameter("unsharp_mask:enabled", d->par.unsharp_mask.enabled);
+ action.addParameter("unsharpMask:enabled", d->par.unsharpMask.enabled);
- if (d->par.unsharp_mask.enabled)
+ if (d->par.unsharpMask.enabled)
{
- action.addParameter("unsharp_mask:blur", d->par.unsharp_mask.blur);
- action.addParameter("unsharp_mask:power", d->par.unsharp_mask.power);
- action.addParameter("unsharp_mask:threshold", \
d->par.unsharp_mask.threshold); + action.addParameter("unsharpMask:blur", \
d->par.unsharpMask.blur); + action.addParameter("unsharpMask:power", \
d->par.unsharpMask.power); + action.addParameter("unsharpMask:threshold", \
d->par.unsharpMask.threshold); }
action.addParameter("randomSeed", d->generator.currentSeed());
@@ -738,10 +738,10 @@ FilterAction LocalContrastFilter::filterAction()
void LocalContrastFilter::readParameters(const FilterAction& action)
{
- d->par.function_id = action.parameter("function_id").toInt();
- d->par.high_saturation = action.parameter("high_saturation").toInt();
- d->par.low_saturation = action.parameter("low_saturation").toInt();
- d->par.stretch_contrast = action.parameter("stretch_contrast").toBool();
+ d->par.functionId = action.parameter("functionId").toInt();
+ d->par.highSaturation = action.parameter("highSaturation").toInt();
+ d->par.lowSaturation = action.parameter("lowSaturation").toInt();
+ d->par.stretchContrast = action.parameter("stretchContrast").toBool();
for (int nstage = 0 ; nstage < TONEMAPPING_MAX_STAGES ; ++nstage)
{
@@ -755,13 +755,13 @@ void LocalContrastFilter::readParameters(const FilterAction& \
action) }
}
- d->par.unsharp_mask.enabled = action.parameter("unsharp_mask:enabled").toBool();
+ d->par.unsharpMask.enabled = action.parameter("unsharpMask:enabled").toBool();
- if (d->par.unsharp_mask.enabled)
+ if (d->par.unsharpMask.enabled)
{
- d->par.unsharp_mask.blur = \
action.parameter("unsharp_mask:blur").toFloat();
- d->par.unsharp_mask.power = \
action.parameter("unsharp_mask:power").toFloat();
- d->par.unsharp_mask.threshold = \
action.parameter("unsharp_mask:threshold").toInt(); + d->par.unsharpMask.blur \
= action.parameter("unsharpMask:blur").toFloat(); + d->par.unsharpMask.power \
= action.parameter("unsharpMask:power").toFloat(); + \
d->par.unsharpMask.threshold = action.parameter("unsharpMask:threshold").toInt(); }
d->generator.seed(action.parameter("randomSeed").toUInt());
diff --git a/libs/dimg/filters/lc/localcontrastfilter.h \
b/libs/dimg/filters/lc/localcontrastfilter.h index a7b95a1..3add9e4 100644
--- a/libs/dimg/filters/lc/localcontrastfilter.h
+++ b/libs/dimg/filters/lc/localcontrastfilter.h
@@ -85,22 +85,22 @@ private:
void filterImage();
- void process_rgb_image(float* img, int sizex, int sizey);
- void process_8bit_rgb_image(unsigned char* img, int sizex, int sizey);
- void process_16bit_rgb_image(unsigned short int* img, int sizex, int sizey);
+ void processRgbImage(float* const img, int sizex, int sizey);
+ void process8bitRgbImage(unsigned char* const img, int sizex, int sizey);
+ void process16bitRgbImage(unsigned short int* const img, int sizex, int sizey);
float func(float x1, float x2);
- void inplace_blur(float* data, int sizex, int sizey, float blur);
- void stretch_contrast(float* data, int datasize);
+ void inplaceBlur(float* const data, int sizex, int sizey, float blur);
+ void stretchContrast(float* const data, int datasize);
inline void rgb2hsv(const float& r, const float& g, const float& b, float& h, \
float& s, float& v);
inline void hsv2rgb(const float& h, const float& s, const float& v, float& r, \
float& g, float& b);
private:
- class LocalContrastFilterPriv;
- LocalContrastFilterPriv* const d;
+ class Private;
+ Private* const d;
};
} // namespace Digikam
diff --git a/libs/dimg/filters/lc/localcontrastsettings.cpp \
b/libs/dimg/filters/lc/localcontrastsettings.cpp index b240243..1cc111b 100644
--- a/libs/dimg/filters/lc/localcontrastsettings.cpp
+++ b/libs/dimg/filters/lc/localcontrastsettings.cpp
@@ -7,7 +7,7 @@
* Description : Local Contrast settings view.
* LDR ToneMapper \
<http://zynaddsubfx.sourceforge.net/other/tonemapping>
*
- * Copyright (C) 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -67,12 +67,12 @@ using namespace KDcrawIface;
namespace Digikam
{
-class LocalContrastSettingsPriv
+class LocalContrastSettings::Private
{
public:
- LocalContrastSettingsPriv() :
+ Private() :
stretchContrastCheck(0),
label4(0),
label5(0),
@@ -141,28 +141,29 @@ public:
RExpanderBox* expanderBox;
};
-const QString LocalContrastSettingsPriv::configLowSaturationEntry("LowSaturation");
-const QString LocalContrastSettingsPriv::configHighSaturationEntry("HighSaturation");
-const QString LocalContrastSettingsPriv::configPower1Entry("Power1");
-const QString LocalContrastSettingsPriv::configBlur1Entry("Blur1");
-const QString LocalContrastSettingsPriv::configPower2Entry("Power2");
-const QString LocalContrastSettingsPriv::configBlur2Entry("Blur2");
-const QString LocalContrastSettingsPriv::configPower3Entry("Power3");
-const QString LocalContrastSettingsPriv::configBlur3Entry("Blur3");
-const QString LocalContrastSettingsPriv::configPower4Entry("Power4");
-const QString LocalContrastSettingsPriv::configBlur4Entry("Blur4");
-const QString LocalContrastSettingsPriv::configStretchContrastEntry("StretchContrast");
-const QString LocalContrastSettingsPriv::configStageOneEntry("StageOne");
-const QString LocalContrastSettingsPriv::configStageTwoEntry("StageTwo");
-const QString LocalContrastSettingsPriv::configStageThreeEntry("StageThree");
-const QString LocalContrastSettingsPriv::configStageFourEntry("StageFour");
-const QString LocalContrastSettingsPriv::configFunctionInputEntry("FunctionInput");
+
+const QString LocalContrastSettings::Private::configLowSaturationEntry("LowSaturation");
+const QString LocalContrastSettings::Private::configHighSaturationEntry("HighSaturation");
+const QString LocalContrastSettings::Private::configPower1Entry("Power1");
+const QString LocalContrastSettings::Private::configBlur1Entry("Blur1");
+const QString LocalContrastSettings::Private::configPower2Entry("Power2");
+const QString LocalContrastSettings::Private::configBlur2Entry("Blur2");
+const QString LocalContrastSettings::Private::configPower3Entry("Power3");
+const QString LocalContrastSettings::Private::configBlur3Entry("Blur3");
+const QString LocalContrastSettings::Private::configPower4Entry("Power4");
+const QString LocalContrastSettings::Private::configBlur4Entry("Blur4");
+const QString LocalContrastSettings::Private::configStretchContrastEntry("StretchContrast");
+const QString LocalContrastSettings::Private::configStageOneEntry("StageOne");
+const QString LocalContrastSettings::Private::configStageTwoEntry("StageTwo");
+const QString LocalContrastSettings::Private::configStageThreeEntry("StageThree");
+const QString LocalContrastSettings::Private::configStageFourEntry("StageFour");
+const QString LocalContrastSettings::Private::configFunctionInputEntry("FunctionInput");
// --------------------------------------------------------
-LocalContrastSettings::LocalContrastSettings(QWidget* parent)
+LocalContrastSettings::LocalContrastSettings(QWidget* const parent)
: QWidget(parent),
- d(new LocalContrastSettingsPriv)
+ d(new Private)
{
QGridLayout* grid = new QGridLayout(parent);
@@ -467,10 +468,10 @@ LocalContrastContainer LocalContrastSettings::settings() const
{
LocalContrastContainer prm;
- prm.stretch_contrast = d->stretchContrastCheck->isChecked();
- prm.low_saturation = d->lowSaturationInput->value();
- prm.high_saturation = d->highSaturationInput->value();
- prm.function_id = d->functionInput->currentIndex();
+ prm.stretchContrast = d->stretchContrastCheck->isChecked();
+ prm.lowSaturation = d->lowSaturationInput->value();
+ prm.highSaturation = d->highSaturationInput->value();
+ prm.functionId = d->functionInput->currentIndex();
prm.stage[0].enabled = d->expanderBox->isChecked(1);
prm.stage[0].power = d->powerInput1->value();
@@ -496,10 +497,10 @@ void LocalContrastSettings::setSettings(const \
LocalContrastContainer& settings) blockSignals(true);
d->expanderBox->setEnabled(false);
- d->stretchContrastCheck->setChecked(settings.stretch_contrast);
- d->lowSaturationInput->setValue(settings.low_saturation);
- d->highSaturationInput->setValue(settings.high_saturation);
- d->functionInput->setCurrentIndex(settings.function_id);
+ d->stretchContrastCheck->setChecked(settings.stretchContrast);
+ d->lowSaturationInput->setValue(settings.lowSaturation);
+ d->highSaturationInput->setValue(settings.highSaturation);
+ d->functionInput->setCurrentIndex(settings.functionId);
d->expanderBox->setChecked(1, settings.stage[0].enabled);
d->powerInput1->setValue(settings.stage[0].power);
@@ -517,12 +518,12 @@ void LocalContrastSettings::setSettings(const \
LocalContrastContainer& settings) d->powerInput4->setValue(settings.stage[3].power);
d->blurInput4->setValue(settings.stage[3].blur);
- /*
+/*
slotStage1Enabled(d->stageOne->isChecked());
slotStage2Enabled(d->stageTwo->isChecked());
slotStage3Enabled(d->stageThree->isChecked());
slotStage4Enabled(d->stageFour->isChecked());
- */
+*/
d->expanderBox->setEnabled(true);
blockSignals(false);
@@ -560,10 +561,10 @@ LocalContrastContainer LocalContrastSettings::defaultSettings() \
const {
LocalContrastContainer prm;
- prm.stretch_contrast = true;
- prm.low_saturation = d->lowSaturationInput->defaultValue();
- prm.high_saturation = d->highSaturationInput->defaultValue();
- prm.function_id = d->functionInput->defaultIndex();
+ prm.stretchContrast = true;
+ prm.lowSaturation = d->lowSaturationInput->defaultValue();
+ prm.highSaturation = d->highSaturationInput->defaultValue();
+ prm.functionId = d->functionInput->defaultIndex();
prm.stage[0].enabled = true;
prm.stage[0].power = d->powerInput1->defaultValue();
@@ -589,10 +590,10 @@ void LocalContrastSettings::readSettings(KConfigGroup& group)
LocalContrastContainer prm;
LocalContrastContainer defaultPrm = defaultSettings();
- prm.stretch_contrast = group.readEntry(d->configStretchContrastEntry, \
defaultPrm.stretch_contrast);
- prm.low_saturation = group.readEntry(d->configLowSaturationEntry, \
defaultPrm.low_saturation);
- prm.high_saturation = group.readEntry(d->configHighSaturationEntry, \
defaultPrm.high_saturation);
- prm.function_id = group.readEntry(d->configFunctionInputEntry, \
defaultPrm.function_id); + prm.stretchContrast = \
group.readEntry(d->configStretchContrastEntry, defaultPrm.stretchContrast); + \
prm.lowSaturation = group.readEntry(d->configLowSaturationEntry, \
defaultPrm.lowSaturation); + prm.highSaturation = \
group.readEntry(d->configHighSaturationEntry, defaultPrm.highSaturation); + \
prm.functionId = group.readEntry(d->configFunctionInputEntry, \
defaultPrm.functionId);
prm.stage[0].enabled = group.readEntry(d->configStageOneEntry, \
defaultPrm.stage[0].enabled);
prm.stage[0].power = group.readEntry(d->configPower1Entry, \
defaultPrm.stage[0].power); @@ -625,10 +626,10 @@ void \
LocalContrastSettings::writeSettings(KConfigGroup& group) {
LocalContrastContainer prm = settings();
- group.writeEntry(d->configStretchContrastEntry, prm.stretch_contrast);
- group.writeEntry(d->configLowSaturationEntry, prm.low_saturation);
- group.writeEntry(d->configHighSaturationEntry, prm.high_saturation);
- group.writeEntry(d->configFunctionInputEntry, prm.function_id);
+ group.writeEntry(d->configStretchContrastEntry, prm.stretchContrast);
+ group.writeEntry(d->configLowSaturationEntry, prm.lowSaturation);
+ group.writeEntry(d->configHighSaturationEntry, prm.highSaturation);
+ group.writeEntry(d->configFunctionInputEntry, prm.functionId);
group.writeEntry(d->configStageOneEntry, prm.stage[0].enabled);
group.writeEntry(d->configPower1Entry, prm.stage[0].power);
diff --git a/libs/dimg/filters/lc/localcontrastsettings.h \
b/libs/dimg/filters/lc/localcontrastsettings.h index fa68ad4..5db18c1 100644
--- a/libs/dimg/filters/lc/localcontrastsettings.h
+++ b/libs/dimg/filters/lc/localcontrastsettings.h
@@ -7,7 +7,7 @@
* Description : Local Contrast settings view.
* LDR ToneMapper \
<http://zynaddsubfx.sourceforge.net/other/tonemapping>
*
- * Copyright (C) 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -41,15 +41,13 @@
namespace Digikam
{
-class LocalContrastSettingsPriv;
-
class DIGIKAM_EXPORT LocalContrastSettings : public QWidget
{
Q_OBJECT
public:
- explicit LocalContrastSettings(QWidget* parent);
+ explicit LocalContrastSettings(QWidget* const parent);
~LocalContrastSettings();
LocalContrastContainer defaultSettings() const;
@@ -74,7 +72,8 @@ private Q_SLOTS:
private:
- LocalContrastSettingsPriv* const d;
+ class Private;
+ Private* const d;
};
} // namespace Digikam
diff --git a/utilities/queuemanager/basetools/enhance/localcontrast.cpp \
b/utilities/queuemanager/basetools/enhance/localcontrast.cpp index 9897b1d..70f9a03 \
100644
--- a/utilities/queuemanager/basetools/enhance/localcontrast.cpp
+++ b/utilities/queuemanager/basetools/enhance/localcontrast.cpp
@@ -72,26 +72,26 @@ BatchToolSettings LocalContrast::defaultSettings()
BatchToolSettings prm;
LocalContrastContainer defaultPrm = m_settingsView->defaultSettings();
- prm.insert("stretch_contrast", defaultPrm.stretch_contrast);
- prm.insert("low_saturation", defaultPrm.low_saturation);
- prm.insert("high_saturation", defaultPrm.high_saturation);
- prm.insert("function_id", defaultPrm.function_id);
+ prm.insert("stretchContrast", defaultPrm.stretchContrast);
+ prm.insert("lowSaturation", defaultPrm.lowSaturation);
+ prm.insert("highSaturation", defaultPrm.highSaturation);
+ prm.insert("functionId", defaultPrm.functionId);
- prm.insert("stage1_enabled", defaultPrm.stage[0].enabled);
- prm.insert("stage1_power", defaultPrm.stage[0].power);
- prm.insert("stage1_blur", defaultPrm.stage[0].blur);
+ prm.insert("stage1Enabled", defaultPrm.stage[0].enabled);
+ prm.insert("stage1Power", defaultPrm.stage[0].power);
+ prm.insert("stage1Blur", defaultPrm.stage[0].blur);
- prm.insert("stage2_enabled", defaultPrm.stage[1].enabled);
- prm.insert("stage2_power", defaultPrm.stage[1].power);
- prm.insert("stage2_blur", defaultPrm.stage[1].blur);
+ prm.insert("stage2Enabled", defaultPrm.stage[1].enabled);
+ prm.insert("stage2Power", defaultPrm.stage[1].power);
+ prm.insert("stage2Blur", defaultPrm.stage[1].blur);
- prm.insert("stage3_enabled", defaultPrm.stage[2].enabled);
- prm.insert("stage3_power", defaultPrm.stage[2].power);
- prm.insert("stage3_blur", defaultPrm.stage[2].blur);
+ prm.insert("stage3Enabled", defaultPrm.stage[2].enabled);
+ prm.insert("stage3Power", defaultPrm.stage[2].power);
+ prm.insert("stage3Blur", defaultPrm.stage[2].blur);
- prm.insert("stage4_enabled", defaultPrm.stage[3].enabled);
- prm.insert("stage4_power", defaultPrm.stage[3].power);
- prm.insert("stage4_blur", defaultPrm.stage[3].blur);
+ prm.insert("stage4Enabled", defaultPrm.stage[3].enabled);
+ prm.insert("stage4Power", defaultPrm.stage[3].power);
+ prm.insert("stage4Blur", defaultPrm.stage[3].blur);
return prm;
}
@@ -100,26 +100,26 @@ void LocalContrast::slotAssignSettings2Widget()
{
LocalContrastContainer prm;
- prm.stretch_contrast = settings()["stretch_contrast"].toBool();
- prm.low_saturation = settings()["low_saturation"].toInt();
- prm.high_saturation = settings()["high_saturation"].toInt();
- prm.function_id = settings()["function_id"].toInt();
+ prm.stretchContrast = settings()["stretchContrast"].toBool();
+ prm.lowSaturation = settings()["lowSaturation"].toInt();
+ prm.highSaturation = settings()["highSaturation"].toInt();
+ prm.functionId = settings()["functionId"].toInt();
- prm.stage[0].enabled = settings()["stage1_enabled"].toBool();
- prm.stage[0].power = settings()["stage1_power"].toDouble();
- prm.stage[0].blur = settings()["stage1_blur"].toDouble();
+ prm.stage[0].enabled = settings()["stage1Enabled"].toBool();
+ prm.stage[0].power = settings()["stage1Power"].toDouble();
+ prm.stage[0].blur = settings()["stage1Blur"].toDouble();
- prm.stage[1].enabled = settings()["stage2_enabled"].toBool();
- prm.stage[1].power = settings()["stage2_power"].toDouble();
- prm.stage[1].blur = settings()["stage2_blur"].toDouble();
+ prm.stage[1].enabled = settings()["stage2Enabled"].toBool();
+ prm.stage[1].power = settings()["stage2Power"].toDouble();
+ prm.stage[1].blur = settings()["stage2Blur"].toDouble();
- prm.stage[2].enabled = settings()["stage3_enabled"].toBool();
- prm.stage[2].power = settings()["stage3_power"].toDouble();
- prm.stage[2].blur = settings()["stage3_blur"].toDouble();
+ prm.stage[2].enabled = settings()["stage3Enabled"].toBool();
+ prm.stage[2].power = settings()["stage3Power"].toDouble();
+ prm.stage[2].blur = settings()["stage3Blur"].toDouble();
- prm.stage[3].enabled = settings()["stage4_enabled"].toBool();
- prm.stage[3].power = settings()["stage4_power"].toDouble();
- prm.stage[3].blur = settings()["stage4_blur"].toDouble();
+ prm.stage[3].enabled = settings()["stage4Enabled"].toBool();
+ prm.stage[3].power = settings()["stage4Power"].toDouble();
+ prm.stage[3].blur = settings()["stage4Blur"].toDouble();
m_settingsView->setSettings(prm);
}
@@ -129,26 +129,26 @@ void LocalContrast::slotSettingsChanged()
BatchToolSettings prm;
LocalContrastContainer currentPrm = m_settingsView->settings();
- prm.insert("stretch_contrast", currentPrm.stretch_contrast);
- prm.insert("low_saturation", currentPrm.low_saturation);
- prm.insert("high_saturation", currentPrm.high_saturation);
- prm.insert("function_id", currentPrm.function_id);
+ prm.insert("stretchContrast", currentPrm.stretchContrast);
+ prm.insert("lowSaturation", currentPrm.lowSaturation);
+ prm.insert("highSaturation", currentPrm.highSaturation);
+ prm.insert("functionId", currentPrm.functionId);
- prm.insert("stage1_enabled", currentPrm.stage[0].enabled);
- prm.insert("stage1_power", currentPrm.stage[0].power);
- prm.insert("stage1_blur", currentPrm.stage[0].blur);
+ prm.insert("stage1Enabled", currentPrm.stage[0].enabled);
+ prm.insert("stage1Power", currentPrm.stage[0].power);
+ prm.insert("stage1Blur", currentPrm.stage[0].blur);
- prm.insert("stage2_enabled", currentPrm.stage[1].enabled);
- prm.insert("stage2_power", currentPrm.stage[1].power);
- prm.insert("stage2_blur", currentPrm.stage[1].blur);
+ prm.insert("stage2Enabled", currentPrm.stage[1].enabled);
+ prm.insert("stage2Power", currentPrm.stage[1].power);
+ prm.insert("stage2Blur", currentPrm.stage[1].blur);
- prm.insert("stage3_enabled", currentPrm.stage[2].enabled);
- prm.insert("stage3_power", currentPrm.stage[2].power);
- prm.insert("stage3_blur", currentPrm.stage[2].blur);
+ prm.insert("stage3Enabled", currentPrm.stage[2].enabled);
+ prm.insert("stage3Power", currentPrm.stage[2].power);
+ prm.insert("stage3Blur", currentPrm.stage[2].blur);
- prm.insert("stage4_enabled", currentPrm.stage[3].enabled);
- prm.insert("stage4_power", currentPrm.stage[3].power);
- prm.insert("stage4_blur", currentPrm.stage[3].blur);
+ prm.insert("stage4Enabled", currentPrm.stage[3].enabled);
+ prm.insert("stage4Power", currentPrm.stage[3].power);
+ prm.insert("stage4Blur", currentPrm.stage[3].blur);
BatchTool::slotSettingsChanged(prm);
}
@@ -162,26 +162,26 @@ bool LocalContrast::toolOperations()
LocalContrastContainer prm;
- prm.stretch_contrast = settings()["stretch_contrast"].toBool();
- prm.low_saturation = settings()["low_saturation"].toInt();
- prm.high_saturation = settings()["high_saturation"].toInt();
- prm.function_id = settings()["function_id"].toInt();
+ prm.stretchContrast = settings()["stretchContrast"].toBool();
+ prm.lowSaturation = settings()["lowSaturation"].toInt();
+ prm.highSaturation = settings()["highSaturation"].toInt();
+ prm.functionId = settings()["functionId"].toInt();
- prm.stage[0].enabled = settings()["stage1_enabled"].toBool();
- prm.stage[0].power = settings()["stage1_power"].toDouble();
- prm.stage[0].blur = settings()["stage1_blur"].toDouble();
+ prm.stage[0].enabled = settings()["stage1Enabled"].toBool();
+ prm.stage[0].power = settings()["stage1Power"].toDouble();
+ prm.stage[0].blur = settings()["stage1Blur"].toDouble();
- prm.stage[1].enabled = settings()["stage2_enabled"].toBool();
- prm.stage[1].power = settings()["stage2_power"].toDouble();
- prm.stage[1].blur = settings()["stage2_blur"].toDouble();
+ prm.stage[1].enabled = settings()["stage2Enabled"].toBool();
+ prm.stage[1].power = settings()["stage2Power"].toDouble();
+ prm.stage[1].blur = settings()["stage2Blur"].toDouble();
- prm.stage[2].enabled = settings()["stage3_enabled"].toBool();
- prm.stage[2].power = settings()["stage3_power"].toDouble();
- prm.stage[2].blur = settings()["stage3_blur"].toDouble();
+ prm.stage[2].enabled = settings()["stage3Enabled"].toBool();
+ prm.stage[2].power = settings()["stage3Power"].toDouble();
+ prm.stage[2].blur = settings()["stage3Blur"].toDouble();
- prm.stage[3].enabled = settings()["stage4_enabled"].toBool();
- prm.stage[3].power = settings()["stage4_power"].toDouble();
- prm.stage[3].blur = settings()["stage4_blur"].toDouble();
+ prm.stage[3].enabled = settings()["stage4Enabled"].toBool();
+ prm.stage[3].power = settings()["stage4Power"].toDouble();
+ prm.stage[3].blur = settings()["stage4Blur"].toDouble();
LocalContrastFilter lc(&image(), 0L, prm);
applyFilter(&lc);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic