Skip to content

Commit d34fb39

Browse files
author
wonder
committed
categorized and graduated renderers remember their source symbol and color ramp
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11918 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 5e9a058 commit d34fb39

10 files changed

Lines changed: 290 additions & 56 deletions

‎src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "qgssymbolv2.h"
55
#include "qgssymbollayerv2utils.h"
6+
#include "qgsvectorcolorrampv2.h"
67

78
#include "qgsfeature.h"
89
#include "qgslogger.h"
@@ -63,7 +64,11 @@ QString QgsRendererCategoryV2::dump()
6364
///////////////////
6465

6566
QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2(QString attrName, QgsCategoryList categories)
66-
: QgsFeatureRendererV2(RendererCategorizedSymbol), mAttrName(attrName), mCategories(categories)
67+
: QgsFeatureRendererV2(RendererCategorizedSymbol),
68+
mAttrName(attrName),
69+
mCategories(categories),
70+
mSourceSymbol(NULL),
71+
mSourceColorRamp(NULL)
6772
{
6873
for (int i = 0; i < mCategories.count(); ++i)
6974
{
@@ -80,6 +85,8 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2(QString attrName,
8085
QgsCategorizedSymbolRendererV2::~QgsCategorizedSymbolRendererV2()
8186
{
8287
mCategories.clear(); // this should also call destructors of symbols
88+
delete mSourceSymbol;
89+
delete mSourceColorRamp;
8390
}
8491

8592
void QgsCategorizedSymbolRendererV2::rebuildHash()
@@ -202,6 +209,10 @@ QString QgsCategorizedSymbolRendererV2::dump()
202209
QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::clone()
203210
{
204211
QgsCategorizedSymbolRendererV2* r = new QgsCategorizedSymbolRendererV2( mAttrName, mCategories );
212+
if (mSourceSymbol)
213+
r->setSourceSymbol(mSourceSymbol->clone());
214+
if (mSourceColorRamp)
215+
r->setSourceColorRamp(mSourceColorRamp->clone());
205216
r->setUsingSymbolLevels( usingSymbolLevels() );
206217
return r;
207218
}
@@ -251,6 +262,25 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create(QDomElement& elemen
251262
// delete symbols if there are any more
252263
QgsSymbolLayerV2Utils::clearSymbolMap(symbolMap);
253264

265+
// try to load source symbol (optional)
266+
QDomElement sourceSymbolElem = element.firstChildElement("source-symbol");
267+
if (!sourceSymbolElem.isNull())
268+
{
269+
QgsSymbolV2Map sourceSymbolMap = QgsSymbolLayerV2Utils::loadSymbols(sourceSymbolElem);
270+
if (sourceSymbolMap.contains("0"))
271+
{
272+
r->setSourceSymbol( sourceSymbolMap.take("0") );
273+
}
274+
QgsSymbolLayerV2Utils::clearSymbolMap(sourceSymbolMap);
275+
}
276+
277+
// try to load color ramp (optional)
278+
QDomElement sourceColorRampElem = element.firstChildElement("colorramp");
279+
if (!sourceColorRampElem.isNull() && sourceColorRampElem.attribute("name") == "[source]")
280+
{
281+
r->setSourceColorRamp( QgsSymbolLayerV2Utils::loadColorRamp(sourceColorRampElem) );
282+
}
283+
254284
// TODO: symbol levels
255285
return r;
256286
}
@@ -283,8 +313,44 @@ QDomElement QgsCategorizedSymbolRendererV2::save(QDomDocument& doc)
283313
rendererElem.appendChild(catsElem);
284314

285315
// save symbols
286-
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, doc);
316+
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, "symbols", doc);
287317
rendererElem.appendChild(symbolsElem);
288318

319+
// save source symbol
320+
if (mSourceSymbol)
321+
{
322+
QgsSymbolV2Map sourceSymbols;
323+
sourceSymbols.insert("0", mSourceSymbol);
324+
QDomElement sourceSymbolElem = QgsSymbolLayerV2Utils::saveSymbols(sourceSymbols, "source-symbol", doc);
325+
rendererElem.appendChild(sourceSymbolElem);
326+
}
327+
328+
// save source color ramp
329+
if (mSourceColorRamp)
330+
{
331+
QDomElement colorRampElem = QgsSymbolLayerV2Utils::saveColorRamp("[source]", mSourceColorRamp, doc);
332+
rendererElem.appendChild(colorRampElem);
333+
}
334+
289335
return rendererElem;
290336
}
337+
338+
QgsSymbolV2* QgsCategorizedSymbolRendererV2::sourceSymbol()
339+
{
340+
return mSourceSymbol;
341+
}
342+
void QgsCategorizedSymbolRendererV2::setSourceSymbol(QgsSymbolV2* sym)
343+
{
344+
delete mSourceSymbol;
345+
mSourceSymbol = sym;
346+
}
347+
348+
QgsVectorColorRampV2* QgsCategorizedSymbolRendererV2::sourceColorRamp()
349+
{
350+
return mSourceColorRamp;
351+
}
352+
void QgsCategorizedSymbolRendererV2::setSourceColorRamp(QgsVectorColorRampV2* ramp)
353+
{
354+
delete mSourceColorRamp;
355+
mSourceColorRamp = ramp;
356+
}

‎src/core/symbology-ng/qgscategorizedsymbolrendererv2.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <QHash>
77

8+
class QgsVectorColorRampV2;
89

910
class QgsRendererCategoryV2
1011
{
@@ -78,9 +79,17 @@ class QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
7879
//! store renderer info to XML element
7980
virtual QDomElement save(QDomDocument& doc);
8081

82+
QgsSymbolV2* sourceSymbol();
83+
void setSourceSymbol(QgsSymbolV2* sym);
84+
85+
QgsVectorColorRampV2* sourceColorRamp();
86+
void setSourceColorRamp(QgsVectorColorRampV2* ramp);
87+
8188
protected:
8289
QgsCategoryList mCategories;
8390
QString mAttrName;
91+
QgsSymbolV2* mSourceSymbol;
92+
QgsVectorColorRampV2* mSourceColorRamp;
8493

8594
//! attribute index (derived from attribute name in startRender)
8695
int mAttrNum;

‎src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "qgssymbolv2.h"
55
#include "qgssymbollayerv2utils.h"
6+
#include "qgsvectorcolorrampv2.h"
67

78
#include "qgsfeature.h"
89
#include "qgslogger.h"
@@ -68,14 +69,21 @@ QString QgsRendererRangeV2::dump()
6869

6970

7071
QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2(QString attrName, QgsRangeList ranges)
71-
: QgsFeatureRendererV2(RendererGraduatedSymbol), mAttrName(attrName), mRanges(ranges), mMode(Custom)
72+
: QgsFeatureRendererV2(RendererGraduatedSymbol),
73+
mAttrName(attrName),
74+
mRanges(ranges),
75+
mMode(Custom),
76+
mSourceSymbol(NULL),
77+
mSourceColorRamp(NULL)
7278
{
7379
// TODO: check ranges for sanity (NULL symbols, invalid ranges)
7480
}
7581

7682
QgsGraduatedSymbolRendererV2::~QgsGraduatedSymbolRendererV2()
7783
{
7884
mRanges.clear(); // should delete all the symbols
85+
delete mSourceSymbol;
86+
delete mSourceColorRamp;
7987
}
8088

8189
QgsSymbolV2* QgsGraduatedSymbolRendererV2::symbolForValue(double value)
@@ -155,6 +163,10 @@ QString QgsGraduatedSymbolRendererV2::dump()
155163
QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::clone()
156164
{
157165
QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( mAttrName, mRanges );
166+
if (mSourceSymbol)
167+
r->setSourceSymbol(mSourceSymbol->clone());
168+
if (mSourceColorRamp)
169+
r->setSourceColorRamp(mSourceColorRamp->clone());
158170
r->setUsingSymbolLevels( usingSymbolLevels() );
159171
return r;
160172
}
@@ -275,7 +287,11 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(
275287
ranges.append( QgsRendererRangeV2(lower, upper, newSymbol, label) );
276288
}
277289

278-
return new QgsGraduatedSymbolRendererV2( attrName, ranges );
290+
QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( attrName, ranges );
291+
r->setSourceSymbol( symbol->clone() );
292+
r->setSourceColorRamp( ramp->clone() );
293+
r->setMode(mode);
294+
return r;
279295
}
280296

281297

@@ -318,6 +334,36 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create(QDomElement& element)
318334
// delete symbols if there are any more
319335
QgsSymbolLayerV2Utils::clearSymbolMap(symbolMap);
320336

337+
// try to load source symbol (optional)
338+
QDomElement sourceSymbolElem = element.firstChildElement("source-symbol");
339+
if (!sourceSymbolElem.isNull())
340+
{
341+
QgsSymbolV2Map sourceSymbolMap = QgsSymbolLayerV2Utils::loadSymbols(sourceSymbolElem);
342+
if (sourceSymbolMap.contains("0"))
343+
{
344+
r->setSourceSymbol( sourceSymbolMap.take("0") );
345+
}
346+
QgsSymbolLayerV2Utils::clearSymbolMap(sourceSymbolMap);
347+
}
348+
349+
// try to load color ramp (optional)
350+
QDomElement sourceColorRampElem = element.firstChildElement("colorramp");
351+
if (!sourceColorRampElem.isNull() && sourceColorRampElem.attribute("name") == "[source]")
352+
{
353+
r->setSourceColorRamp( QgsSymbolLayerV2Utils::loadColorRamp(sourceColorRampElem) );
354+
}
355+
356+
// try to load mode
357+
QDomElement modeElem = element.firstChildElement("mode");
358+
if (!modeElem.isNull())
359+
{
360+
QString modeString = modeElem.attribute("name");
361+
if (modeString == "equal")
362+
r->setMode(EqualInterval);
363+
else if (modeString == "quantile")
364+
r->setMode(Quantile);
365+
}
366+
321367
// TODO: symbol levels
322368
return r;
323369
}
@@ -351,8 +397,57 @@ QDomElement QgsGraduatedSymbolRendererV2::save(QDomDocument& doc)
351397
rendererElem.appendChild(rangesElem);
352398

353399
// save symbols
354-
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, doc);
400+
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, "symbols", doc);
355401
rendererElem.appendChild(symbolsElem);
356402

403+
// save source symbol
404+
if (mSourceSymbol)
405+
{
406+
QgsSymbolV2Map sourceSymbols;
407+
sourceSymbols.insert("0", mSourceSymbol);
408+
QDomElement sourceSymbolElem = QgsSymbolLayerV2Utils::saveSymbols(sourceSymbols, "source-symbol", doc);
409+
rendererElem.appendChild(sourceSymbolElem);
410+
}
411+
412+
// save source color ramp
413+
if (mSourceColorRamp)
414+
{
415+
QDomElement colorRampElem = QgsSymbolLayerV2Utils::saveColorRamp("[source]", mSourceColorRamp, doc);
416+
rendererElem.appendChild(colorRampElem);
417+
}
418+
419+
// save mode
420+
QString modeString;
421+
if (mMode == EqualInterval)
422+
modeString = "equal";
423+
else if (mMode == Quantile)
424+
modeString = "quantile";
425+
if (!modeString.isEmpty())
426+
{
427+
QDomElement modeElem = doc.createElement("mode");
428+
modeElem.setAttribute("name", modeString);
429+
rendererElem.appendChild(modeElem);
430+
}
431+
357432
return rendererElem;
358433
}
434+
435+
QgsSymbolV2* QgsGraduatedSymbolRendererV2::sourceSymbol()
436+
{
437+
return mSourceSymbol;
438+
}
439+
void QgsGraduatedSymbolRendererV2::setSourceSymbol(QgsSymbolV2* sym)
440+
{
441+
delete mSourceSymbol;
442+
mSourceSymbol = sym;
443+
}
444+
445+
QgsVectorColorRampV2* QgsGraduatedSymbolRendererV2::sourceColorRamp()
446+
{
447+
return mSourceColorRamp;
448+
}
449+
void QgsGraduatedSymbolRendererV2::setSourceColorRamp(QgsVectorColorRampV2* ramp)
450+
{
451+
delete mSourceColorRamp;
452+
mSourceColorRamp = ramp;
453+
}

‎src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,18 @@ class QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
8787
//! store renderer info to XML element
8888
virtual QDomElement save(QDomDocument& doc);
8989

90+
QgsSymbolV2* sourceSymbol();
91+
void setSourceSymbol(QgsSymbolV2* sym);
92+
93+
QgsVectorColorRampV2* sourceColorRamp();
94+
void setSourceColorRamp(QgsVectorColorRampV2* ramp);
95+
9096
protected:
9197
QgsRangeList mRanges;
9298
QString mAttrName;
9399
Mode mMode;
100+
QgsSymbolV2* mSourceSymbol;
101+
QgsVectorColorRampV2* mSourceColorRamp;
94102

95103
//! attribute index (derived from attribute name in startRender)
96104
int mAttrNum;

‎src/core/symbology-ng/qgssinglesymbolrendererv2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ QDomElement QgsSingleSymbolRendererV2::save(QDomDocument& doc)
9595

9696
QgsSymbolV2Map symbols;
9797
symbols["0"] = mSymbol;
98-
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, doc);
98+
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(symbols, "symbols", doc);
9999
rendererElem.appendChild(symbolsElem);
100100

101101
return rendererElem;

‎src/core/symbology-ng/qgsstylev2.cpp‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ bool QgsStyleV2::load(QString filename)
205205
{
206206
if (e.tagName() == "colorramp")
207207
{
208-
QgsVectorColorRampV2* ramp = loadColorRamp(e);
208+
QgsVectorColorRampV2* ramp = QgsSymbolLayerV2Utils::loadColorRamp(e);
209209
if (ramp != NULL)
210210
addColorRamp(e.attribute("name"), ramp);
211211
}
@@ -220,25 +220,6 @@ bool QgsStyleV2::load(QString filename)
220220
}
221221

222222

223-
QgsVectorColorRampV2* QgsStyleV2::loadColorRamp(QDomElement& element)
224-
{
225-
QString rampType = element.attribute("type");
226-
227-
// parse properties
228-
QgsStringMap props = QgsSymbolLayerV2Utils::parseProperties(element);
229-
230-
if (rampType == "gradient")
231-
return QgsVectorGradientColorRampV2::create(props);
232-
else if (rampType == "random")
233-
return QgsVectorRandomColorRampV2::create(props);
234-
else
235-
{
236-
QgsDebugMsg("unknown colorramp type " + rampType);
237-
return NULL;
238-
}
239-
}
240-
241-
242223

243224
bool QgsStyleV2::save(QString filename)
244225
{
@@ -251,14 +232,14 @@ bool QgsStyleV2::save(QString filename)
251232
root.setAttribute("version", STYLE_CURRENT_VERSION);
252233
doc.appendChild(root);
253234

254-
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(mSymbols, doc);
235+
QDomElement symbolsElem = QgsSymbolLayerV2Utils::saveSymbols(mSymbols, "symbols", doc);
255236

256237
QDomElement rampsElem = doc.createElement("colorramps");
257238

258239
// save color ramps
259240
for (QMap<QString, QgsVectorColorRampV2*>::iterator itr = mColorRamps.begin(); itr != mColorRamps.end(); ++itr)
260241
{
261-
QDomElement rampEl = saveColorRamp(itr.key(), itr.value(), doc);
242+
QDomElement rampEl = QgsSymbolLayerV2Utils::saveColorRamp(itr.key(), itr.value(), doc);
262243
rampsElem.appendChild(rampEl);
263244
}
264245

@@ -278,13 +259,3 @@ bool QgsStyleV2::save(QString filename)
278259

279260
return true;
280261
}
281-
282-
QDomElement QgsStyleV2::saveColorRamp(QString name, QgsVectorColorRampV2* ramp, QDomDocument& doc)
283-
{
284-
QDomElement rampEl = doc.createElement("colorramp");
285-
rampEl.setAttribute("type", ramp->type());
286-
rampEl.setAttribute("name", name);
287-
288-
QgsSymbolLayerV2Utils::saveProperties(ramp->properties(), doc, rampEl);
289-
return rampEl;
290-
}

‎src/core/symbology-ng/qgsstylev2.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ class QgsStyleV2
7878

7979
protected:
8080

81-
QgsVectorColorRampV2* loadColorRamp(QDomElement& element);
82-
83-
QDomElement saveColorRamp(QString name, QgsVectorColorRampV2* ramp, QDomDocument& doc);
84-
8581
QgsSymbolV2Map mSymbols;
8682
QgsVectorColorRampV2Map mColorRamps;
8783

0 commit comments

Comments
 (0)