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

List:       kde-commits
Subject:    kdeextragear-3
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2005-03-25 6:42:23
Message-ID: 20050325064223.648A848F () office ! kde ! org
[Download RAW message or body]

CVS commit by cgilles: 

digiKam image editor Adjust Curves plugin : add option to see over-exposed pixels in \
                preview effect (like with Acdsee adjust curve tool).
CCMAIL: digikam-devel@lists.sourceforge.net


  M +2 -1      digikam/libs/curves/imagecurves.cpp   1.10
  M +1 -1      digikam/libs/curves/imagecurves.h   1.5
  M +9 -1      digikamimageplugins/adjustcurves/adjustcurves.cpp   1.30
  M +3 -0      digikamimageplugins/adjustcurves/adjustcurves.h   1.12
  M +1 -1      digikamimageplugins/adjustcurves/imageplugin_adjustcurves.cpp   1.7
  M +1 -1      digikamimageplugins/adjustcurves/imageplugin_adjustcurves.h   1.4


--- kdeextragear-3/digikam/libs/curves/imagecurves.cpp  #1.9:1.10
@@ -347,5 +347,5 @@ void ImageCurves::curvesCRCompose(CRMatr
 // This method is inspired of Gimp2.0 
 // app/base/gimplut.c::gimp_lut_setup 
-void ImageCurves::curvesLutSetup(int nchannels)
+void ImageCurves::curvesLutSetup(int nchannels, bool overIndicator)
 {
     int    i; 
@@ -373,4 +373,5 @@ void ImageCurves::curvesLutSetup(int nch
           
           val = 255.0 * curvesLutFunc( m_lut->nchannels, i, v/255.0) + 0.5;
+          if (overIndicator && val > 255) val = 0;
           m_lut->luts[i][v] = (uchar)CLAMP (val, 0, 255);
           }

--- kdeextragear-3/digikam/libs/curves/imagecurves.h  #1.4:1.5
@@ -88,5 +88,5 @@ public:
     void   curvesCalculateCurve(int channel);
     float  curvesLutFunc(int n_channels, int channel, float value);
-    void   curvesLutSetup(int nchannels);
+    void   curvesLutSetup(int nchannels, bool overIndicator=false);
     void   curvesLutProcess(uint *srcPR, uint *destPR, int w, int h);
 

--- kdeextragear-3/digikamimageplugins/adjustcurves/adjustcurves.cpp  #1.29:1.30
@@ -44,4 +44,5 @@
 #include <qhbuttongroup.h> 
 #include <qpixmap.h>
+#include <qcheckbox.h>
 
 // KDE includes.
@@ -278,4 +279,8 @@ AdjustCurveDialog::AdjustCurveDialog(QWi
     l3->addWidget(m_previewTargetWidget, 0, Qt::AlignCenter);
 
+    m_overExposureIndicatorBox = new QCheckBox(i18n("Over Exposure Indicator"), \
gbox4); +    QWhatsThis::add( m_overExposureIndicatorBox, i18n("<p>If you enable this \
option, over-exposed pixels from target image preview " +                             \
"will be will be over-colored. This haven't effect to final rendering.")); +          \
  topLayout->addMultiCellWidget(gbox4, 1, 3, 1, 1);
 
@@ -299,4 +304,7 @@ AdjustCurveDialog::AdjustCurveDialog(QWi
             this, SLOT(slotSpotColorChanged( const QColor &, bool ))); 
     
+    connect(m_overExposureIndicatorBox, SIGNAL(toggled (bool)),
+            this, SLOT(slotEffect()));              
+    
     // -------------------------------------------------------------
     // ComboBox slots.
@@ -424,5 +432,5 @@ void AdjustCurveDialog::slotEffect()
 
     // Calculate the LUT to apply on the image.
-    m_curves->curvesLutSetup(Digikam::ImageHistogram::AlphaChannel);
+    m_curves->curvesLutSetup(Digikam::ImageHistogram::AlphaChannel, \
m_overExposureIndicatorBox->isChecked());  
     // Apply the lut to the image.

--- kdeextragear-3/digikamimageplugins/adjustcurves/adjustcurves.h  #1.11:1.12
@@ -35,4 +35,5 @@ class QPushButton;
 class QLabel;
 class QHButtonGroup;
+class QCheckBox;
 
 namespace Digikam
@@ -105,4 +106,6 @@ private:
     QPushButton                  *m_pickWhite;
     
+    QCheckBox                    *m_overExposureIndicatorBox;
+
     QHButtonGroup                *m_pickerColorButtonGroup;
     

--- kdeextragear-3/digikamimageplugins/adjustcurves/imageplugin_adjustcurves.cpp  \
#1.6:1.7 @@ -5,5 +5,5 @@
  * Description : 
  * 
- * Copyright 2004 by Gilles Caulier
+ * Copyright 2004-2005 by Gilles Caulier
  *
  * This program is free software; you can redistribute it

--- kdeextragear-3/digikamimageplugins/adjustcurves/imageplugin_adjustcurves.h  \
#1.3:1.4 @@ -5,5 +5,5 @@
  * Description : 
  * 
- * Copyright 2004 by Gilles Caulier
+ * Copyright 2004-2005 by Gilles Caulier
  *
  * This program is free software; you can redistribute it


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