Skip to content

Commit

Permalink
Renamed QgsSingleSymRenderer to QgsSingleSymbolRenderer
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4870 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent 8228faa commit 60effd6
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 37 deletions.
3 changes: 2 additions & 1 deletion src/gui/Makefile.am
View file
Expand Up @@ -118,6 +118,7 @@ libqgis_guiHEADERS = \
qgsrubberband.h \
qgsrunprocess.h \
qgsserversourceselect.h \
qgssinglesymbolrenderer.h \
qgssisydialog.h \
qgsspatialrefsys.h \
qgsuniquevalrenderer.h \
Expand Down Expand Up @@ -228,7 +229,7 @@ libqgis_gui_la_SOURCES = \
qgsrubberband.cpp \
qgsrunprocess.cpp \
qgsserversourceselect.cpp \
qgssinglesymrenderer.cpp \
qgssinglesymbolrenderer.cpp \
qgssisydialog.cpp \
qgsspatialrefsys.cpp \
qgsuniquevalrenderer.cpp \
Expand Down
10 changes: 5 additions & 5 deletions src/gui/qgisapp.cpp
View file
Expand Up @@ -115,7 +115,7 @@
#include "qgsrasterlayerproperties.h"
#include "qgsrect.h"
#include "qgsserversourceselect.h"
#include "qgssinglesymrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgsvectorfilewriter.h"
#include "qgsvectorlayer.h"
#include "../../plugins/qgisplugin.h"
Expand Down Expand Up @@ -1725,7 +1725,7 @@ bool QgisApp::addLayer(QFileInfo const & vectorFile)
// XXX QgsProject::read() (If layers added via that.)

//add single symbol renderer as default
QgsSingleSymRenderer *renderer = new QgsSingleSymRenderer(layer->vectorType());
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(layer->vectorType());

Q_CHECK_PTR( renderer );

Expand Down Expand Up @@ -1861,7 +1861,7 @@ bool QgisApp::addLayer(QStringList const &theLayerQStringList, const QString& en
// XXX now taken care of in legend layer->initContextMenu(this);

//add single symbol renderer as default
QgsSingleSymRenderer *renderer = new QgsSingleSymRenderer(layer->vectorType());
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(layer->vectorType());

Q_CHECK_PTR( renderer );

Expand Down Expand Up @@ -2002,7 +2002,7 @@ void QgisApp::addDatabaseLayer()
layer->setVisible(mAddedLayersHidden);

// give it a random color
QgsSingleSymRenderer *renderer = new QgsSingleSymRenderer(layer->vectorType()); // add single symbol renderer as default
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(layer->vectorType()); // add single symbol renderer as default
layer->setRenderer(renderer);

// register this layer with the central layers registry
Expand Down Expand Up @@ -4744,7 +4744,7 @@ void QgisApp::addVectorLayer(QString vectorLayerPath, QString baseName, QString
// now taken care of in legend layer->initContextMenu(this);

// give it a random color
QgsSingleSymRenderer *renderer = new QgsSingleSymRenderer(layer->vectorType()); //add single symbol renderer as default
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(layer->vectorType()); //add single symbol renderer as default
layer->setRenderer(renderer);
// add it to the mapcanvas collection
// mMapCanvas->addLayer(layer); No longer necessary since adding to registry will add to canvas
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 "qgssinglesymrenderer.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgscontinuouscolrenderer.h"
#include "qgsmaplayerregistry.h"
Expand Down
30 changes: 15 additions & 15 deletions src/gui/qgssinglesymrenderer.cpp → src/gui/qgssinglesymbolrenderer.cpp
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgssinglesymrenderer.cpp - description
qgssinglesymbolrenderer.cpp - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,7 +16,7 @@
***************************************************************************/
/* $Id$ */
#include "qgis.h"
#include "qgssinglesymrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgsfeature.h"
#include "qgis.h"
#include "qgsvectorlayer.h"
Expand All @@ -30,7 +30,7 @@
#include <QPainter>
#include <QPixmap>

QgsSingleSymRenderer::QgsSingleSymRenderer(QGis::VectorType type)
QgsSingleSymbolRenderer::QgsSingleSymbolRenderer(QGis::VectorType type)
{
mVectorType=type;
//call superclass method to set up selection colour
Expand Down Expand Up @@ -58,13 +58,13 @@ QgsSingleSymRenderer::QgsSingleSymRenderer(QGis::VectorType type)
mSymbol=sy;
}

QgsSingleSymRenderer::QgsSingleSymRenderer(const QgsSingleSymRenderer& other)
QgsSingleSymbolRenderer::QgsSingleSymbolRenderer(const QgsSingleSymbolRenderer& other)
{
mVectorType = other.mVectorType;
mSymbol = new QgsSymbol(*other.mSymbol);
}

QgsSingleSymRenderer& QgsSingleSymRenderer::operator=(const QgsSingleSymRenderer& other)
QgsSingleSymbolRenderer& QgsSingleSymbolRenderer::operator=(const QgsSingleSymbolRenderer& other)
{
if(this!=&other)
{
Expand All @@ -74,18 +74,18 @@ QgsSingleSymRenderer& QgsSingleSymRenderer::operator=(const QgsSingleSymRenderer
}
}

QgsSingleSymRenderer::~QgsSingleSymRenderer()
QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer()
{
delete mSymbol;
}

void QgsSingleSymRenderer::addSymbol(QgsSymbol* sy)
void QgsSingleSymbolRenderer::addSymbol(QgsSymbol* sy)
{
delete mSymbol;
mSymbol=sy;
}

void QgsSingleSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
void QgsSingleSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
double* scalefactor, bool selected, double widthScale)
{
// Point
Expand Down Expand Up @@ -119,7 +119,7 @@ void QgsSingleSymRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap*
}
}

void QgsSingleSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
void QgsSingleSymbolRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
{
mVectorType = vl.vectorType();
QgsSymbol* sy = new QgsSymbol(mVectorType);
Expand All @@ -141,7 +141,7 @@ void QgsSingleSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl)
vl.setRenderer(this);
}

bool QgsSingleSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
bool QgsSingleSymbolRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
{
bool returnval=false;
QDomElement singlesymbol=document.createElement("singlesymbol");
Expand All @@ -154,26 +154,26 @@ bool QgsSingleSymRenderer::writeXML( QDomNode & layer_node, QDomDocument & docum
}


std::list<int> QgsSingleSymRenderer::classificationAttributes() const
std::list<int> QgsSingleSymbolRenderer::classificationAttributes() const
{
std::list<int> list;
return list;//return an empty list
}

QString QgsSingleSymRenderer::name() const
QString QgsSingleSymbolRenderer::name() const
{
return "Single Symbol";
}

const std::list<QgsSymbol*> QgsSingleSymRenderer::symbols() const
const std::list<QgsSymbol*> QgsSingleSymbolRenderer::symbols() const
{
std::list<QgsSymbol*> list;
list.push_back(mSymbol);
return list;
}

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

#ifndef QGSSINGLESYMRENDERER_H
#define QGSSINGLESYMRENDERER_H
#ifndef QGSSINGLESYMBOLRENDERER_H
#define QGSSINGLESYMBOLRENDERER_H

#include "qgsrenderer.h"
#include "qgsrenderitem.h"
Expand All @@ -30,13 +30,13 @@ class QPixmap;
class QgsFeature;

/**Render class to display all the features with a single QgsSymbol*/
class QgsSingleSymRenderer: public QgsRenderer
class QgsSingleSymbolRenderer: public QgsRenderer
{
public:
QgsSingleSymRenderer(QGis::VectorType type);
QgsSingleSymRenderer(const QgsSingleSymRenderer& other);
QgsSingleSymRenderer& operator=(const QgsSingleSymRenderer& other);
virtual ~QgsSingleSymRenderer();
QgsSingleSymbolRenderer(QGis::VectorType type);
QgsSingleSymbolRenderer(const QgsSingleSymbolRenderer& other);
QgsSingleSymbolRenderer& operator=(const QgsSingleSymbolRenderer& other);
virtual ~QgsSingleSymbolRenderer();
/**Replaces the current mSymbol by sy*/
void addSymbol(QgsSymbol* sy);
/*Returns a pointer to mSymbol*/
Expand Down Expand Up @@ -67,12 +67,12 @@ class QgsSingleSymRenderer: public QgsRenderer
QgsSymbol* mSymbol;
};

inline const QgsSymbol* QgsSingleSymRenderer::symbol() const
inline const QgsSymbol* QgsSingleSymbolRenderer::symbol() const
{
return mSymbol;
}

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

#include "qgssisydialog.h"
#include "qgsmarkercatalogue.h"
#include "qgssinglesymrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgssvgcache.h"
#include "qgssymbol.h"
#include "qgssymbologyutils.h"
Expand Down Expand Up @@ -105,7 +105,7 @@ QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(la

if (mVectorLayer)
{
const QgsSingleSymRenderer *renderer=dynamic_cast<const QgsSingleSymRenderer*>(mVectorLayer->renderer());
const QgsSingleSymbolRenderer *renderer=dynamic_cast<const QgsSingleSymbolRenderer*>(mVectorLayer->renderer());

if (renderer)
{
Expand Down Expand Up @@ -301,7 +301,7 @@ void QgsSiSyDialog::apply()
QgsSymbol* sy = new QgsSymbol(mVectorLayer->vectorType());
apply(sy);

QgsSingleSymRenderer *renderer = new QgsSingleSymRenderer(mVectorLayer->vectorType());
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(mVectorLayer->vectorType());
renderer->addSymbol(sy);
mVectorLayer->setRenderer(renderer);
mVectorLayer->refreshLegend();
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsvectorlayer.cpp
View file
Expand Up @@ -68,7 +68,7 @@
#include "qgslegend.h"
#include "qgsvectorlayerproperties.h"
#include "qgsrenderer.h"
#include "qgssinglesymrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgsgraduatedsymrenderer.h"
#include "qgscontinuouscolrenderer.h"
#include "qgsuniquevalrenderer.h"
Expand Down Expand Up @@ -2263,7 +2263,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )

if (!singlenode.isNull())
{
renderer = new QgsSingleSymRenderer(vectorType());
renderer = new QgsSingleSymbolRenderer(vectorType());
renderer->readXML(singlenode, *this);
}
else if (!graduatednode.isNull())
Expand Down

0 comments on commit 60effd6

Please sign in to comment.