[QGIS Commit] r12847 - in trunk/qgis/src: gui/symbology-ng ui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-01-29 06:11:01 -0500 (Fri, 29 Jan 2010)
New Revision: 12847

Modified:
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h
   trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
Log:
Display alpha value as transparency (to be consistent with the interface in old symbology)

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp	2010-01-28 20:03:17 UTC (rev 12846)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp	2010-01-29 11:11:01 UTC (rev 12847)
@@ -48,9 +48,11 @@
     mSymbolUnitComboBox->setCurrentIndex( mSymbol->outputUnit() );
     mSymbolUnitComboBox->blockSignals( false );
 
-    mOpacitySlider->blockSignals( true );
-    mOpacitySlider->setValue( symbol->alpha() * 255 );
-    mOpacitySlider->blockSignals( false );
+    mTransparencySlider->blockSignals( true );
+    double transparency = 1 - symbol->alpha();
+    mTransparencySlider->setValue( transparency * 255 );
+    displayTransparency( symbol->alpha() );
+    mTransparencySlider->blockSignals( false );
   }
 
   // select correct page in stacked widget
@@ -243,12 +245,20 @@
   }
 }
 
-void QgsSymbolV2SelectorDialog::on_mOpacitySlider_valueChanged( int value )
+void QgsSymbolV2SelectorDialog::on_mTransparencySlider_valueChanged( int value )
 {
   if ( mSymbol )
   {
-    mSymbol->setAlpha( value / 255.0 );
+    double alpha = 1 - ( value / 255.0 );
+    mSymbol->setAlpha( alpha );
+    displayTransparency( alpha );
     updateSymbolPreview();
     emit symbolModified();
   }
 }
+
+void QgsSymbolV2SelectorDialog::displayTransparency( double alpha )
+{
+  double transparencyPercent = ( 1 - alpha ) * 100;
+  mTransparencyLabel->setText( tr( "Transparency: %1%" ).arg( transparencyPercent ) );
+}

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h	2010-01-28 20:03:17 UTC (rev 12846)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h	2010-01-29 11:11:01 UTC (rev 12847)
@@ -25,6 +25,10 @@
     //! Reimplements dialog keyPress event so we can ignore it
     void keyPressEvent( QKeyEvent * event );
 
+  private:
+    /**Displays alpha value as transparency in mTransparencyLabel*/
+    void displayTransparency( double alpha );
+
   public slots:
     void changeSymbolProperties();
     void setSymbolFromStyle( const QModelIndex & index );
@@ -34,7 +38,7 @@
     void setLineWidth( double width );
     void addSymbolToStyle();
     void on_mSymbolUnitComboBox_currentIndexChanged( const QString & text );
-    void on_mOpacitySlider_valueChanged( int value );
+    void on_mTransparencySlider_valueChanged( int value );
 
   signals:
     void symbolModified();

Modified: trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui	2010-01-28 20:03:17 UTC (rev 12846)
+++ trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui	2010-01-29 11:11:01 UTC (rev 12847)
@@ -68,14 +68,14 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="mOpacityLabel">
+        <widget class="QLabel" name="mTransparencyLabel">
          <property name="text">
           <string>Opacity</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QSlider" name="mOpacitySlider">
+        <widget class="QSlider" name="mTransparencySlider">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -281,7 +281,7 @@
  <tabstops>
   <tabstop>btnSymbolProperties</tabstop>
   <tabstop>mSymbolUnitComboBox</tabstop>
-  <tabstop>mOpacitySlider</tabstop>
+  <tabstop>mTransparencySlider</tabstop>
   <tabstop>spinSize</tabstop>
   <tabstop>spinAngle</tabstop>
   <tabstop>spinWidth</tabstop>