[Digikam-devel] [Bug 128135] WISH: Adjust exposure etc. in terms of EV

[Gilles Caulier]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=128135         




------- Additional Comments From caulier.gilles kdemail net  2007-01-10 16:38 -------
SVN commit 622059 by cgilles:

digikam from trunk : White Balance image editor tool : 

- Fix Gamma excursion values to be homogenous with BCG image editor tool.
- Annotate than Exposure settings is in E.V
- Annotate than Temperature settings is in °K

CCBUGS: 128135

 M  +9 -10     imageeffect_whitebalance.cpp   [UTF-8 ENCODING PROBLEMS]
 M  +29 -30    imageeffect_whitebalance.h  


--- trunk/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp #622058:622059
 @ -1,11 +1,10  @
 /* ============================================================
- * File  : imageeffect_whitebalance.cpp
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date  : 2005-03-11
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date   : 2005-03-11
  * Description : a digiKam image editor plugin to correct 
  *               image white balance 
  * 
- * Copyright 2005-2006 by Gilles Caulier
+ * Copyright 2005-2007 by Gilles Caulier
  *
  * Some parts are inspired from RawPhoto implementation copyrighted 
  * 2004-2005 by Pawel T. Jochym <jochym at ifj edu pl>
 @ -67,8 +66,9  @
 // Local includes.
 
 #include "version.h"
-#include "imageeffect_whitebalance.h"
 #include "blackbody.h"
+#include "imageeffect_whitebalance.h"
+#include "imageeffect_whitebalance.moc"
 
 namespace DigikamWhiteBalanceImagesPlugin
 {
 @ -98,7 +98,7  @
                                        digikamimageplugins_version,
                                        I18N_NOOP("A digiKam image plugin to correct white color balance."),
                                        KAboutData::License_GPL,
-                                       "(c) 2005-2006, Gilles Caulier", 
+                                       "(c) 2005-2007, Gilles Caulier", 
                                        0,
                                        "http://extragear.kde.org/apps/digikamimageplugins");
 
 @ -188,7 +188,7  @
     QGridLayout *grid2 = new QGridLayout( layout2, 10, 5, spacingHint());
     KIconLoader icon;
     
-    m_exposureLabel = new QLabel(i18n("Exposure:"), gboxSettings);
+    m_exposureLabel = new QLabel(i18n("Exposure (EV):"), gboxSettings);
     m_autoAdjustExposure = new QPushButton(gboxSettings);
     m_autoAdjustExposure->setPixmap( icon.loadIcon( "run", (KIcon::Group)KIcon::Toolbar ) );
     QToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) );
 @ -220,12 +220,12  @
     m_gammaLabel = new QLabel(i18n("Gamma:"), gboxSettings);
     m_gammaInput = new KDoubleNumInput(gboxSettings);
     m_gammaInput->setPrecision(2);
-    m_gammaInput->setRange(0.01, 1.5, 0.01, true);
+    m_gammaInput->setRange(0.1, 3.0, 0.01, true);
     QWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma correction value."));
 
     KSeparator *line = new KSeparator (Horizontal, gboxSettings);
             
-    m_temperatureLabel = new QLabel(i18n("Temperature:"), gboxSettings);
+    m_temperatureLabel = new QLabel(i18n("Temperature (°K):"), gboxSettings);
     m_temperatureInput = new KDoubleNumInput(gboxSettings);
     m_temperatureInput->setPrecision(1);
     m_temperatureInput->setRange(2200.0, 7000.0, 10.0, true);
 @ -947,4 +947,3  @
 
 }  // NameSpace DigikamWhiteBalanceImagesPlugin
 
-#include "imageeffect_whitebalance.moc"
--- trunk/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.h #622058:622059
 @ -1,11 +1,10  @
 /* ============================================================
- * File  : imageeffect_whitebalance.h
- * Author: Gilles Caulier <caulier dot gilles at kdemail dot net>
- * Date  : 2005-03-11
+ * Authors: Gilles Caulier <caulier dot gilles at kdemail dot net>
+ * Date   : 2005-03-11
  * Description : a digiKam image editor plugin to correct 
  *               image white balance 
  * 
- * Copyright 2005-2006 by Gilles Caulier
+ * Copyright 2005-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
 @ -52,6 +51,32  @
     ImageEffect_WhiteBalance(QWidget* parent, QString title, QFrame* banner);
     ~ImageEffect_WhiteBalance();
 
+protected:
+
+    void finalRendering();    
+
+private:
+        
+    void setRGBmult(void);
+    void setLUTv(void);
+    void whiteBalance(uchar *data, int width, int height, bool sixteenBit);
+    inline unsigned short pixelColor(int colorMult, int index, int value);
+    
+private slots:
+
+    void slotDefault();
+    void slotUser2();
+    void slotUser3();
+    void slotEffect();
+    void slotColorSelectedFromOriginal(const Digikam::DColor &color);
+    void slotColorSelectedFromTarget(const Digikam::DColor &color);
+    void slotScaleChanged(int scale);
+    void slotChannelChanged(int channel);
+    void slotTemperatureChanged(double temperature);
+    void slotTemperaturePresetChanged(int tempPreset);
+    void slotAutoAdjustExposure(void);
+    void slotPickerColorButtonActived();    
+
 private:    
     
     enum HistogramScale
 @ -136,32 +161,6  @
     Digikam::ColorGradientWidget *m_hGradient;
     
     Digikam::ImageWidget         *m_previewWidget;
-
-protected:
-
-    void finalRendering();    
-
-private:
-        
-    void setRGBmult(void);
-    void setLUTv(void);
-    void whiteBalance(uchar *data, int width, int height, bool sixteenBit);
-    inline unsigned short pixelColor(int colorMult, int index, int value);
-    
-private slots:
-
-    void slotDefault();
-    void slotUser2();
-    void slotUser3();
-    void slotEffect();
-    void slotColorSelectedFromOriginal(const Digikam::DColor &color);
-    void slotColorSelectedFromTarget(const Digikam::DColor &color);
-    void slotScaleChanged(int scale);
-    void slotChannelChanged(int channel);
-    void slotTemperatureChanged(double temperature);
-    void slotTemperaturePresetChanged(int tempPreset);
-    void slotAutoAdjustExposure(void);
-    void slotPickerColorButtonActived();    
 };
 
 }  // NameSpace DigikamWhiteBalanceImagesPlugin