[Digikam-devel] extragear/graphics/digikam/libs/imageproperties

[Gilles Caulier]

SVN commit 494562 by cgilles:

digiKam from trunk : Image Colors properties sidebar : added image color depth and alpha channel informations 

CCMAIL: digikam-devel at kde.org

 M  +43 -13    imagepropertiescolorstab.cpp  
 M  +20 -17    imagepropertiescolorstab.h  


--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp #494561:494562
@@ -74,7 +74,7 @@
     // Histogram tab area -----------------------------------------------------
        
     QWidget* histogramPage = new QWidget( tab );
-    QGridLayout *topLayout = new QGridLayout(histogramPage, 7, 3, KDialog::marginHint(), KDialog::spacingHint());
+    QGridLayout *topLayout = new QGridLayout(histogramPage, 8, 3, KDialog::marginHint(), KDialog::spacingHint());
 
     QLabel *label1 = new QLabel(i18n("Channel:"), histogramPage);
     label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter );
@@ -234,8 +234,24 @@
     m_labelPercentileValue->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter);
     
     topLayout->addMultiCellWidget(gbox, 6, 6, 0, 3);
-    topLayout->setRowStretch(7, 10);
 
+    // -------------------------------------------------------------
+
+    QGroupBox *gbox2 = new QGroupBox(2, Qt::Horizontal, histogramPage);
+    gbox2->setFrameStyle( QFrame::NoFrame );
+
+    QLabel *label11     = new QLabel(i18n("Color depth:"), gbox2);
+    label11->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter);
+    m_labelColorDepth   = new QLabel(gbox2);
+    m_labelColorDepth->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter);
+    QLabel *label12     = new QLabel(i18n("Alpha Channel:"), gbox2);
+    label12->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter);
+    m_labelAlphaChannel = new QLabel(gbox2);
+    m_labelAlphaChannel->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter);
+    
+    topLayout->addMultiCellWidget(gbox2, 7, 7, 0, 3);
+
+    topLayout->setRowStretch(8, 10);
     tab->addTab(histogramPage, i18n("Histogram") );
 
     // ICC Profiles tab area ---------------------------------------
@@ -343,6 +359,14 @@
     if (url.isEmpty())
     {
        m_navigateBar->setFileName("");
+       m_labelMeanValue->clear();
+       m_labelPixelsValue->clear();
+       m_labelStdDevValue->clear();
+       m_labelCountValue->clear();
+       m_labelMedianValue->clear();
+       m_labelPercentileValue->clear();
+       m_labelColorDepth->clear();
+       m_labelAlphaChannel->clear();       
        setEnabled(false);
        return;
     }
@@ -375,12 +399,14 @@
                                               m_imageSelection.height());
                 m_regionBG->show();                                         
                 m_maxInterv->setMaxValue(m_image.sixteenBit() ? 65535 : 255);
+                updateInformations();
             }
             else 
             {
                 m_histogramWidget->updateData(m_image.bits(), m_image.width(), m_image.height(), sixteenBit);
                 m_regionBG->hide();
                 m_maxInterv->setMaxValue(m_image.sixteenBit() ? 65535 : 255);
+                updateInformations();
             }
         }
         else 
@@ -392,10 +418,9 @@
 
 void ImagePropertiesColorsTab::loadImageFromUrl(const KURL& url)
 {
-    //m_histogramWidget->setEnabled(false);
-
     // create thread on demand
-    if (!m_imageLoaderThreaded) {
+    if (!m_imageLoaderThreaded)
+    {
         m_imageLoaderThreaded = new ManagedLoadSaveThread();
 
         connect(m_imageLoaderThreaded, SIGNAL(signalImageLoaded(const QString&, const DImg&)),
@@ -409,8 +434,6 @@
 
 void ImagePropertiesColorsTab::slotLoadImageFromUrlComplete(const QString&, const DImg& img)
 {
-    //m_histogramWidget->setEnabled(true);
-
     if ( !img.isNull() )
     {
         m_histogramWidget->updateData(img.bits(), img.width(), img.height(),
@@ -420,6 +443,7 @@
         m_image = img;
         m_regionBG->hide();
         m_maxInterv->setMaxValue(m_image.sixteenBit() ? 65535 : 255);
+        updateInformations();
     }
     else
     {
@@ -518,7 +542,7 @@
     }
    
     m_histogramWidget->repaint(false);
-    updateInformation();
+    updateStatistiques();
 }
 
 void ImagePropertiesColorsTab::slotScaleChanged(int scale)
@@ -545,21 +569,21 @@
     }
 
     m_histogramWidget->repaint(false);
-    updateInformation();
+    updateStatistiques();
 }
 
 void ImagePropertiesColorsTab::slotRenderingChanged(int rendering)
 {
     m_histogramWidget->m_renderingType = rendering;
     m_histogramWidget->repaint(false);
-    updateInformation();
+    updateStatistiques();
 }
 
 void ImagePropertiesColorsTab::slotIntervChanged(int)
 {
     m_maxInterv->setMinValue(m_minInterv->value());
     m_minInterv->setMaxValue(m_maxInterv->value());
-    updateInformation();
+    updateStatistiques();
 }
 
 void ImagePropertiesColorsTab::slotUpdateMinInterv(int min)
@@ -570,11 +594,17 @@
 void ImagePropertiesColorsTab::slotUpdateMaxInterv(int max)
 {
     m_maxInterv->setValue(max);
-    updateInformation();
+    updateStatistiques();
 }
 
-void ImagePropertiesColorsTab::updateInformation()
+void ImagePropertiesColorsTab::updateInformations()
 {
+    m_labelColorDepth->setText(m_image.sixteenBit() ? i18n("16 bits") : i18n("8 bits"));
+    m_labelAlphaChannel->setText(m_image.hasAlpha() ? i18n("Yes") : i18n("No"));
+}
+
+void ImagePropertiesColorsTab::updateStatistiques()
+{
     QString value;
     int min = m_minInterv->value();
     int max = m_maxInterv->value();
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.h #494561:494562
@@ -71,7 +71,8 @@
 private:
 
     void loadImageFromUrl(const KURL& url);
-    void updateInformation();
+    void updateInformations();
+    void updateStatistiques();
     
 private slots:
 
@@ -91,27 +92,29 @@
 
 private:
 
-    QComboBox           *m_channelCB;    
-    QComboBox           *m_colorsCB;    
-    QComboBox           *m_renderingCB;    
+    QComboBox             *m_channelCB;    
+    QComboBox             *m_colorsCB;    
+    QComboBox             *m_renderingCB;    
 
-    QHButtonGroup       *m_scaleBG;
-    QHButtonGroup       *m_regionBG;
+    QHButtonGroup         *m_scaleBG;
+    QHButtonGroup         *m_regionBG;
     
-    QSpinBox            *m_minInterv;
-    QSpinBox            *m_maxInterv;
+    QSpinBox              *m_minInterv;
+    QSpinBox              *m_maxInterv;
     
-    QLabel              *m_labelMeanValue;
-    QLabel              *m_labelPixelsValue;
-    QLabel              *m_labelStdDevValue;
-    QLabel              *m_labelCountValue;
-    QLabel              *m_labelMedianValue;
-    QLabel              *m_labelPercentileValue;
+    QLabel                *m_labelMeanValue;
+    QLabel                *m_labelPixelsValue;
+    QLabel                *m_labelStdDevValue;
+    QLabel                *m_labelCountValue;
+    QLabel                *m_labelMedianValue;
+    QLabel                *m_labelPercentileValue;
+    QLabel                *m_labelColorDepth;
+    QLabel                *m_labelAlphaChannel;
     
-    DImg                 m_image;
-    DImg                 m_imageSelection;
+    DImg                   m_image;
+    DImg                   m_imageSelection;
     
-    QRect               *m_selectionArea;
+    QRect                 *m_selectionArea;
     
     ColorGradientWidget   *m_hGradient;
     HistogramWidget       *m_histogramWidget;