[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] /: fix ColorFX read settings and no downscaled preview image for Neon and Find Edges
From:       Maik Qualmann <metzpinguin () gmail ! com>
Date:       2015-09-30 17:08:07
Message-ID: E1ZhKrP-0002o4-3G () scm ! kde ! org
[Download RAW message or body]

Git commit b42606405bf27a5caa36da99d50b1247ed3d21a6 by Maik Qualmann.
Committed on 30/09/2015 at 17:06.
Pushed by mqualmann into branch 'master'.

fix ColorFX read settings and no downscaled preview image for Neon and Find Edges
BUGS: 237719
FIXED-IN: 4.14.0

M  +2    -1    NEWS
M  +11   -2    imageplugins/filters/colorfxtool.cpp
M  +6    -6    libs/dimg/filters/fx/colorfxsettings.cpp

http://commits.kde.org/digikam/b42606405bf27a5caa36da99d50b1247ed3d21a6

diff --git a/NEWS b/NEWS
index 46f71c1..42e9d45 100644
--- a/NEWS
+++ b/NEWS
@@ -18,4 +18,5 @@ BUGFIXES FROM KDE BUGZILLA (https://www.digikam.org/changelog):
 007 ==> 352919 - Crash on delete into image editor [patch].
 008 ==> 341819 - Auto-creation of date-based sub-albums ignored.
 009 ==> 353155 - Apply face tags to multiple images.
-010 ==> 
\ No newline at end of file
+010 ==> 237719 - Color effects: Neon / Find edges don't take parameters correctly.
+011 ==> 
\ No newline at end of file
diff --git a/imageplugins/filters/colorfxtool.cpp \
b/imageplugins/filters/colorfxtool.cpp index 9cbde9e..c0f1b45 100644
--- a/imageplugins/filters/colorfxtool.cpp
+++ b/imageplugins/filters/colorfxtool.cpp
@@ -181,9 +181,18 @@ void ColorFxTool::slotColorSelectedFromTarget(const DColor& \
color)  void ColorFxTool::preparePreview()
 {
     d->settingsView->disable();
-    ColorFXContainer prm = d->settingsView->settings();
 
-    DImg preview = d->previewWidget->getOriginalRegionImage(true);
+    ColorFXContainer prm    = d->settingsView->settings();
+    bool useDownscaledImage = true;
+
+    // See bug #237719 : we cannot use downscaled image to render preview.
+    if (prm.colorFXType == ColorFXFilter::Neon ||
+        prm.colorFXType == ColorFXFilter::FindEdges)
+    {
+        useDownscaledImage = false;
+    }
+
+    DImg preview = d->previewWidget->getOriginalRegionImage(useDownscaledImage);
 
     setFilter(new ColorFXFilter(&preview, this, prm));
 }
diff --git a/libs/dimg/filters/fx/colorfxsettings.cpp \
b/libs/dimg/filters/fx/colorfxsettings.cpp index ccec570..020636b 100644
--- a/libs/dimg/filters/fx/colorfxsettings.cpp
+++ b/libs/dimg/filters/fx/colorfxsettings.cpp
@@ -223,9 +223,9 @@ void ColorFXSettings::readSettings(KConfigGroup& group)
     ColorFXContainer prm;
     ColorFXContainer defaultPrm = defaultSettings();
 
-    d->effectType->setCurrentIndex(group.readEntry(d->configEffectTypeEntry,       \
                d->effectType->defaultIndex()));
-    d->levelInput->setValue(group.readEntry(d->configLevelAdjustmentEntry,         \
                d->levelInput->defaultValue()));
-    d->iterationInput->setValue(group.readEntry(d->configIterationAdjustmentEntry, \
d->iterationInput->defaultValue())); +    prm.colorFXType = \
group.readEntry(d->configEffectTypeEntry,          defaultPrm.colorFXType); +    \
prm.level       = group.readEntry(d->configLevelAdjustmentEntry,     \
defaultPrm.level); +    prm.iterations  = \
group.readEntry(d->configIterationAdjustmentEntry, defaultPrm.iterations);  
     setSettings(prm);
 }
@@ -234,9 +234,9 @@ void ColorFXSettings::writeSettings(KConfigGroup& group)
 {
     ColorFXContainer prm = settings();
 
-    group.writeEntry(d->configEffectTypeEntry,          \
                d->effectType->currentIndex());
-    group.writeEntry(d->configLevelAdjustmentEntry,     d->levelInput->value());
-    group.writeEntry(d->configIterationAdjustmentEntry, d->iterationInput->value());
+    group.writeEntry(d->configEffectTypeEntry,          prm.colorFXType);
+    group.writeEntry(d->configLevelAdjustmentEntry,     prm.level);
+    group.writeEntry(d->configIterationAdjustmentEntry, prm.iterations);
 }
 
 void ColorFXSettings::enable()


[prev in list] [next in list] [prev in thread] [next in thread]