[QGIS Commit] r12160 - trunk/qgis/src/gui/symbology-ng
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 17 05:59:40 EST 2009
Author: wonder
Date: 2009-11-17 05:59:40 -0500 (Tue, 17 Nov 2009)
New Revision: 12160
Modified:
trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
Log:
Make sure we have a color ramp when creating categories/ranges.
Modified: trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp 2009-11-17 10:43:56 UTC (rev 12159)
+++ trunk/qgis/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp 2009-11-17 10:59:40 UTC (rev 12160)
@@ -12,6 +12,7 @@
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h" // for uniqueValues
+#include <QMessageBox>
#include <QStandardItemModel>
#include <QStandardItem>
@@ -256,6 +257,15 @@
else
ramp = mStyle->colorRamp( rampName );
+ if ( ramp == NULL )
+ {
+ if ( cboCategorizedColorRamp->count() == 0 )
+ QMessageBox::critical( this, tr("Error"), tr("There are no available color ramps. You can add them in Style Manager.") );
+ else
+ QMessageBox::critical( this, tr("Error"), tr("The selected color ramp is not available.") );
+ return;
+ }
+
QgsCategoryList cats;
_createCategories( cats, unique_vals, mCategorizedSymbol, ramp );
Modified: trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp 2009-11-17 10:43:56 UTC (rev 12159)
+++ trunk/qgis/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp 2009-11-17 10:59:40 UTC (rev 12160)
@@ -11,6 +11,7 @@
#include "qgssymbolv2selectordialog.h"
+#include <QMessageBox>
#include <QStandardItemModel>
#include <QStandardItem>
@@ -157,6 +158,15 @@
else
ramp = mStyle->colorRamp( rampName );
+ if ( ramp == NULL )
+ {
+ if ( cboGraduatedColorRamp->count() == 0 )
+ QMessageBox::critical( this, tr("Error"), tr("There are no available color ramps. You can add them in Style Manager.") );
+ else
+ QMessageBox::critical( this, tr("Error"), tr("The selected color ramp is not available.") );
+ return;
+ }
+
QgsGraduatedSymbolRendererV2::Mode mode;
if (cboGraduatedMode->currentIndex() == 0)
mode = QgsGraduatedSymbolRendererV2::EqualInterval;
More information about the QGIS-commit
mailing list