50 changes: 22 additions & 28 deletions src/core/symbology-ng/qgsvectorcolorrampv2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,25 @@ class CORE_EXPORT QgsVectorColorRampV2

};

struct QgsGradientStop
{
double offset;
QColor color;
QgsGradientStop( double o, const QColor& c ) : offset( o ), color( c ) { }
};

typedef QList<QgsGradientStop> QgsGradientStopsList;

#define DEFAULT_GRADIENT_COLOR1 QColor(0,0,255)
#define DEFAULT_GRADIENT_COLOR2 QColor(0,255,0)

class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
{
public:
QgsVectorGradientColorRampV2( QColor color1 = DEFAULT_GRADIENT_COLOR1,
QColor color2 = DEFAULT_GRADIENT_COLOR2 );
QColor color2 = DEFAULT_GRADIENT_COLOR2,
bool discrete = false,
QgsGradientStopsList stops = QgsGradientStopsList() );

static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() );

Expand All @@ -61,14 +72,16 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
void setColor1( QColor color ) { mColor1 = color; }
void setColor2( QColor color ) { mColor2 = color; }

typedef QMap<double, QColor> StopsMap;
bool isDiscrete() const { return mDiscrete; }
void setDiscrete( bool discrete ) { mDiscrete = discrete; }

void setStops( const StopsMap& stops ) { mStops = stops; }
const StopsMap& stops() const { return mStops; }
void setStops( const QgsGradientStopsList& stops ) { mStops = stops; }
const QgsGradientStopsList& stops() const { return mStops; }

protected:
QColor mColor1, mColor2;
StopsMap mStops;
bool mDiscrete;
QgsGradientStopsList mStops;
};

#define DEFAULT_RANDOM_COUNT 10
Expand Down Expand Up @@ -163,7 +176,7 @@ class CORE_EXPORT QgsVectorColorBrewerColorRampV2 : public QgsVectorColorRampV2
#define DEFAULT_CPTCITY_SCHEMENAME "cb/div/BrBG_" //change this
#define DEFAULT_CPTCITY_VARIANTNAME "05"

class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorGradientColorRampV2
{
public:
QgsCptCityColorRampV2( QString schemeName = DEFAULT_CPTCITY_SCHEMENAME,
Expand All @@ -172,36 +185,18 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
QgsCptCityColorRampV2( QString schemeName, QStringList variantList,
QString variantName = QString(), bool doLoadFile = true );


enum GradientType
{
Discrete, //discrete stops, e.g. Color Brewer
Continuous, //continuous, e.g. QgsVectorColorRampV2
ContinuousMulti //continuous with 2 values in intermediate stops
};
typedef QList< QPair < double, QColor > > GradientList;


static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() );

virtual QColor color( double value ) const;

virtual QString type() const { return "cpt-city"; }

virtual QgsVectorColorRampV2* clone() const;
void copy( const QgsCptCityColorRampV2* other );

virtual QgsStringMap properties() const;

int count() const { return mPalette.count(); }

QString schemeName() const { return mSchemeName; }
QString variantName() const { return mVariantName; }
QStringList variantList() const { return mVariantList; }
/* QgsCptCityCollection* collection() const { return mCollection; } */
/* QString collectionName() const { return mCollectionName; } */
/* QgsCptCityCollection* collection() const */
/* { return QgsCptCityCollection::collectionRegistry().value( mCollectionName ); } */

/* lazy loading - have to call loadPalette() explicitly */
void setSchemeName( QString schemeName ) { mSchemeName = schemeName; mFileLoaded = false; }
Expand All @@ -211,8 +206,8 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
{ mSchemeName = schemeName; mVariantName = variantName; mVariantList = variantList; mFileLoaded = false; }

void loadPalette() { loadFile(); }
/* bool isContinuous() const { return mContinuous; } */
GradientType gradientType() const { return mGradientType; }
bool hasMultiStops() const { return mMultiStops; }
int count() const { return mStops.count() + 2; }

QString fileName() const;
bool loadFile();
Expand All @@ -228,8 +223,7 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
QString mVariantName;
QStringList mVariantList;
bool mFileLoaded;
GradientType mGradientType;
GradientList mPalette;
bool mMultiStops;
};


Expand Down
24 changes: 12 additions & 12 deletions src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent )
: QDialog( parent ), mRamp( ramp )
{

setupUi( this );

connect( btnColor1, SIGNAL( clicked() ), this, SLOT( setColor1() ) );
connect( btnColor2, SIGNAL( clicked() ), this, SLOT( setColor2() ) );

// handle stops
QgsVectorGradientColorRampV2::StopsMap stops = ramp->stops();
QgsGradientStopsList stops = ramp->stops();
groupStops->setChecked( !stops.isEmpty() );

QgsVectorGradientColorRampV2::StopsMap::iterator i;
QList<QTreeWidgetItem *> items;
for ( i = stops.begin(); i != stops.end(); ++i )
for ( QgsGradientStopsList::iterator it = stops.begin();
it != stops.end(); ++it )
{
QStringList lst;
lst << "." << QString::number( i.key()*100, 'f', 0 );
lst << "." << QString::number( it->offset*100, 'f', 0 );
QTreeWidgetItem* item = new QTreeWidgetItem( lst );

setStopColor( item, i.value() );
item->setData( 0, StopOffsetRole, i.key() );
setStopColor( item, it->color );
item->setData( 0, StopOffsetRole, it->offset );

items.append( item );
}
treeStops->clear();
treeStops->insertTopLevelItems( 0, items );
treeStops->resizeColumnToContents( 0 );
treeStops->sortByColumn( 1, Qt::AscendingOrder );
Expand All @@ -63,19 +63,19 @@ QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVecto
void QgsVectorGradientColorRampV2Dialog::updatePreview()
{
// update ramp stops from the tree widget
QgsVectorGradientColorRampV2::StopsMap map;
QgsGradientStopsList stops;
if ( groupStops->isChecked() )
{
int count = treeStops->topLevelItemCount();
for ( int i = 0; i < count; i++ )
{
QTreeWidgetItem* item = treeStops->topLevelItem( i );
double key = item->data( 0, StopOffsetRole ).toDouble();
QColor c = item->data( 0, StopColorRole ).value<QColor>();
map.insert( key, c );
double offset = item->data( 0, StopOffsetRole ).toDouble();
QColor color = item->data( 0, StopColorRole ).value<QColor>();
stops.append( QgsGradientStop( offset, color ) );
}
}
mRamp->setStops( map );
mRamp->setStops( stops );

// generate the preview
QSize size( 300, 40 );
Expand Down
4 changes: 2 additions & 2 deletions tests/src/core/testqgsrasterlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ void TestQgsRasterLayer::colorRamp1()
{
// gradient ramp
QgsVectorGradientColorRampV2* colorRamp = new QgsVectorGradientColorRampV2( QColor( Qt::red ), QColor( Qt::black ) );
QgsVectorGradientColorRampV2::StopsMap stops;
stops[ 0.5 ] = QColor( Qt::white );
QgsGradientStopsList stops;
stops.append( QgsGradientStop( 0.5, QColor( Qt::white ) ) );
colorRamp->setStops( stops );

// QVERIFY( testColorRamp( "raster_colorRamp1", colorRamp, QgsColorRampShader::INTERPOLATED, 5 ) );
Expand Down
4 changes: 2 additions & 2 deletions tests/src/core/testqgsstylev2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ void TestStyleV2::testCreateColorRamps()
{
// gradient ramp
QgsVectorGradientColorRampV2* gradientRamp = new QgsVectorGradientColorRampV2( QColor( Qt::red ), QColor( Qt::blue ) );
QgsVectorGradientColorRampV2::StopsMap stops;
stops[ 0.5 ] = QColor( Qt::white );
QgsGradientStopsList stops;
stops.append( QgsGradientStop( 0.5, QColor( Qt::white ) ) );
gradientRamp->setStops( stops );
QVERIFY( mStyle->addColorRamp( "test_gradient", gradientRamp, true ) );

Expand Down