[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-11-16 11:14:17
Message-ID: 20121116111417.98AF0A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 981dad3a370bab3a22a6ea9c8e0e2f68d0a857f2 by Gilles Caulier.
Committed on 16/11/2012 at 12:14.
Pushed by cgilles into branch 'master'.
polish
M +2 -1 imageplugins/filters/colorfxtool.cpp
M +1 -1 imageplugins/filters/colorfxtool.h
M +6 -6 libs/dimg/filters/fx/colorfxfilter.cpp
M +24 -19 libs/dimg/filters/fx/colorfxfilter.h
M +12 -11 libs/dimg/filters/fx/colorfxsettings.cpp
M +4 -4 libs/dimg/filters/fx/colorfxsettings.h
M +7 -6 utilities/queuemanager/basetools/filters/colorfx.cpp
M +2 -3 utilities/queuemanager/basetools/filters/colorfx.h
M +1 -2 utilities/queuemanager/manager/batchtoolsmanager.cpp
http://commits.kde.org/digikam/981dad3a370bab3a22a6ea9c8e0e2f68d0a857f2
diff --git a/imageplugins/filters/colorfxtool.cpp b/imageplugins/filters/colorfxtool.cpp
index 8f2758e..0732570 100644
--- a/imageplugins/filters/colorfxtool.cpp
+++ b/imageplugins/filters/colorfxtool.cpp
@@ -80,7 +80,8 @@ public:
previewWidget(0),
gboxSettings(0),
settingsView(0)
- {}
+ {
+ }
static const QString configGroupName;
static const QString configHistogramChannelEntry;
diff --git a/imageplugins/filters/colorfxtool.h b/imageplugins/filters/colorfxtool.h
index 768425b..21298ea 100644
--- a/imageplugins/filters/colorfxtool.h
+++ b/imageplugins/filters/colorfxtool.h
@@ -34,7 +34,7 @@ using namespace Digikam;
namespace Digikam
{
-class DColor;
+ class DColor;
}
namespace DigikamFxFiltersImagePlugin
diff --git a/libs/dimg/filters/fx/colorfxfilter.cpp b/libs/dimg/filters/fx/colorfxfilter.cpp
index 29d50ca..8e96959 100644
--- a/libs/dimg/filters/fx/colorfxfilter.cpp
+++ b/libs/dimg/filters/fx/colorfxfilter.cpp
@@ -74,7 +74,7 @@ void ColorFXFilter::filterImage()
}
}
-void ColorFXFilter::solarize(DImg* orgImage, DImg* destImage, int factor)
+void ColorFXFilter::solarize(DImg* const orgImage, DImg* const destImage, int factor)
{
bool stretch = true;
@@ -182,7 +182,7 @@ void ColorFXFilter::solarize(DImg* orgImage, DImg* destImage, int factor)
}
}
-void ColorFXFilter::vivid(DImg* orgImage, DImg* destImage, int factor)
+void ColorFXFilter::vivid(DImg* const orgImage, DImg* const destImage, int factor)
{
float amount = factor / 100.0;
@@ -240,7 +240,7 @@ void ColorFXFilter::vivid(DImg* orgImage, DImg* destImage, int factor)
* like this on PSC. Is very similar to Growing Edges (photoshop)
* Some pictures will be very interesting
*/
-void ColorFXFilter::neon(DImg* orgImage, DImg* destImage, int Intensity, int BW)
+void ColorFXFilter::neon(DImg* const orgImage, DImg* const destImage, int Intensity, int BW)
{
neonFindEdges(orgImage, destImage, true, Intensity, BW);
}
@@ -257,7 +257,7 @@ void ColorFXFilter::neon(DImg* orgImage, DImg* destImage, int Intensity, int BW)
* Neon effect ? This is the same engine, but is inversed with
* 255 - color.
*/
-void ColorFXFilter::findEdges(DImg* orgImage, DImg* destImage, int Intensity, int BW)
+void ColorFXFilter::findEdges(DImg* const orgImage, DImg* const destImage, int Intensity, int BW)
{
neonFindEdges(orgImage, destImage, false, Intensity, BW);
}
@@ -280,7 +280,7 @@ static inline int Lim_Max(int Now, int Up, int Max)
}
// Implementation of neon and FindEdges. They share 99% of their code.
-void ColorFXFilter::neonFindEdges(DImg* orgImage, DImg* destImage, bool neon, int Intensity, int BW)
+void ColorFXFilter::neonFindEdges(DImg* const orgImage, DImg* const destImage, bool neon, int Intensity, \
int BW) {
int Width = orgImage->width();
int Height = orgImage->height();
@@ -377,4 +377,4 @@ void ColorFXFilter::readParameters(const FilterAction& action)
m_settings.level = action.parameter("level").toInt();
}
-} // namespace DigikamFxFiltersImagePlugin
+} // namespace Digikam
diff --git a/libs/dimg/filters/fx/colorfxfilter.h b/libs/dimg/filters/fx/colorfxfilter.h
index f99abd9..5719da8 100644
--- a/libs/dimg/filters/fx/colorfxfilter.h
+++ b/libs/dimg/filters/fx/colorfxfilter.h
@@ -48,11 +48,13 @@ public:
ColorFXContainer()
{
colorFXType = 0; // ColorFXFilter::Solarize
- level = 0;
- iterations = 2;
+ level = 0;
+ iterations = 2;
};
- ~ColorFXContainer() {};
+ ~ColorFXContainer()
+ {
+ };
public:
@@ -61,16 +63,29 @@ public:
int iterations;
};
+// ----------------------------------------------------------------------------------------------
class DIGIKAM_EXPORT ColorFXFilter : public DImgThreadedFilter
{
public:
+ enum ColorFXFilterTypes
+ {
+ Solarize = 0,
+ Vivid,
+ Neon,
+ FindEdges
+ };
+
+public:
+
explicit ColorFXFilter(QObject* const parent = 0);
explicit ColorFXFilter(DImg* const orgImage, QObject* const parent, const ColorFXContainer& \
settings=ColorFXContainer());
- ~ColorFXFilter() {};
+ ~ColorFXFilter()
+ {
+ };
static QString FilterIdentifier()
{
@@ -101,25 +116,15 @@ public:
void readParameters(const FilterAction& action);
-public:
-
- enum ColorFXFilterTypes
- {
- Solarize = 0,
- Vivid,
- Neon,
- FindEdges
- };
-
private:
void filterImage();
- void solarize(DImg* orgImage, DImg* destImage, int factor);
- void vivid(DImg* orgImage, DImg* destImage, int factor);
- void neon(DImg* orgImage, DImg* destImage, int Intensity, int BW);
- void findEdges(DImg* orgImage, DImg* destImage, int Intensity, int BW);
- void neonFindEdges(DImg* orgImage, DImg* destImage, bool neon, int Intensity, int BW);
+ void solarize(DImg* const orgImage, DImg* const destImage, int factor);
+ void vivid(DImg* const orgImage, DImg* const destImage, int factor);
+ void neon(DImg* const orgImage, DImg* const destImage, int Intensity, int BW);
+ void findEdges(DImg* const orgImage, DImg* const destImage, int Intensity, int BW);
+ void neonFindEdges(DImg* const orgImage, DImg* const destImage, bool neon, int Intensity, int BW);
private:
diff --git a/libs/dimg/filters/fx/colorfxsettings.cpp b/libs/dimg/filters/fx/colorfxsettings.cpp
index e66acf0..ccec570 100644
--- a/libs/dimg/filters/fx/colorfxsettings.cpp
+++ b/libs/dimg/filters/fx/colorfxsettings.cpp
@@ -6,7 +6,7 @@
* Date : 2012-11-08
* Description : Color effects settings view.
*
- * Copyright (C) 2012 by Alexander Dymo <adymo@kdevelop.org>
+ * Copyright (C) 2012 by Alexander Dymo <adymo at kdevelop dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -20,6 +20,7 @@
* GNU General Public License for more details.
*
* ============================================================ */
+
#include "colorfxsettings.moc"
// Qt includes
@@ -38,11 +39,11 @@
namespace Digikam
{
-class ColorFXSettings::ColorFXSettingsPriv
+class ColorFXSettings::Private
{
public:
- ColorFXSettingsPriv() :
+ Private() :
effectTypeLabel(0),
levelLabel(0),
iterationLabel(0),
@@ -65,16 +66,16 @@ public:
RIntNumInput* iterationInput;
};
-const QString ColorFXSettings::ColorFXSettingsPriv::configEffectTypeEntry("EffectType");
-const QString ColorFXSettings::ColorFXSettingsPriv::configLevelAdjustmentEntry("LevelAdjustment");
-const QString ColorFXSettings::ColorFXSettingsPriv::configIterationAdjustmentEntry("IterationAdjustment");
+const QString ColorFXSettings::Private::configEffectTypeEntry("EffectType");
+const QString ColorFXSettings::Private::configLevelAdjustmentEntry("LevelAdjustment");
+const QString ColorFXSettings::Private::configIterationAdjustmentEntry("IterationAdjustment");
// --------------------------------------------------------
-ColorFXSettings::ColorFXSettings(QWidget* parent)
+ColorFXSettings::ColorFXSettings(QWidget* const parent)
: QWidget(parent),
- d(new ColorFXSettingsPriv)
+ d(new Private)
{
QGridLayout* grid = new QGridLayout(parent);
@@ -188,9 +189,9 @@ void ColorFXSettings::slotEffectTypeChanged(int type)
ColorFXContainer ColorFXSettings::settings() const
{
ColorFXContainer prm;
- prm.colorFXType = d->effectType->currentIndex();
- prm.level = d->levelInput->value();
- prm.iterations = d->iterationInput->value();
+ prm.colorFXType = d->effectType->currentIndex();
+ prm.level = d->levelInput->value();
+ prm.iterations = d->iterationInput->value();
return prm;
}
diff --git a/libs/dimg/filters/fx/colorfxsettings.h b/libs/dimg/filters/fx/colorfxsettings.h
index 1ccd06f..3d0b78d 100644
--- a/libs/dimg/filters/fx/colorfxsettings.h
+++ b/libs/dimg/filters/fx/colorfxsettings.h
@@ -6,7 +6,7 @@
* Date : 2012-11-08
* Description : Color effects settings view.
*
- * Copyright (C) 2012 by Alexander Dymo <adymo@kdevelop.org>
+ * Copyright (C) 2012 by Alexander Dymo <adymo at kdevelop dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -46,7 +46,7 @@ class DIGIKAM_EXPORT ColorFXSettings : public QWidget
public:
- explicit ColorFXSettings(QWidget* parent);
+ explicit ColorFXSettings(QWidget* const parent);
~ColorFXSettings();
ColorFXContainer defaultSettings() const;
@@ -72,8 +72,8 @@ private Q_SLOTS:
private:
- class ColorFXSettingsPriv;
- ColorFXSettingsPriv* const d;
+ class Private;
+ Private* const d;
};
} // namespace Digikam
diff --git a/utilities/queuemanager/basetools/filters/colorfx.cpp \
b/utilities/queuemanager/basetools/filters/colorfx.cpp index 72a3b35..4e9d2c4 100644
--- a/utilities/queuemanager/basetools/filters/colorfx.cpp
+++ b/utilities/queuemanager/basetools/filters/colorfx.cpp
@@ -6,7 +6,7 @@
* Date : 2012-11-08
* Description : a batch tool to apply color effects to images.
*
- * Copyright (C) 2012 by Alexander Dymo <adymo@develop.org>
+ * Copyright (C) 2012 by Alexander Dymo <adymo at develop dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -37,7 +37,7 @@
namespace Digikam
{
-ColorFX::ColorFX(QObject* parent)
+ColorFX::ColorFX(QObject* const parent)
: BatchTool("ColorFX", FiltersTool, parent)
{
setToolTitle(i18n("Color Effects"));
@@ -51,6 +51,7 @@ ColorFX::ColorFX(QObject* parent)
connect(m_settingsView, SIGNAL(signalSettingsChanged()),
this, SLOT(slotSettingsChanged()));
+
connect(m_settingsView, SIGNAL(signalLevelOrIterationChanged()),
this, SLOT(slotSettingsChanged()));
}
@@ -65,8 +66,8 @@ BatchToolSettings ColorFX::defaultSettings()
ColorFXContainer defaultPrm = m_settingsView->defaultSettings();
prm.insert("colorFXType", (int)defaultPrm.colorFXType);
- prm.insert("level", (int)defaultPrm.level);
- prm.insert("iterations", (int)defaultPrm.iterations);
+ prm.insert("level", (int)defaultPrm.level);
+ prm.insert("iterations", (int)defaultPrm.iterations);
return prm;
}
@@ -86,8 +87,8 @@ void ColorFX::slotSettingsChanged()
ColorFXContainer currentPrm = m_settingsView->settings();
prm.insert("colorFXType", (int)currentPrm.colorFXType);
- prm.insert("level", (int)currentPrm.level);
- prm.insert("iterations", (int)currentPrm.iterations);
+ prm.insert("level", (int)currentPrm.level);
+ prm.insert("iterations", (int)currentPrm.iterations);
BatchTool::slotSettingsChanged(prm);
}
diff --git a/utilities/queuemanager/basetools/filters/colorfx.h \
b/utilities/queuemanager/basetools/filters/colorfx.h index e706a49..cf482d6 100644
--- a/utilities/queuemanager/basetools/filters/colorfx.h
+++ b/utilities/queuemanager/basetools/filters/colorfx.h
@@ -6,7 +6,7 @@
* Date : 2012-11-08
* Description : a batch tool to apply color effects to images.
*
- * Copyright (C) 2012 by Alexander Dymo <adymo@develop.org>
+ * Copyright (C) 2012 by Alexander Dymo <adymo at develop dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -26,7 +26,6 @@
#include "batchtool.h"
-
namespace Digikam
{
@@ -38,7 +37,7 @@ class ColorFX : public BatchTool
public:
- explicit ColorFX(QObject* parent = 0);
+ explicit ColorFX(QObject* const parent = 0);
~ColorFX();
BatchToolSettings defaultSettings();
diff --git a/utilities/queuemanager/manager/batchtoolsmanager.cpp \
b/utilities/queuemanager/manager/batchtoolsmanager.cpp index 4f3c1df..222046e 100644
--- a/utilities/queuemanager/manager/batchtoolsmanager.cpp
+++ b/utilities/queuemanager/manager/batchtoolsmanager.cpp
@@ -155,8 +155,7 @@ void BatchToolsManager::unregisterTool(BatchTool* const tool)
return;
}
- for (BatchToolsList::iterator it = d->toolsList.begin();
- it != d->toolsList.end();)
+ for (BatchToolsList::iterator it = d->toolsList.begin(); it != d->toolsList.end();)
{
if (*it == tool)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic