sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverted win32 hack related to dynamic casts back to original code.

Browse Source 
Hopefully all renderers will work now.


git-svn-id: http://svn.osgeo.org/qgis/trunk@2257 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2004-11-15 05:27:11 +00:00
parent 7145513501
commit a5450673ee
5 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qgsdlgvectorlayerproperties.cpp
View File

@ -71,8 +71,7 @@ bufferRenderer(layer->
txtDisplayName->setText(layer->name());
// display type and feature count
lblGeometryType->setText(QGis::qgisVectorGeometryType[layer->vectorType()]);
//QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
QgsVectorDataProvider *dp = (QgsVectorDataProvider *)(layer->getDataProvider());
QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
QString numFeatures;
numFeatures = numFeatures.setNum(dp->featureCount());
lblFeatureCount->setText(numFeatures);

20
src/qgsgrasydialog.cpp
View File

@ -46,11 +46,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer):QgsGraSyDialogBase(), mVe
//find out the numerical fields of mVectorLayer
QgsVectorDataProvider *provider;
#ifndef WIN32
if (provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider()))
#else
if (provider = (QgsVectorDataProvider *)(mVectorLayer->getDataProvider()))
#endif
{
std::vector < QgsField > &fields = provider->fields();
int fieldnumber = 0;
@ -84,19 +80,11 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer):QgsGraSyDialogBase(), mVe
//initial settings, use the buffer of the propertiesDialog if possible. If this is not possible, use the renderer of the vectorlayer directly
if (mVectorLayer->propertiesDialog())
{
#ifndef WIN32
renderer = dynamic_cast < QgsGraduatedSymRenderer * >(layer->propertiesDialog()->getBufferRenderer());
#else
renderer = (QgsGraduatedSymRenderer *)(layer->propertiesDialog()->getBufferRenderer());
#endif
}
else
{
#ifndef WIN32
renderer = dynamic_cast < QgsGraduatedSymRenderer * >(layer->renderer());
#else
renderer = (QgsGraduatedSymRenderer *)(layer->renderer());
#endif
}
@ -231,11 +219,7 @@ void QgsGraSyDialog::apply()
p.drawText(leftspace, topspace + fm.height(), name);
p.drawText(leftspace, topspace + 2 * fm.height(), classificationComboBox->currentText());
#ifndef WIN32
QgsGraduatedSymRenderer *renderer = dynamic_cast < QgsGraduatedSymRenderer * >(mVectorLayer->renderer());
#else
QgsGraduatedSymRenderer *renderer = (QgsGraduatedSymRenderer * )(mVectorLayer->renderer());
#endif
if (!renderer)
{
@ -342,11 +326,7 @@ void QgsGraSyDialog::adjustClassification()
{
mClassBreakBox->clear();
QGis::VectorType m_type = mVectorLayer->vectorType();
#ifndef WIN32
QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider());
#else
QgsVectorDataProvider *provider = (QgsVectorDataProvider *)(mVectorLayer->getDataProvider());
#endif
double minimum, maximum;
//delete all previous entries

3
src/qgsrenderitem.cpp
View File

@ -16,6 +16,7 @@
***************************************************************************/
/* $Id$ */
#include <qstring.h>
#include <cassert>
#include "qgsrenderitem.h"
QgsRenderItem::QgsRenderItem(): mSymbol(new QgsSymbol())
@ -59,7 +60,7 @@ void QgsRenderItem::setValue(QString value)
}
QgsSymbol* QgsRenderItem::getSymbol()
{
Q_ASSERT(this == 0);
assert(this != 0);
return mSymbol;
}

8
src/qgssisydialog.cpp
View File

@ -52,19 +52,11 @@ QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer):QgsSiSyDialogBase(), mVecto
//initial settings, use the buffer of the propertiesDialog if possible. If this is not possible, use the renderer of the vectorlayer directly
if (mVectorLayer->propertiesDialog())
{
#ifdef WIN32
renderer = dynamic_cast < QgsSingleSymRenderer * >(layer->propertiesDialog()->getBufferRenderer());
#else
renderer = (QgsSingleSymRenderer * )(layer->propertiesDialog()->getBufferRenderer());
#endif
}
else
{
#ifdef WIN32
renderer = dynamic_cast < QgsSingleSymRenderer * >(layer->renderer());
#else
renderer = (QgsSingleSymRenderer *)(layer->renderer());
#endif
}
if (renderer)

20
src/qgsuvaldialog.cpp
View File

@ -38,11 +38,7 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QgsUValDialogBase(), mVectorLa
//find out the fields of mVectorLayer
QgsVectorDataProvider *provider;
#ifndef WIN32
if (provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider()))
#else
if (provider = (QgsVectorDataProvider *)(mVectorLayer->getDataProvider()))
#endif
{
std::vector < QgsField > &fields = provider->fields();
QString str;
@ -71,19 +67,11 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QgsUValDialogBase(), mVectorLa
//initial settings, use the buffer of the propertiesDialog if possible. If this is not possible, use the renderer of the vectorlayer directly
if (mVectorLayer->propertiesDialog())
{
#ifndef WIN32
renderer = dynamic_cast < QgsUniqueValRenderer * >(mVectorLayer->propertiesDialog()->getBufferRenderer());
#else
renderer = (QgsUniqueValRenderer * )(mVectorLayer->propertiesDialog()->getBufferRenderer());
#endif
}
else
{
#ifndef WIN32
renderer = dynamic_cast < QgsUniqueValRenderer * >(mVectorLayer->renderer());
#else
renderer = ( QgsUniqueValRenderer * )(mVectorLayer->renderer());
#endif
}
@ -151,11 +139,7 @@ void QgsUValDialog::apply()
}
}
#ifndef WIN32
QgsUniqueValRenderer *renderer = dynamic_cast < QgsUniqueValRenderer * >(mVectorLayer->renderer());
#else
QgsUniqueValRenderer *renderer = ( QgsUniqueValRenderer * )(mVectorLayer->renderer());
#endif
//go through mValues and add the entries to the renderer
if(renderer)
@ -276,11 +260,7 @@ void QgsUValDialog::changeClassificationAttribute(int nr)
}
mValues.clear();
#ifndef WIN32
QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider());
#else
QgsVectorDataProvider *provider = (QgsVectorDataProvider *)(mVectorLayer->getDataProvider());
#endif
if (provider)
{
QString value;