48 changes: 24 additions & 24 deletions src/core/qgsgeometry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3946,10 +3946,10 @@ QString QgsGeometry::exportToWkt()
{
mWkt += "POINT(";
x = ( double * )( mGeometry + 5 );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += " ";
y = ( double * )( mGeometry + 5 + sizeof( double ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += ")";
return mWkt;
}
Expand All @@ -3975,11 +3975,11 @@ QString QgsGeometry::exportToWkt()
mWkt += ", ";
}
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += " ";
ptr += sizeof( double );
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4030,11 +4030,11 @@ QString QgsGeometry::exportToWkt()
mWkt += ",";
}
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += " ";
ptr += sizeof( double );
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4068,11 +4068,11 @@ QString QgsGeometry::exportToWkt()
mWkt += ", ";
}
x = ( double * )( ptr );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += " ";
ptr += sizeof( double );
y = ( double * )( ptr );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4112,11 +4112,11 @@ QString QgsGeometry::exportToWkt()
mWkt += ", ";
}
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
mWkt += " ";
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4168,11 +4168,11 @@ QString QgsGeometry::exportToWkt()
mWkt += ",";
}
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
mWkt += " ";
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4226,10 +4226,10 @@ QString QgsGeometry::exportToGeoJSON()
{
mWkt += "{ \"type\": \"Point\", \"coordinates\": [";
x = ( double * )( mGeometry + 5 );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += ", ";
y = ( double * )( mGeometry + 5 + sizeof( double ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += "] }";
return mWkt;
}
Expand All @@ -4256,11 +4256,11 @@ QString QgsGeometry::exportToGeoJSON()
}
mWkt += "[";
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += ", ";
ptr += sizeof( double );
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4313,11 +4313,11 @@ QString QgsGeometry::exportToGeoJSON()
}
mWkt += "[";
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += ", ";
ptr += sizeof( double );
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4353,11 +4353,11 @@ QString QgsGeometry::exportToGeoJSON()
}
mWkt += "[";
x = ( double * )( ptr );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
mWkt += ", ";
ptr += sizeof( double );
y = ( double * )( ptr );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4399,11 +4399,11 @@ QString QgsGeometry::exportToGeoJSON()
}
mWkt += "[";
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
mWkt += ", ";
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -4457,11 +4457,11 @@ QString QgsGeometry::exportToGeoJSON()
}
mWkt += "[";
x = ( double * ) ptr;
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
mWkt += ", ";
y = ( double * ) ptr;
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down
14 changes: 7 additions & 7 deletions src/gui/qgscomposerview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,13 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
}
if ( composition() )
{
QgsComposerMap* composerMap = new QgsComposerMap( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height() );
composition()->addComposerMap( composerMap );
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
emit actionFinished();
composition()->pushAddRemoveCommand( composerMap, tr( "Map added" ) );
QgsComposerMap* composerMap = new QgsComposerMap( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height() );
composition()->addComposerMap( composerMap );
scene()->removeItem( mRubberBandItem );
delete mRubberBandItem;
mRubberBandItem = 0;
emit actionFinished();
composition()->pushAddRemoveCommand( composerMap, tr( "Map added" ) );
}
break;

Expand Down
16 changes: 8 additions & 8 deletions src/mapserver/qgswfsserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
if ( bboxOk )
searchRect.set( minx, miny, maxx, maxy );
else
searchRect.set( searchRect.xMinimum() - 0.000001
, searchRect.yMinimum() - 0.000001
, searchRect.xMaximum() + 0.000001
, searchRect.yMaximum() + 0.000001 );
searchRect.set( searchRect.xMinimum()-0.000001
, searchRect.yMinimum()-0.000001
, searchRect.xMaximum()+0.000001
, searchRect.yMaximum()+0.000001 );
QgsCoordinateReferenceSystem layerCrs = layer->crs();

startGetFeature( request, format, layerCrs, &searchRect );
Expand Down Expand Up @@ -516,7 +516,7 @@ void QgsWFSServer::startGetFeature( QgsRequestHandler& request, const QString& f
if ( format == "GeoJSON" )
{
fcString = "{\"type\": \"FeatureCollection\",\n";
fcString += " \"bbox\": [ " + QString::number( rect->xMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->yMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->xMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->yMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + "],\n";
fcString += " \"bbox\": [ " + QString::number( rect->xMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->yMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->xMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->yMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + "],\n";
fcString += " \"features\": [\n";
result = fcString.toUtf8();
request.startGetFeatureResponse( &result, format );
Expand Down Expand Up @@ -696,7 +696,7 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, QgsCoordinateRefer
{
QgsRectangle box = geom->boundingBox();

fStr += " \"bbox\": [ " + QString::number( box.xMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.yMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.xMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.yMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + "],\n";
fStr += " \"bbox\": [ " + QString::number( box.xMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.yMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.xMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.yMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + "],\n";

fStr += " \"geometry\": ";
fStr += geom->exportToGeoJSON();
Expand Down Expand Up @@ -1025,9 +1025,9 @@ QDomElement QgsWFSServer::createCoordinateElem( const QVector<QgsPoint> points,
{
coordString += " ";
}
coordString += QString::number( pointIt->x(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
coordString += QString::number( pointIt->x(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
coordString += ",";
coordString += QString::number( pointIt->y(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
coordString += QString::number( pointIt->y(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
}

QDomText coordText = doc.createTextNode( coordString );
Expand Down
6 changes: 3 additions & 3 deletions src/providers/gdal/qgsgdalprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1377,7 +1377,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste
}

// are we using Erdas Imagine external overviews?
char* myConfigUseRRD = strdup( CPLGetConfigOption( "USE_RRD", "NO" ) );
char* myConfigUseRRD = strdup(CPLGetConfigOption( "USE_RRD", "NO" ));
if ( theFormat == PyramidsErdas )
CPLSetConfigOption( "USE_RRD", "YES" );
else
Expand Down Expand Up @@ -1471,7 +1471,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste
//emit drawingProgress( 0, 0 );
// restore former USE_RRD config (Erdas)
CPLSetConfigOption( "USE_RRD", myConfigUseRRD );
free( myConfigUseRRD );
free(myConfigUseRRD);
return "FAILED_NOT_SUPPORTED";
}
else
Expand All @@ -1488,7 +1488,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste

// restore former USE_RRD config (Erdas)
CPLSetConfigOption( "USE_RRD", myConfigUseRRD );
free( myConfigUseRRD );
free(myConfigUseRRD);

QgsDebugMsg( "Pyramid overviews built" );

Expand Down
42 changes: 21 additions & 21 deletions tests/src/core/testqgscomposerlabel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@

class TestQgsComposerLabel: public QObject
{
Q_OBJECT;
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init();// will be called before each testfunction is executed.
void cleanup();// will be called after every testfunction.

// test simple expression evaluation
void evaluation();
// test expression evaluation when a feature is set
void feature_evaluation();
// test "$page" expressions
void page_evaluation();
Q_OBJECT;
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init();// will be called before each testfunction is executed.
void cleanup();// will be called after every testfunction.
// test simple expression evaluation
void evaluation();
// test expression evaluation when a feature is set
void feature_evaluation();
// test "$page" expressions
void page_evaluation();
private:
QgsComposition* mComposition;
QgsComposerLabel* mComposerLabel;
QgsMapRenderer* mMapRenderer;
QgsVectorLayer* mVectorLayer;
QgsComposition* mComposition;
QgsComposerLabel* mComposerLabel;
QgsMapRenderer* mMapRenderer;
QgsVectorLayer* mVectorLayer;
};

void TestQgsComposerLabel::initTestCase()
Expand All @@ -56,7 +56,7 @@ void TestQgsComposerLabel::initTestCase()
QFileInfo vectorFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "france_parts.shp" );
mVectorLayer = new QgsVectorLayer( vectorFileInfo.filePath(),
vectorFileInfo.completeBaseName(),
"ogr" );
"ogr" );
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mVectorLayer );

//create composition with composer map
Expand Down Expand Up @@ -108,8 +108,8 @@ void TestQgsComposerLabel::evaluation()
// $CURRENT_DATE() evaluation (inside an expression)
QDate now = QDate::currentDate();
int dd = now.day();

QString expected = "__" + QString( "%1" ).arg( dd + 1, 2, 10, QChar( '0' ) ) + "(ok)__";
QString expected = "__" + QString("%1").arg(dd+1, 2, 10, QChar('0')) + "(ok)__";
mComposerLabel->setText( "__[%$CURRENT_DATE(dd) + 1%](ok)__" );
QString evaluated = mComposerLabel->displayText();
QCOMPARE( evaluated, expected );
Expand Down Expand Up @@ -173,7 +173,7 @@ void TestQgsComposerLabel::page_evaluation()

// move to the second page and re-evaluate
mComposerLabel->setItemPosition( 0, 320 );
QCOMPARE( mComposerLabel->displayText(), QString( "2/2" ) );
QCOMPARE( mComposerLabel->displayText(), QString("2/2") );
}
}

Expand Down
74 changes: 37 additions & 37 deletions tests/src/core/testqgscomposermapatlas.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@

class TestQgsComposerMapAtlas: public QObject
{
Q_OBJECT;
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init();// will be called before each testfunction is executed.
void cleanup();// will be called after every testfunction.

// test filename pattern evaluation
void filename();
// test rendering with an autoscale atlas
void autoscale_render();
// test rendering with a fixed scale atlas
void fixedscale_render();
// test rendering with a hidden coverage
void hiding_render();
Q_OBJECT;
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init();// will be called before each testfunction is executed.
void cleanup();// will be called after every testfunction.
// test filename pattern evaluation
void filename();
// test rendering with an autoscale atlas
void autoscale_render();
// test rendering with a fixed scale atlas
void fixedscale_render();
// test rendering with a hidden coverage
void hiding_render();
private:
QgsComposition* mComposition;
QgsComposerLabel* mLabel1;
QgsComposerLabel* mLabel2;
QgsComposerMap* mAtlasMap;
QgsComposerMap* mOverview;
QgsMapRenderer* mMapRenderer;
QgsVectorLayer* mVectorLayer;
QgsComposition* mComposition;
QgsComposerLabel* mLabel1;
QgsComposerLabel* mLabel2;
QgsComposerMap* mAtlasMap;
QgsComposerMap* mOverview;
QgsMapRenderer* mMapRenderer;
QgsVectorLayer* mVectorLayer;
};

void TestQgsComposerMapAtlas::initTestCase()
Expand All @@ -65,7 +65,7 @@ void TestQgsComposerMapAtlas::initTestCase()
QFileInfo vectorFileInfo( QString( TEST_DATA_DIR ) + QDir::separator() + "france_parts.shp" );
mVectorLayer = new QgsVectorLayer( vectorFileInfo.filePath(),
vectorFileInfo.completeBaseName(),
"ogr" );
"ogr" );

QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mVectorLayer );

Expand Down Expand Up @@ -141,7 +141,7 @@ void TestQgsComposerMapAtlas::filename()
for ( size_t fi = 0; fi < atlasRender.numFeatures(); ++fi )
{
atlasRender.prepareForFeature( fi );
QString expected = QString( "output_%1" ).arg(( int )( fi + 1 ) );
QString expected = QString( "output_%1" ).arg( (int)(fi+1) );
QCOMPARE( atlasRender.currentFilename(), expected );
}
atlasRender.end();
Expand All @@ -151,7 +151,7 @@ void TestQgsComposerMapAtlas::filename()
void TestQgsComposerMapAtlas::autoscale_render()
{
mAtlasMap->setAtlasFixedScale( false );
mAtlasMap->setAtlasMargin( 0.10f );
mAtlasMap->setAtlasMargin( 0.10 );

QgsAtlasRendering atlasRender( mComposition );

Expand All @@ -163,12 +163,12 @@ void TestQgsComposerMapAtlas::autoscale_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( "Atlas autoscale test", mComposition,
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "autoscale_%1.png" ).arg(( int )fit ) );
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "autoscale_%1.png" ).arg((int)fit) );
QVERIFY( checker.testComposition( 0 ) );
}
atlasRender.end();
atlasRender.end();
}

void TestQgsComposerMapAtlas::fixedscale_render()
Expand All @@ -186,12 +186,12 @@ void TestQgsComposerMapAtlas::fixedscale_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( "Atlas fixedscale test", mComposition,
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "fixedscale_%1.png" ).arg(( int )fit ) );
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "fixedscale_%1.png" ).arg((int)fit) );
QVERIFY( checker.testComposition( 0 ) );
}
atlasRender.end();
atlasRender.end();

}

Expand All @@ -211,12 +211,12 @@ void TestQgsComposerMapAtlas::hiding_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( "Atlas hidden test", mComposition,
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "hiding_%1.png" ).arg(( int )fit ) );
QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() +
"expected_composermapatlas" + QDir::separator() +
QString( "hiding_%1.png" ).arg((int)fit) );
QVERIFY( checker.testComposition( 0 ) );
}
atlasRender.end();
atlasRender.end();

}

Expand Down
50 changes: 25 additions & 25 deletions tests/src/core/testqgsexpression.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,31 +545,31 @@ class TestQgsExpression: public QObject
QCOMPARE( vPerimeter.toDouble(), 20. );
}

void eval_special_columns()
{
QTest::addColumn<QString>( "string" );
QTest::addColumn<QVariant>( "result" );

QgsExpression::setSpecialColumn( "$var1", QVariant(( int )42 ) );

QgsExpression exp( "$var1 + 1" );
QVariant v1 = exp.evaluate();
QCOMPARE( v1.toInt(), 43 );

QgsExpression::setSpecialColumn( "$var1", QVariant(( int )100 ) );
QVariant v2 = exp.evaluate();
QCOMPARE( v2.toInt(), 101 );

QgsExpression exp2( "_specialcol_('$var1')+1" );
QVariant v3 = exp2.evaluate();
QCOMPARE( v3.toInt(), 101 );

QgsExpression exp3( "_specialcol_('undefined')" );
QVariant v4 = exp3.evaluate();
QCOMPARE( v4, QVariant() );

QgsExpression::unsetSpecialColumn( "$var1" );
}
void eval_special_columns()
{
QTest::addColumn<QString>( "string" );
QTest::addColumn<QVariant>( "result" );

QgsExpression::setSpecialColumn( "$var1", QVariant((int)42) );

QgsExpression exp( "$var1 + 1" );
QVariant v1 = exp.evaluate();
QCOMPARE( v1.toInt(), 43 );
QgsExpression::setSpecialColumn( "$var1", QVariant((int)100) );
QVariant v2 = exp.evaluate();
QCOMPARE( v2.toInt(), 101 );

QgsExpression exp2( "_specialcol_('$var1')+1" );
QVariant v3 = exp2.evaluate();
QCOMPARE( v3.toInt(), 101 );

QgsExpression exp3( "_specialcol_('undefined')");
QVariant v4 = exp3.evaluate();
QCOMPARE( v4, QVariant() );

QgsExpression::unsetSpecialColumn( "$var1" );
}

};

Expand Down