Skip to content

Commit

Permalink
renamed QgsGraduatedSymRenderer to QgsGraduatedSymbolRenderer
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4872 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent 04e18bf commit ccbcd52
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 35 deletions.
4 changes: 2 additions & 2 deletions src/gui/Makefile.am
View file
Expand Up @@ -86,7 +86,7 @@ libqgis_guiHEADERS = \
qgsencodingfiledialog.h \
qgsfillstylewidget.h \
qgsgeomtypedialog.h \
qgsgraduatedsymrenderer.h \
qgsgraduatedsymbolrenderer.h \
qgsgrasydialog.h \
qgshelpviewer.h \
qgsidentifyresults.h \
Expand Down Expand Up @@ -198,7 +198,7 @@ libqgis_gui_la_SOURCES = \
qgsencodingfiledialog.cpp \
qgsfillstylewidget.cpp \
qgsgeomtypedialog.cpp \
qgsgraduatedsymrenderer.cpp \
qgsgraduatedsymbolrenderer.cpp \
qgsgrasydialog.cpp \
qgshelpviewer.cpp \
qgsidentifyresults.cpp \
Expand Down
30 changes: 15 additions & 15 deletions src/gui/qgsgraduatedsymrenderer.cpp → src/gui/qgsgraduatedsymbolrenderer.cpp
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgssinglesymrenderer.cpp - description
qgssinglesymbolrenderer.cpp - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -18,7 +18,7 @@
#include <cfloat>
#include "qgis.h"
#include "qgsfeature.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgsgrasydialog.h"
#include "qgslegendsymbologyitem.h"
#include "qgssymbologyutils.h"
Expand All @@ -28,14 +28,14 @@
#include <q3picture.h>


QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(QGis::VectorType type)
QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer(QGis::VectorType type)
{
mVectorType=type;
//call superclass method to set up selection colour
initialiseSelectionColor();
}

QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer& other)
QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer(const QgsGraduatedSymbolRenderer& other)
{
mVectorType = other.mVectorType;
mClassificationField = other.mClassificationField;
Expand All @@ -46,7 +46,7 @@ QgsGraduatedSymRenderer::QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer&
}
}

QgsGraduatedSymRenderer& QgsGraduatedSymRenderer::operator=(const QgsGraduatedSymRenderer& other)
QgsGraduatedSymbolRenderer& QgsGraduatedSymbolRenderer::operator=(const QgsGraduatedSymbolRenderer& other)
{
if(this != &other)
{
Expand All @@ -61,17 +61,17 @@ QgsGraduatedSymRenderer& QgsGraduatedSymRenderer::operator=(const QgsGraduatedSy
}
}

QgsGraduatedSymRenderer::~QgsGraduatedSymRenderer()
QgsGraduatedSymbolRenderer::~QgsGraduatedSymbolRenderer()
{

}

const std::list<QgsSymbol*> QgsGraduatedSymRenderer::symbols() const
const std::list<QgsSymbol*> QgsGraduatedSymbolRenderer::symbols() const
{
return mSymbols;
}

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

void QgsGraduatedSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
double* scalefactor, bool selected, double widthScale)
{
//first find out the value for the classification attribute
Expand Down Expand Up @@ -141,7 +141,7 @@ void QgsGraduatedSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixma
}
}

void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
void QgsGraduatedSymbolRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
{
mVectorType = vl.vectorType();
QDomNode classnode = rnode.namedItem("classificationfield");
Expand All @@ -162,19 +162,19 @@ void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
vl.setRenderer(this);
}

std::list<int> QgsGraduatedSymRenderer::classificationAttributes() const
std::list<int> QgsGraduatedSymbolRenderer::classificationAttributes() const
{
std::list<int> list;
list.push_back(mClassificationField);
return list;
}

QString QgsGraduatedSymRenderer::name() const
QString QgsGraduatedSymbolRenderer::name() const
{
return "Graduated Symbol";
}

bool QgsGraduatedSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
bool QgsGraduatedSymbolRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
{
bool returnval=true;
QDomElement graduatedsymbol=document.createElement("graduatedsymbol");
Expand All @@ -193,8 +193,8 @@ bool QgsGraduatedSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & do
return returnval;
}

QgsRenderer* QgsGraduatedSymRenderer::clone() const
QgsRenderer* QgsGraduatedSymbolRenderer::clone() const
{
QgsGraduatedSymRenderer* r = new QgsGraduatedSymRenderer(*this);
QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer(*this);
return r;
}
24 changes: 12 additions & 12 deletions src/gui/qgsgraduatedsymrenderer.h → src/gui/qgsgraduatedsymbolrenderer.h
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgsgraduatedsymrenderer.h - description
qgsgraduatedsymbolrenderer.h - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,8 +16,8 @@
***************************************************************************/
/* $Id$ */

#ifndef QGSGRADUATEDSYMRENDERER_H
#define QGSGRADUATEDSYMRENDERER_H
#ifndef QGSGRADUATEDSYMBOLRENDERER_H
#define QGSGRADUATEDSYMBOLRENDERER_H

#include <QPixmap>
#include "qgsrenderer.h"
Expand All @@ -31,13 +31,13 @@
#include "qgsvectorlayer.h"

/**This class contains the information for graduate symbol rendering*/
class QgsGraduatedSymRenderer: public QgsRenderer
class QgsGraduatedSymbolRenderer: public QgsRenderer
{
public:
QgsGraduatedSymRenderer(QGis::VectorType type);
QgsGraduatedSymRenderer(const QgsGraduatedSymRenderer& other);
QgsGraduatedSymRenderer& operator=(const QgsGraduatedSymRenderer& other);
virtual ~QgsGraduatedSymRenderer();
QgsGraduatedSymbolRenderer(QGis::VectorType type);
QgsGraduatedSymbolRenderer(const QgsGraduatedSymbolRenderer& other);
QgsGraduatedSymbolRenderer& operator=(const QgsGraduatedSymbolRenderer& other);
virtual ~QgsGraduatedSymbolRenderer();
/**Adds a new item
\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*/
void addSymbol(QgsSymbol* sy);
Expand Down Expand Up @@ -78,22 +78,22 @@ class QgsGraduatedSymRenderer: public QgsRenderer

};

inline void QgsGraduatedSymRenderer::addSymbol(QgsSymbol* sy)
inline void QgsGraduatedSymbolRenderer::addSymbol(QgsSymbol* sy)
{
mSymbols.push_back(sy);
}

inline int QgsGraduatedSymRenderer::classificationField() const
inline int QgsGraduatedSymbolRenderer::classificationField() const
{
return mClassificationField;
}

inline void QgsGraduatedSymRenderer::setClassificationField(int field)
inline void QgsGraduatedSymbolRenderer::setClassificationField(int field)
{
mClassificationField=field;
}

inline bool QgsGraduatedSymRenderer::needsAttributes() const
inline bool QgsGraduatedSymbolRenderer::needsAttributes() const
{
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsgrasydialog.cpp
View file
Expand Up @@ -18,7 +18,7 @@

#include "qgsgrasydialog.h"
#include "qgsfield.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgsludialog.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
Expand Down Expand Up @@ -67,7 +67,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(
modeComboBox->insertItem("Equal Interval");

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

if (renderer)
{
Expand Down Expand Up @@ -154,7 +154,7 @@ void QgsGraSyDialog::apply()
return;
}

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

for (int item=0;item<mClassBreakBox->count();++item)
{
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsproject.cpp
View file
Expand Up @@ -27,7 +27,6 @@ using namespace std;
#include "qgsrect.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgscontinuouscolrenderer.h"
#include "qgsmaplayerregistry.h"
#include "qgsexception.h"
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsvectorlayer.cpp
View file
Expand Up @@ -69,7 +69,7 @@
#include "qgsvectorlayerproperties.h"
#include "qgsrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgscontinuouscolrenderer.h"
#include "qgsuniquevalrenderer.h"
#include "qgsrenderitem.h"
Expand Down Expand Up @@ -2267,7 +2267,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )
}
else if (!graduatednode.isNull())
{
renderer = new QgsGraduatedSymRenderer(vectorType());
renderer = new QgsGraduatedSymbolRenderer(vectorType());
renderer->readXML(graduatednode, *this);
}
else if (!continuousnode.isNull())
Expand Down

0 comments on commit ccbcd52

Please sign in to comment.