[Digikam-devel] extragear/graphics

[Gilles Caulier]

SVN commit 489598 by cgilles:

Digikam from trunk : Fix slider settings rules because color correction algorithm can take a while with 16 bits images. The values changed by sliders will be delayed by 500 ms using QTimer.

CCMAIL: digikam-devel at kde.org

 M  +5 -2      digikam/libs/dialogs/imagedlgbase.h  
 M  +1 -1      digikamimageplugins/adjustcurves/adjustcurves.cpp  
 M  +5 -5      digikamimageplugins/adjustlevels/adjustlevels.cpp  
 M  +1 -1      digikamimageplugins/channelmixer/channelmixer.cpp  
 M  +10 -10    digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp  


--- trunk/extragear/graphics/digikam/libs/dialogs/imagedlgbase.h #489597:489598
@@ -72,10 +72,13 @@
 
     KAboutData     *m_about;
     
+protected slots:
+
+    void slotTimer();       
+    
 private slots:
-
+    
     void slotHelp();
-    void slotTimer();       
     virtual void slotEffect(){};
 };
 
--- trunk/extragear/graphics/digikamimageplugins/adjustcurves/adjustcurves.cpp #489597:489598
@@ -295,7 +295,7 @@
     // -------------------------------------------------------------
     
     connect(m_curvesWidget, SIGNAL(signalCurvesChanged()),
-            this, SLOT(slotEffect()));
+            this, SLOT(slotTimer()));
     
     connect(m_previewOriginalWidget, SIGNAL(spotPositionChanged( const Digikam::DColor &, bool, const QPoint & )),
             this, SLOT(slotSpotColorChanged( const Digikam::DColor &, bool )));
--- trunk/extragear/graphics/digikamimageplugins/adjustlevels/adjustlevels.cpp #489597:489598
@@ -436,7 +436,7 @@
     blockSignals(true);
     m_levels->setLevelGammaValue(m_channelCB->currentItem(), val);
     blockSignals(false);
-    slotEffect();
+    slotTimer();
 }
 
 void AdjustLevelDialog::slotAdjustMinInputSpinBox(int val)
@@ -450,7 +450,7 @@
     m_hGradientMinInput->setValue( val );
     m_levels->setLevelLowInputValue(m_channelCB->currentItem(), m_histoSegments - val);
     blockSignals(false);
-    slotEffect();
+    slotTimer();
 }
 
 void AdjustLevelDialog::slotAdjustMaxInputSpinBox(int val)
@@ -464,7 +464,7 @@
     m_hGradientMaxInput->setValue( val );
     m_levels->setLevelHighInputValue(m_channelCB->currentItem(), m_histoSegments - val);
     blockSignals(false);
-    slotEffect();
+    slotTimer();
 }
 
 void AdjustLevelDialog::slotAdjustMinOutputSpinBox(int val)
@@ -478,7 +478,7 @@
     m_hGradientMinOutput->setValue( val );
     m_levels->setLevelLowOutputValue(m_channelCB->currentItem(), m_histoSegments - val);
     blockSignals(false);
-    slotEffect();
+    slotTimer();
 }
 
 void AdjustLevelDialog::slotAdjustMaxOutputSpinBox(int val)
@@ -492,7 +492,7 @@
     m_hGradientMaxOutput->setValue( val );
     m_levels->setLevelHighOutputValue(m_channelCB->currentItem(), m_histoSegments - val);
     blockSignals(false);
-    slotEffect();
+    slotTimer();
 }
 
 void AdjustLevelDialog::slotAdjustSliders()
--- trunk/extragear/graphics/digikamimageplugins/channelmixer/channelmixer.cpp #489597:489598
@@ -353,7 +353,7 @@
           break;
     }
 
-    slotEffect();
+    slotTimer();
 }
 
 void ChannelMixerDialog::adjustSliders(void)
--- trunk/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp #489597:489598
@@ -350,22 +350,22 @@
             this, SLOT(slotTemperatureChanged(double)));                       
             
     connect(m_darkInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                       
+            this, SLOT(slotTimer()));                       
     
     connect(m_blackInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                       
+            this, SLOT(slotTimer()));                       
     
     connect(m_exposureInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                       
+            this, SLOT(slotTimer()));                       
     
     connect(m_gammaInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                       
+            this, SLOT(slotTimer()));                       
 
     connect(m_saturationInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                         
+            this, SLOT(slotTimer()));                         
 
     connect(m_greenInput, SIGNAL(valueChanged (double)),
-            this, SLOT(slotEffect()));                 
+            this, SLOT(slotTimer()));                 
 }
 
 ImageEffect_WhiteBalance::~ImageEffect_WhiteBalance()
@@ -479,7 +479,7 @@
           break;
     }
 
-    slotEffect();  
+    slotTimer();  
 }
 
 void ImageEffect_WhiteBalance::slotTemperaturePresetChanged(int tempPreset)
@@ -601,17 +601,17 @@
  
        case RedChannel:
           m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram;
-          m_hGradient->setColors( QColor( "red" ), QColor( "black" ) );
+          m_hGradient->setColors( QColor( "black" ), QColor( "red" ) );
           break;
 
        case GreenChannel:         
           m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram;
-          m_hGradient->setColors( QColor( "green" ), QColor( "black" ) );
+          m_hGradient->setColors( QColor( "black" ), QColor( "green" ) );
           break;
 
        case BlueChannel:         
           m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram;
-          m_hGradient->setColors( QColor( "blue" ), QColor( "black" ) );
+          m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) );
           break;
     }