Skip to content

Commit

Permalink
renamed QgsContinuousColRenderer to QgsContinuousColorRenderer
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4874 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent 522aeb1 commit da2b438
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 40 deletions.
6 changes: 3 additions & 3 deletions src/composer/qgscomposervectorlegend.cpp
View file
Expand Up @@ -16,7 +16,7 @@
***************************************************************************/
#include "qgscomposervectorlegend.h"
#include "qgscomposermap.h"
#include "qgscontinuouscolrenderer.h"
#include "qgscontinuouscolorrenderer.h"
#include "qgsmapcanvas.h"
#include "qgsmaplayer.h"
#include "qgsrenderer.h"
Expand Down Expand Up @@ -265,9 +265,9 @@ QRect QgsComposerVectorLegend::render ( QPainter *p )
QgsVectorLayer *vector = dynamic_cast <QgsVectorLayer*> (layer2);
const QgsRenderer *renderer = vector->renderer();

// QgsContinuousColRenderer is not supported yet
// QgsContinuousColorRenderer is not supported yet
// QgsSiMaRenderer, QgsGraduatedMaRenderer, QgsUValMaRenderer no more
if ( typeid (*renderer) == typeid(QgsContinuousColRenderer) )
if ( typeid (*renderer) == typeid(QgsContinuousColorRenderer) )
{
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/Makefile.am
View file
Expand Up @@ -78,7 +78,7 @@ libqgis_guiHEADERS = \
qgsbookmarks.h \
qgsclipboard.h \
qgscontcoldialog.h \
qgscontinuouscolrenderer.h \
qgscontinuouscolorrenderer.h \
qgscsexception.h \
qgscoordinatetransform.h \
qgscustomprojectiondialog.h \
Expand Down Expand Up @@ -192,7 +192,7 @@ libqgis_gui_la_SOURCES = \
qgsclipboard.cpp \
qgscontcoldialog.cpp \
qgscoordinatetransform.cpp \
qgscontinuouscolrenderer.cpp \
qgscontinuouscolorrenderer.cpp \
qgscustomprojectiondialog.cpp \
qgsdelattrdialog.cpp \
qgsencodingfiledialog.cpp \
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgscontcoldialog.cpp
View file
Expand Up @@ -18,7 +18,7 @@
/* $Id$ */

#include "qgscontcoldialog.h"
#include "qgscontinuouscolrenderer.h"
#include "qgscontinuouscolorrenderer.h"
#include "qgsfield.h"
#include "qgssymbol.h"
#include "qgsvectordataprovider.h"
Expand Down Expand Up @@ -67,7 +67,7 @@ QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer)

//restore the correct colors for minimum and maximum values

const QgsContinuousColRenderer* renderer = dynamic_cast < const QgsContinuousColRenderer * >(layer->renderer());;
const QgsContinuousColorRenderer* renderer = dynamic_cast < const QgsContinuousColorRenderer * >(layer->renderer());;

if (renderer)
{
Expand Down Expand Up @@ -152,7 +152,7 @@ void QgsContColDialog::apply()
maxsymbol->setPen(QPen(QColor(0, 0, 0), outlinewidthspinbox->value()));
}

QgsContinuousColRenderer* renderer = new QgsContinuousColRenderer(mVectorLayer->vectorType());
QgsContinuousColorRenderer* renderer = new QgsContinuousColorRenderer(mVectorLayer->vectorType());
mVectorLayer->setRenderer(renderer);

renderer->setMinimumSymbol(minsymbol);
Expand Down
32 changes: 16 additions & 16 deletions src/gui/qgscontinuouscolrenderer.cpp → src/gui/qgscontinuouscolorrenderer.cpp
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgscontinuouscolrenderer.cpp - description
qgscontinuouscolorrenderer.cpp - description
-------------------
begin : Nov 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -15,7 +15,7 @@
* *
***************************************************************************/
/* $Id$ */
#include "qgscontinuouscolrenderer.h"
#include "qgscontinuouscolorrenderer.h"
#include "qgis.h"
#include "qgsvectorlayer.h"
#include <cfloat>
Expand All @@ -26,22 +26,22 @@
#include "qgssymbol.h"
#include <qdom.h>

QgsContinuousColRenderer::QgsContinuousColRenderer(QGis::VectorType type): mMinimumSymbol(0), mMaximumSymbol(0)
QgsContinuousColorRenderer::QgsContinuousColorRenderer(QGis::VectorType type): mMinimumSymbol(0), mMaximumSymbol(0)
{
mVectorType = type;
//call superclass method to set up selection colour
initialiseSelectionColor();
}

QgsContinuousColRenderer::QgsContinuousColRenderer(const QgsContinuousColRenderer& other)
QgsContinuousColorRenderer::QgsContinuousColorRenderer(const QgsContinuousColorRenderer& other)
{
mVectorType = other.mVectorType;
mClassificationField = other.mClassificationField;
mMinimumSymbol = new QgsSymbol(*other.mMinimumSymbol);
mMaximumSymbol = new QgsSymbol(*other.mMaximumSymbol);
}

QgsContinuousColRenderer& QgsContinuousColRenderer::operator=(const QgsContinuousColRenderer& other)
QgsContinuousColorRenderer& QgsContinuousColorRenderer::operator=(const QgsContinuousColorRenderer& other)
{
if(this != &other)
{
Expand All @@ -54,25 +54,25 @@ QgsContinuousColRenderer& QgsContinuousColRenderer::operator=(const QgsContinuou
}
}

QgsContinuousColRenderer::~QgsContinuousColRenderer()
QgsContinuousColorRenderer::~QgsContinuousColorRenderer()
{
delete mMinimumSymbol;
delete mMaximumSymbol;
}

void QgsContinuousColRenderer::setMinimumSymbol(QgsSymbol* sy)
void QgsContinuousColorRenderer::setMinimumSymbol(QgsSymbol* sy)
{
delete mMinimumSymbol;
mMinimumSymbol = sy;
}

void QgsContinuousColRenderer::setMaximumSymbol(QgsSymbol* sy)
void QgsContinuousColorRenderer::setMaximumSymbol(QgsSymbol* sy)
{
delete mMaximumSymbol;
mMaximumSymbol = sy;
}

void QgsContinuousColRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
void QgsContinuousColorRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
double* scalefactor, bool selected, double widthScale)
{
if ((mMinimumSymbol && mMaximumSymbol))
Expand Down Expand Up @@ -161,7 +161,7 @@ void QgsContinuousColRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixm
}
}

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

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

QString QgsContinuousColRenderer::name() const
QString QgsContinuousColorRenderer::name() const
{
return "Continuous Color";
}

bool QgsContinuousColRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
bool QgsContinuousColorRenderer::writeXML( QDomNode & layer_node, QDomDocument & document ) const
{
bool returnval=true;
#ifndef WIN32
Expand All @@ -226,16 +226,16 @@ bool QgsContinuousColRenderer::writeXML( QDomNode & layer_node, QDomDocument & d
return returnval;
}

const std::list<QgsSymbol*> QgsContinuousColRenderer::symbols() const
const std::list<QgsSymbol*> QgsContinuousColorRenderer::symbols() const
{
std::list<QgsSymbol*> list;
list.push_back(mMinimumSymbol);
list.push_back(mMaximumSymbol);
return list;
}

QgsRenderer* QgsContinuousColRenderer::clone() const
QgsRenderer* QgsContinuousColorRenderer::clone() const
{
QgsContinuousColRenderer* r = new QgsContinuousColRenderer(*this);
QgsContinuousColorRenderer* r = new QgsContinuousColorRenderer(*this);
return r;
}
26 changes: 13 additions & 13 deletions src/gui/qgscontinuouscolrenderer.h → src/gui/qgscontinuouscolorrenderer.h
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgscontinuouscolrenderer.h - description
qgscontinuouscolorrenderer.h - description
-------------------
begin : Nov 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -15,8 +15,8 @@
* *
***************************************************************************/
/* $Id$ */
#ifndef QGSCONTINUOUSCOLRENDERER_H
#define QGSCONTINUOUSCOLRENDERER_H
#ifndef QGSCONTINUOUSCOLORRENDERER_H
#define QGSCONTINUOUSCOLORRENDERER_H

#include "qgsrenderer.h"
#include <qpainter.h>
Expand All @@ -29,13 +29,13 @@
class QgsSymbol;

/**Renderer class which interpolates rgb values linear between the minimum and maximum value of the classification field*/
class QgsContinuousColRenderer: public QgsRenderer
class QgsContinuousColorRenderer: public QgsRenderer
{
public:
QgsContinuousColRenderer(QGis::VectorType type);
QgsContinuousColRenderer(const QgsContinuousColRenderer& other);
QgsContinuousColRenderer& operator=(const QgsContinuousColRenderer& other);
virtual ~QgsContinuousColRenderer();
QgsContinuousColorRenderer(QGis::VectorType type);
QgsContinuousColorRenderer(const QgsContinuousColorRenderer& other);
QgsContinuousColorRenderer& operator=(const QgsContinuousColorRenderer& other);
virtual ~QgsContinuousColorRenderer();
/**Renders the feature using the minimum and maximum value of the classification field*/
void renderFeature(QPainter* p, QgsFeature* f, QPixmap* pic, double* scalefactor, bool selected, double widthScale = 1.);
/**Returns the number of the classification field*/
Expand Down Expand Up @@ -75,27 +75,27 @@ class QgsContinuousColRenderer: public QgsRenderer
QgsSymbol* mMaximumSymbol;
};

inline int QgsContinuousColRenderer::classificationField() const
inline int QgsContinuousColorRenderer::classificationField() const
{
return mClassificationField;
}

inline void QgsContinuousColRenderer::setClassificationField(int id)
inline void QgsContinuousColorRenderer::setClassificationField(int id)
{
mClassificationField=id;
}

inline const QgsSymbol* QgsContinuousColRenderer::minimumSymbol() const
inline const QgsSymbol* QgsContinuousColorRenderer::minimumSymbol() const
{
return mMinimumSymbol;
}

inline const QgsSymbol* QgsContinuousColRenderer::maximumSymbol() const
inline const QgsSymbol* QgsContinuousColorRenderer::maximumSymbol() const
{
return mMaximumSymbol;
}

inline bool QgsContinuousColRenderer::needsAttributes() const
inline bool QgsContinuousColorRenderer::needsAttributes() const
{
return true;
}
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 "qgscontinuouscolrenderer.h"
#include "qgsmaplayerregistry.h"
#include "qgsexception.h"
#include "qgsprojectproperty.h"
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsvectorlayer.cpp
View file
Expand Up @@ -70,7 +70,7 @@
#include "qgsrenderer.h"
#include "qgssinglesymbolrenderer.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgscontinuouscolrenderer.h"
#include "qgscontinuouscolorrenderer.h"
#include "qgsuniquevalrenderer.h"
#include "qgsrenderitem.h"
#include "qgsproviderregistry.h"
Expand Down Expand Up @@ -2272,7 +2272,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )
}
else if (!continuousnode.isNull())
{
renderer = new QgsContinuousColRenderer(vectorType());
renderer = new QgsContinuousColorRenderer(vectorType());
renderer->readXML(continuousnode, *this);
}
else if (!uniquevaluenode.isNull())
Expand Down

0 comments on commit da2b438

Please sign in to comment.