From 60c033158cd53165169c8ebecdb8102838da0116 Mon Sep 17 00:00:00 2001
From: Emil Martinec <ejmartin@uchicago.edu>
Date: Thu, 2 Dec 2010 14:17:36 -0600
Subject: [PATCH] Fixing history messages for defringing and impulse NR.

---
 rtdata/languages/default | 9 ++++++---
 rtengine/procparams.h    | 2 +-
 rtgui/defringe.cc        | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index 76eb3cc94..be57cd273 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -141,6 +141,9 @@ HISTORY_MSG_101;HSV EQ -- Hue
 HISTORY_MSG_102;HSV EQ -- Saturation
 HISTORY_MSG_103;HSV EQ -- Value
 HISTORY_MSG_104;HSV Equalizer
+HISTORY_MSG_105;Defringing enabled
+HISTORY_MSG_106;Defringing radius
+HISTORY_MSG_107;Defringing threshold
 HISTORY_MSG_10;Shadow Compression
 HISTORY_MSG_11;Tone Curve
 HISTORY_MSG_12;Auto Exposure
@@ -225,8 +228,8 @@ HISTORY_MSG_83;High quality shadows/highlights
 HISTORY_MSG_84;Perspective correction
 HISTORY_MSG_85;Wavelet coefficients
 HISTORY_MSG_86;Wavelet equalizer
-HISTORY_MSG_87;Salt&pepper noise reduction
-HISTORY_MSG_88;Salt&pepper NR threshold
+HISTORY_MSG_87;Impulse noise reduction
+HISTORY_MSG_88;Impulse NR threshold
 HISTORY_MSG_89;Noise reduction
 HISTORY_MSG_8;Exposure Compensation
 HISTORY_MSG_90;NR - luminance
@@ -673,7 +676,7 @@ TP_ICM_OUTPUTDLGLABEL;Select Output ICC Profile...
 TP_ICM_OUTPUTPROFILE;Output Profile
 TP_ICM_SAVEREFERENCE;Save reference image for profiling
 TP_ICM_WORKINGPROFILE;Working Profile
-TP_IMPULSEDENOISE_LABEL;Spot Noise Reduction
+TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction
 TP_IMPULSEDENOISE_THRESH;Threshold
 TP_LABCURVE_BRIGHTNESS;Brightness
 TP_LABCURVE_CONTRAST;Contrast
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index b506690c7..8a3a850fd 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -417,7 +417,7 @@ class ProcParams {
         ColorShiftParams        colorShift;     ///< Color shift parameters
         LumaDenoiseParams       lumaDenoise;    ///< Luminance denoising parameters
         ColorDenoiseParams      colorDenoise;   ///< Color denoising parameters
-	DefringeParams			defringe; ///< Impulse denoising parameters
+	DefringeParams			defringe; ///< Defringing parameters
 	ImpulseDenoiseParams    impulseDenoise; ///< Impulse denoising parameters
 	DirPyrDenoiseParams		dirpyrDenoise;  ///< Directional Pyramid denoising parameters
         SHParams                sh;             ///< Shadow/highlight enhancement parameters
diff --git a/rtgui/defringe.cc b/rtgui/defringe.cc
index 2abea2a6c..fb3954e74 100644
--- a/rtgui/defringe.cc
+++ b/rtgui/defringe.cc
@@ -103,9 +103,9 @@ void Defringe::adjusterChanged (Adjuster* a, double newval) {
     if (listener && enabled->get_active()) {
         
         if (a==radius)
-            listener->panelChanged (EvLDNRadius, Glib::ustring::format (std::setw(2), std::fixed, std::setprecision(1), a->getValue()));
+            listener->panelChanged (EvDefringeRadius, Glib::ustring::format (std::setw(2), std::fixed, std::setprecision(1), a->getValue()));
         else if (a==threshold) 
-            listener->panelChanged (EvLDNEdgeTolerance, Glib::ustring::format ((int)a->getValue()));
+            listener->panelChanged (EvDefringeThreshold, Glib::ustring::format ((int)a->getValue()));
     }
 }
 
@@ -126,9 +126,9 @@ void Defringe::enabledChanged () {
 
     if (listener) {
         if (enabled->get_active ())
-            listener->panelChanged (EvLDNEnabled, M("GENERAL_ENABLED"));
+            listener->panelChanged (EvDefringeEnabled, M("GENERAL_ENABLED"));
         else
-            listener->panelChanged (EvLDNEnabled, M("GENERAL_DISABLED"));
+            listener->panelChanged (EvDefringeEnabled, M("GENERAL_DISABLED"));
     }  
 }