Merge pull request #3827 from nirvn/color_ramp_migration

Migration of remaining color ramp widgets
qgis · Dec 3, 2016 · e135e79 · e135e79
2 parents 6009f5a + 0b9fbeb
commit e135e79
Show file tree

Hide file tree

Showing 17 changed files with 150 additions and 617 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -230,6 +230,7 @@ Removed Classes        {#qgis_api_break_3_0_removed_classes}
 - QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.
 - QgsColorDialog was removed, and QgsColorDialogV2 was renamed to QgsColorDialog. Hence, QgsColorButtonV2 does not exist anymore.
 All the functionality from the old QgsColorDialog has been moved to the new class.
+- QgsColorRampComboBox was removed, replaced by QgsColorRampButton
 - QgsComposerAttributeTable and associated classes (eg QgsComposerAttributeTableCompare,
 QgsComposerAttributeTableColumnModel, QgsComposerTableSortColumnsProxyModel) were removed.
 Use QgsComposerAttributeTableV2 instead.
@@ -435,12 +436,17 @@ QgsCachedFeatureIterator        {#qgis_api_break_3_0_QgsQgsCachedFeatureIterator
 
 - The constructor for QgsCachedFeatureIterator has changed.
 
+QgsCategorizedRenderer        {#qgis_api_break_3_0_QgsCategorizedRenderer}
+--------------------
+
+- setInvertedColorRamp() and invertedColorRamp() functions are gone, QgsColorRamp now responsible for invert
+- createRenderer() and updateColorRamp()'s inverted parameter is gone
 
 QgsCategorizedSymbolRendererWidget        {#qgis_api_break_3_0_QgsCategorizedSymbolRendererWidget}
 ----------------------------------
 
 - sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.
-
+- getColorRamp() was removed.
 
 QgsClipper        {#qgis_api_break_3_0_QgsClipper}
 ----------
@@ -956,12 +962,21 @@ QgsEditorWidgetRegistry        {#qgis_api_break_3_0_QgsEditorWidgetRegistry}
 - The signature of isFieldSupported() has been changed to return an unsigned (how good it supports the given field)
 and to const-correct it.
 
+QgsGraduatedRenderer        {#qgis_api_break_3_0_QgsGraduatedRenderer}
+--------------------
+
+- setInvertedColorRamp() and invertedColorRamp() functions are gone, QgsColorRamp now responsible for invert
+- createRenderer() and updateColorRamp()'s inverted parameter is gone
 
 QgsGroupWMSDataDialog        {#qgis_api_break_3_0_QgsGroupWMSDataDialog}
 ---------------------
 
 - QgsGroupWMSDataDialo has been renamed to QgsGroupWmsDataDialog
 
+QgsHeatmapRenderer        {#qgis_api_break_3_0_QgsHeatmapRenderer}
+------------------
+
+- setInvertRamp() and invertRamp() functions are gone, QgsColorRamp now responsible for invert
 
 QgsHighlight        {#qgis_api_break_3_0_QgsHighlight}
 ------------

diff --git a/python/core/symbology-ng/qgsheatmaprenderer.sip b/python/core/symbology-ng/qgsheatmaprenderer.sip
@@ -40,20 +40,6 @@ class QgsHeatmapRenderer : QgsFeatureRenderer
      */
     void setColorRamp( QgsColorRamp* ramp /Transfer/ );
 
-    /** Returns whether the ramp is inverted
-     * @returns true if color ramp is inverted
-     * @see setInvertRamp
-     * @see colorRamp
-     */
-    bool invertRamp() const;
-
-    /** Sets whether the ramp is inverted
-     * @param invert set to true to invert color ramp
-     * @see invertRamp
-     * @see setColorRamp
-     */
-    void setInvertRamp( const bool invert );
-
     /** Returns the radius for the heatmap
      * @returns heatmap radius
      * @see setRadius

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -224,7 +224,6 @@
 %Include symbology-ng/qgsarrowsymbollayerwidget.sip
 %Include symbology-ng/qgsbrushstylecombobox.sip
 %Include symbology-ng/qgscategorizedsymbolrendererwidget.sip
-%Include symbology-ng/qgscolorrampcombobox.sip
 %Include symbology-ng/qgscptcitycolorrampdialog.sip
 %Include symbology-ng/qgsdashspacedialog.sip
 %Include symbology-ng/qgsellipsesymbollayerwidget.sip

diff --git a/python/gui/symbology-ng/qgscolorrampcombobox.sip b/python/gui/symbology-ng/qgscolorrampcombobox.sip
diff --git a/src/core/symbology-ng/qgsheatmaprenderer.cpp b/src/core/symbology-ng/qgsheatmaprenderer.cpp
@@ -40,7 +40,6 @@ QgsHeatmapRenderer::QgsHeatmapRenderer()
     , mRadiusUnit( QgsUnitTypes::RenderMillimeters )
     , mWeightAttrNum( -1 )
     , mGradientRamp( nullptr )
-    , mInvertRamp( false )
     , mExplicitMax( 0.0 )
     , mRenderQuality( 3 )
     , mFeaturesRendered( 0 )
@@ -255,7 +254,7 @@ void QgsHeatmapRenderer::renderImage( QgsRenderContext& context )
       pixVal = mValues.at( idx ) > 0 ? qMin(( mValues.at( idx ) / scaleMax ), 1.0 ) : 0;
 
       //convert value to color from ramp
-      pixColor = mGradientRamp->color( mInvertRamp ? 1 - pixVal : pixVal );
+      pixColor = mGradientRamp->color( pixVal );
 
       scanLine[widthIndex] = pixColor.rgba();
       idx++;
@@ -286,7 +285,6 @@ QgsHeatmapRenderer* QgsHeatmapRenderer::clone() const
   {
     newRenderer->setColorRamp( mGradientRamp->clone() );
   }
-  newRenderer->setInvertRamp( mInvertRamp );
   newRenderer->setRadius( mRadius );
   newRenderer->setRadiusUnit( mRadiusUnit );
   newRenderer->setRadiusMapUnitScale( mRadiusMapUnitScale );
@@ -337,7 +335,6 @@ QgsFeatureRenderer* QgsHeatmapRenderer::create( QDomElement& element )
   {
     r->setColorRamp( QgsSymbolLayerUtils::loadColorRamp( sourceColorRampElem ) );
   }
-  r->setInvertRamp( element.attribute( QStringLiteral( "invert_ramp" ), QStringLiteral( "0" ) ).toInt() );
   return r;
 }
 
@@ -356,7 +353,6 @@ QDomElement QgsHeatmapRenderer::save( QDomDocument& doc )
     QDomElement colorRampElem = QgsSymbolLayerUtils::saveColorRamp( QStringLiteral( "[source]" ), mGradientRamp, doc );
     rendererElem.appendChild( colorRampElem );
   }
-  rendererElem.setAttribute( QStringLiteral( "invert_ramp" ), QString::number( mInvertRamp ) );
   rendererElem.setAttribute( QStringLiteral( "forceraster" ), ( mForceRaster ? "1" : "0" ) );
 
   if ( mPaintEffect && !QgsPaintEffectRegistry::isDefaultStack( mPaintEffect ) )

diff --git a/src/core/symbology-ng/qgsheatmaprenderer.h b/src/core/symbology-ng/qgsheatmaprenderer.h
@@ -69,20 +69,6 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRenderer
      */
     void setColorRamp( QgsColorRamp* ramp );
 
-    /** Returns whether the ramp is inverted
-     * @returns true if color ramp is inverted
-     * @see setInvertRamp
-     * @see colorRamp
-     */
-    bool invertRamp() const { return mInvertRamp; }
-
-    /** Sets whether the ramp is inverted
-     * @param invert set to true to invert color ramp
-     * @see invertRamp
-     * @see setColorRamp
-     */
-    void setInvertRamp( const bool invert ) { mInvertRamp = invert; }
-
     /** Returns the radius for the heatmap
      * @returns heatmap radius
      * @see setRadius
@@ -192,7 +178,6 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRenderer
     QScopedPointer<QgsExpression> mWeightExpression;
 
     QgsColorRamp* mGradientRamp;
-    bool mInvertRamp;
 
     double mExplicitMax;
     int mRenderQuality;

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -16,7 +16,6 @@ SET(QGIS_GUI_SRCS
   symbology-ng/qgsarrowsymbollayerwidget.cpp
   symbology-ng/qgsbrushstylecombobox.cpp
   symbology-ng/qgscategorizedsymbolrendererwidget.cpp
-  symbology-ng/qgscolorrampcombobox.cpp
   symbology-ng/qgscptcitycolorrampdialog.cpp
   symbology-ng/qgsdashspacedialog.cpp
   symbology-ng/qgsellipsesymbollayerwidget.cpp
@@ -490,7 +489,6 @@ SET(QGIS_GUI_MOC_HDRS
   symbology-ng/qgsarrowsymbollayerwidget.h
   symbology-ng/qgsbrushstylecombobox.h
   symbology-ng/qgscategorizedsymbolrendererwidget.h
-  symbology-ng/qgscolorrampcombobox.h
   symbology-ng/qgscptcitycolorrampdialog.h
   symbology-ng/qgsdashspacedialog.h
   symbology-ng/qgsellipsesymbollayerwidget.h

diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp
@@ -24,6 +24,7 @@
 #include "qgscoloreffect.h"
 #include "qgsstyle.h"
 #include "qgscolorramp.h"
+#include "qgscolorrampbutton.h"
 
 //
 // draw source
@@ -421,15 +422,12 @@ QgsGlowWidget::QgsGlowWidget( QWidget *parent )
 
   mSpreadUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits );
 
-  mRampComboBox->populate( QgsStyle::defaultStyle() );
-  mRampComboBox->setShowGradientOnly( true );
-  connect( mRampComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) );
-  connect( mRampComboBox, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) );
-  connect( mButtonEditRamp, SIGNAL( clicked() ), mRampComboBox, SLOT( editSourceRamp() ) );
-
-  connect( radioSingleColor, SIGNAL( toggled( bool ) ), this, SLOT( colorModeChanged() ) );
+  btnColorRamp->setShowGradientOnly( true );
 
   initGui();
+
+  connect( btnColorRamp, &QgsColorRampButton::colorRampChanged, this, &QgsGlowWidget::applyColorRamp );
+  connect( radioSingleColor, SIGNAL( toggled( bool ) ), this, SLOT( colorModeChanged() ) );
 }
 
 void QgsGlowWidget::setPaintEffect( QgsPaintEffect *effect )
@@ -461,14 +459,13 @@ void QgsGlowWidget::initGui()
 
   if ( mEffect->ramp() )
   {
-    mRampComboBox->setSourceColorRamp( mEffect->ramp() );
+    btnColorRamp->setColorRamp( mEffect->ramp() );
   }
 
   radioSingleColor->setChecked( mEffect->colorType() == QgsGlowEffect::SingleColor );
   mColorBtn->setEnabled( mEffect->colorType() == QgsGlowEffect::SingleColor );
   radioColorRamp->setChecked( mEffect->colorType() == QgsGlowEffect::ColorRamp );
-  mRampComboBox->setEnabled( mEffect->colorType() == QgsGlowEffect::ColorRamp );
-  mButtonEditRamp->setEnabled( mEffect->colorType() == QgsGlowEffect::ColorRamp );
+  btnColorRamp->setEnabled( mEffect->colorType() == QgsGlowEffect::ColorRamp );
   mDrawModeComboBox->setDrawMode( mEffect->drawMode() );
 
   blockSignals( false );
@@ -483,7 +480,7 @@ void QgsGlowWidget::blockSignals( const bool block )
   mTranspSlider->blockSignals( block );
   mColorBtn->blockSignals( block );
   mBlendCmbBx->blockSignals( block );
-  mRampComboBox->blockSignals( block );
+  btnColorRamp->blockSignals( block );
   radioSingleColor->blockSignals( block );
   radioColorRamp->blockSignals( block );
   mDrawModeComboBox->blockSignals( block );
@@ -503,7 +500,7 @@ void QgsGlowWidget::colorModeChanged()
   else
   {
     mEffect->setColorType( QgsGlowEffect::ColorRamp );
-    mEffect->setRamp( mRampComboBox->currentColorRamp() );
+    mEffect->setRamp( btnColorRamp->colorRamp() );
   }
   emit changed();
 }
@@ -594,7 +591,7 @@ void QgsGlowWidget::applyColorRamp()
     return;
   }
 
-  QgsColorRamp* ramp = mRampComboBox->currentColorRamp();
+  QgsColorRamp* ramp = btnColorRamp->colorRamp();
   if ( !ramp )
     return;