Fixing null pointer on ramp bug

qgis · Sep 26, 2014 · b558c08 · b558c08
1 parent 25a7be2
commit b558c08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -1301,15 +1301,18 @@ void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp,
     this->setInvertedColorRamp( inverted );
   }
 
-  foreach ( QgsRendererRangeV2 range, mRanges )
+  if( mSourceColorRamp )
   {
-    QgsSymbolV2* symbol = range.symbol()->clone();
-    double colorValue;
-    if ( inverted ) colorValue = ( mRanges.count() > 1 ? ( double )( mRanges.count() - i - 1 ) / ( mRanges.count() - 1 ) : 0 );
-    else colorValue = ( mRanges.count() > 1 ? ( double ) i / ( mRanges.count() - 1 ) : 0 );
-    symbol->setColor( mSourceColorRamp->color( colorValue ) );
-    updateRangeSymbol( i, symbol );
-    ++i;
+    foreach ( QgsRendererRangeV2 range, mRanges )
+    {
+      QgsSymbolV2* symbol = range.symbol()->clone();
+      double colorValue;
+      if ( inverted ) colorValue = ( mRanges.count() > 1 ? ( double )( mRanges.count() - i - 1 ) / ( mRanges.count() - 1 ) : 0 );
+      else colorValue = ( mRanges.count() > 1 ? ( double ) i / ( mRanges.count() - 1 ) : 0 );
+      symbol->setColor( mSourceColorRamp->color( colorValue ) );
+      updateRangeSymbol( i, symbol );
+      ++i;
+    }
   }
 
 }

diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -581,6 +581,7 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated()
 
   mRenderer->setClassAttribute(attrName);
   mRenderer->setMode(mode);
+  mRenderer->setSourceColorRamp(ramp->clone());
   bool updateUiCount=true;
   QApplication::setOverrideCursor( Qt::WaitCursor );
   mRenderer->updateClasses(mLayer,mode,nclasses);