Skip to content

Commit fc128e8

Browse files
author
mhugent
committedFeb 18, 2006
renamed QgsGraduatedSymRenderer to QgsGraduatedSymbolRenderer
git-svn-id: http://svn.osgeo.org/qgis/trunk@4872 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 548bdbf commit fc128e8

File tree

6 files changed

+34
-35
lines changed

6 files changed

+34
-35
lines changed
 

‎src/gui/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ libqgis_guiHEADERS = \
8686
qgsencodingfiledialog.h \
8787
qgsfillstylewidget.h \
8888
qgsgeomtypedialog.h \
89-
qgsgraduatedsymrenderer.h \
89+
qgsgraduatedsymbolrenderer.h \
9090
qgsgrasydialog.h \
9191
qgshelpviewer.h \
9292
qgsidentifyresults.h \
@@ -198,7 +198,7 @@ libqgis_gui_la_SOURCES = \
198198
qgsencodingfiledialog.cpp \
199199
qgsfillstylewidget.cpp \
200200
qgsgeomtypedialog.cpp \
201-
qgsgraduatedsymrenderer.cpp \
201+
qgsgraduatedsymbolrenderer.cpp \
202202
qgsgrasydialog.cpp \
203203
qgshelpviewer.cpp \
204204
qgsidentifyresults.cpp \

‎src/gui/qgsgraduatedsymrenderer.cpp renamed to ‎src/gui/qgsgraduatedsymbolrenderer.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgssinglesymrenderer.cpp - description
2+
qgssinglesymbolrenderer.cpp - description
33
-------------------
44
begin : Oct 2003
55
copyright : (C) 2003 by Marco Hugentobler
@@ -18,7 +18,7 @@
1818
#include <cfloat>
1919
#include "qgis.h"
2020
#include "qgsfeature.h"
21-
#include "qgsgraduatedsymrenderer.h"
21+
#include "qgsgraduatedsymbolrenderer.h"
2222
#include "qgsgrasydialog.h"
2323
#include "qgslegendsymbologyitem.h"
2424
#include "qgssymbologyutils.h"
@@ -28,14 +28,14 @@
2828
#include <q3picture.h>
2929

3030

31-
QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(QGis::VectorType type)
31+
QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer(QGis::VectorType type)
3232
{
3333
mVectorType=type;
3434
//call superclass method to set up selection colour
3535
initialiseSelectionColor();
3636
}
3737

38-
QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer& other)
38+
QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer(const QgsGraduatedSymbolRenderer& other)
3939
{
4040
mVectorType = other.mVectorType;
4141
mClassificationField = other.mClassificationField;
@@ -46,7 +46,7 @@ QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer&
4646
}
4747
}
4848

49-
QgsGraduatedSymRenderer& QgsGraduatedSymRenderer::operator=(const QgsGraduatedSymRenderer& other)
49+
QgsGraduatedSymbolRenderer& QgsGraduatedSymbolRenderer::operator=(const QgsGraduatedSymbolRenderer& other)
5050
{
5151
if(this != &other)
5252
{
@@ -61,17 +61,17 @@ QgsGraduatedSymRenderer& QgsGraduatedSymRenderer::operator=(const QgsGraduatedSy
6161
}
6262
}
6363

64-
QgsGraduatedSymRenderer::~QgsGraduatedSymRenderer()
64+
QgsGraduatedSymbolRenderer::~QgsGraduatedSymbolRenderer()
6565
{
6666

6767
}
6868

69-
const std::list<QgsSymbol*> QgsGraduatedSymRenderer::symbols() const
69+
const std::list<QgsSymbol*> QgsGraduatedSymbolRenderer::symbols() const
7070
{
7171
return mSymbols;
7272
}
7373

74-
void QgsGraduatedSymRenderer::removeSymbols()
74+
void QgsGraduatedSymbolRenderer::removeSymbols()
7575
{
7676
//free the memory first
7777
for (std::list < QgsSymbol * >::iterator it = mSymbols.begin(); it != mSymbols.end(); ++it)
@@ -83,7 +83,7 @@ void QgsGraduatedSymRenderer::removeSymbols()
8383
mSymbols.clear();
8484
}
8585

86-
void QgsGraduatedSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
86+
void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
8787
double* scalefactor, bool selected, double widthScale)
8888
{
8989
//first find out the value for the classification attribute
@@ -141,7 +141,7 @@ void QgsGraduatedSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixma
141141
}
142142
}
143143

144-
void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
144+
void QgsGraduatedSymbolRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
145145
{
146146
mVectorType = vl.vectorType();
147147
QDomNode classnode = rnode.namedItem("classificationfield");
@@ -162,19 +162,19 @@ void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
162162
vl.setRenderer(this);
163163
}
164164

165-
std::list<int> QgsGraduatedSymRenderer::classificationAttributes() const
165+
std::list<int> QgsGraduatedSymbolRenderer::classificationAttributes() const
166166
{
167167
std::list<int> list;
168168
list.push_back(mClassificationField);
169169
return list;
170170
}
171171

172-
QString QgsGraduatedSymRenderer::name() const
172+
QString QgsGraduatedSymbolRenderer::name() const
173173
{
174174
return "Graduated Symbol";
175175
}
176176

177-
bool QgsGraduatedSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
177+
bool QgsGraduatedSymbolRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
178178
{
179179
bool returnval=true;
180180
QDomElement graduatedsymbol=document.createElement("graduatedsymbol");
@@ -193,8 +193,8 @@ bool QgsGraduatedSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & do
193193
return returnval;
194194
}
195195

196-
QgsRenderer* QgsGraduatedSymRenderer::clone() const
196+
QgsRenderer* QgsGraduatedSymbolRenderer::clone() const
197197
{
198-
QgsGraduatedSymRenderer* r = new QgsGraduatedSymRenderer(*this);
198+
QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer(*this);
199199
return r;
200200
}

‎src/gui/qgsgraduatedsymrenderer.h renamed to ‎src/gui/qgsgraduatedsymbolrenderer.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsgraduatedsymrenderer.h - description
2+
qgsgraduatedsymbolrenderer.h - description
33
-------------------
44
begin : Oct 2003
55
copyright : (C) 2003 by Marco Hugentobler
@@ -16,8 +16,8 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
#ifndef QGSGRADUATEDSYMRENDERER_H
20-
#define QGSGRADUATEDSYMRENDERER_H
19+
#ifndef QGSGRADUATEDSYMBOLRENDERER_H
20+
#define QGSGRADUATEDSYMBOLRENDERER_H
2121

2222
#include <QPixmap>
2323
#include "qgsrenderer.h"
@@ -31,13 +31,13 @@
3131
#include "qgsvectorlayer.h"
3232

3333
/**This class contains the information for graduate symbol rendering*/
34-
class QgsGraduatedSymRenderer: public QgsRenderer
34+
class QgsGraduatedSymbolRenderer: public QgsRenderer
3535
{
3636
public:
37-
QgsGraduatedSymRenderer(QGis::VectorType type);
38-
QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer& other);
39-
QgsGraduatedSymRenderer& operator=(const QgsGraduatedSymRenderer& other);
40-
virtual ~QgsGraduatedSymRenderer();
37+
QgsGraduatedSymbolRenderer(QGis::VectorType type);
38+
QgsGraduatedSymbolRenderer(const QgsGraduatedSymbolRenderer& other);
39+
QgsGraduatedSymbolRenderer& operator=(const QgsGraduatedSymbolRenderer& other);
40+
virtual ~QgsGraduatedSymbolRenderer();
4141
/**Adds a new item
4242
\param sy a pointer to the QgsSymbol to be inserted. It has to be created using the new operator and is automatically destroyed when 'removeItems' is called or when this object is destroyed*/
4343
void addSymbol(QgsSymbol* sy);
@@ -78,22 +78,22 @@ class QgsGraduatedSymRenderer: public QgsRenderer
7878

7979
};
8080

81-
inline void QgsGraduatedSymRenderer::addSymbol(QgsSymbol* sy)
81+
inline void QgsGraduatedSymbolRenderer::addSymbol(QgsSymbol* sy)
8282
{
8383
mSymbols.push_back(sy);
8484
}
8585

86-
inline int QgsGraduatedSymRenderer::classificationField() const
86+
inline int QgsGraduatedSymbolRenderer::classificationField() const
8787
{
8888
return mClassificationField;
8989
}
9090

91-
inline void QgsGraduatedSymRenderer::setClassificationField(int field)
91+
inline void QgsGraduatedSymbolRenderer::setClassificationField(int field)
9292
{
9393
mClassificationField=field;
9494
}
9595

96-
inline bool QgsGraduatedSymRenderer::needsAttributes() const
96+
inline bool QgsGraduatedSymbolRenderer::needsAttributes() const
9797
{
9898
return true;
9999
}

‎src/gui/qgsgrasydialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "qgsgrasydialog.h"
2020
#include "qgsfield.h"
21-
#include "qgsgraduatedsymrenderer.h"
21+
#include "qgsgraduatedsymbolrenderer.h"
2222
#include "qgsludialog.h"
2323
#include "qgsvectordataprovider.h"
2424
#include "qgsvectorlayer.h"
@@ -67,7 +67,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(
6767
modeComboBox->insertItem("Equal Interval");
6868

6969
//restore the correct settings
70-
const QgsGraduatedSymRenderer* renderer = dynamic_cast < const QgsGraduatedSymRenderer * >(layer->renderer());
70+
const QgsGraduatedSymbolRenderer* renderer = dynamic_cast < const QgsGraduatedSymbolRenderer * >(layer->renderer());
7171

7272
if (renderer)
7373
{
@@ -154,7 +154,7 @@ void QgsGraSyDialog::apply()
154154
return;
155155
}
156156

157-
QgsGraduatedSymRenderer* renderer = new QgsGraduatedSymRenderer(mVectorLayer->vectorType());
157+
QgsGraduatedSymbolRenderer* renderer = new QgsGraduatedSymbolRenderer(mVectorLayer->vectorType());
158158

159159
for (int item=0;item<mClassBreakBox->count();++item)
160160
{

‎src/gui/qgsproject.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ using namespace std;
2727
#include "qgsrect.h"
2828
#include "qgsvectorlayer.h"
2929
#include "qgsrasterlayer.h"
30-
#include "qgsgraduatedsymrenderer.h"
3130
#include "qgscontinuouscolrenderer.h"
3231
#include "qgsmaplayerregistry.h"
3332
#include "qgsexception.h"

‎src/gui/qgsvectorlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#include "qgsvectorlayerproperties.h"
7070
#include "qgsrenderer.h"
7171
#include "qgssinglesymbolrenderer.h"
72-
#include "qgsgraduatedsymrenderer.h"
72+
#include "qgsgraduatedsymbolrenderer.h"
7373
#include "qgscontinuouscolrenderer.h"
7474
#include "qgsuniquevalrenderer.h"
7575
#include "qgsrenderitem.h"
@@ -2267,7 +2267,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )
22672267
}
22682268
else if (!graduatednode.isNull())
22692269
{
2270-
renderer = new QgsGraduatedSymRenderer(vectorType());
2270+
renderer = new QgsGraduatedSymbolRenderer(vectorType());
22712271
renderer->readXML(graduatednode, *this);
22722272
}
22732273
else if (!continuousnode.isNull())

0 commit comments

Comments
 (0)
Please sign in to comment.