sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix doxygen warning"

Browse Source 
This reverts commit 9e1a2359ba7aab9094544f85ba04efceceedf5f6.
This commit is contained in:
Nyall Dawson 2016-01-27 14:40:01 +11:00
parent 9e1a2359ba
commit 59f418b763
3 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsexpressioncontext.sip
View File

@ -392,7 +392,7 @@ class QgsExpressionContext
static const QString EXPR_FIELDS; static const QString EXPR_FIELDS;
//! Inbuilt variable name for feature storage //! Inbuilt variable name for feature storage
static const QString EXPR_FEATURE; static const QString EXPR_FEATURE;
//! Inbuilt variable name for value original value variable //! Inbuilt variable name for @value original value variable
static const QString EXPR_ORIGINAL_VALUE; static const QString EXPR_ORIGINAL_VALUE;
//! Inbuilt variable name for symbol color variable //! Inbuilt variable name for symbol color variable
static const QString EXPR_SYMBOL_COLOR; static const QString EXPR_SYMBOL_COLOR;

2
src/core/qgsexpressioncontext.h
View File

@ -427,7 +427,7 @@ class CORE_EXPORT QgsExpressionContext
static const QString EXPR_FIELDS; static const QString EXPR_FIELDS;
//! Inbuilt variable name for feature storage //! Inbuilt variable name for feature storage
static const QString EXPR_FEATURE; static const QString EXPR_FEATURE;
//! Inbuilt variable name for value original value variable //! Inbuilt variable name for @value original value variable
static const QString EXPR_ORIGINAL_VALUE; static const QString EXPR_ORIGINAL_VALUE;
//! Inbuilt variable name for symbol color variable //! Inbuilt variable name for symbol color variable
static const QString EXPR_SYMBOL_COLOR; static const QString EXPR_SYMBOL_COLOR;

51
tests/src/core/testqgsmaprenderer.cpp
View File

@ -38,7 +38,6 @@
#include <qgsapplication.h> #include <qgsapplication.h>
#include <qgsproviderregistry.h> #include <qgsproviderregistry.h>
#include <qgsmaplayerregistry.h> #include <qgsmaplayerregistry.h>
#include "qgssinglesymbolrendererv2.h"
//qgs unit test utility class //qgs unit test utility class
#include "qgsrenderchecker.h" #include "qgsrenderchecker.h"
@ -55,9 +54,8 @@ class TestQgsMapRenderer : public QObject
public: public:
TestQgsMapRenderer() TestQgsMapRenderer()
: mError( QgsVectorFileWriter::NoError ) : mError( QgsVectorFileWriter::NoError )
, mMapSettings( nullptr ) , mMapSettings( 0 )
, mpPolysLayer( nullptr ) , mpPolysLayer( 0 )
, mPointsLayer( nullptr )
{ {
} }
@ -81,8 +79,6 @@ class TestQgsMapRenderer : public QObject
void testFourAdjacentTiles_data(); void testFourAdjacentTiles_data();
void testFourAdjacentTiles(); void testFourAdjacentTiles();
void testSymbolsOnEdgeOfExtent(); //tests that large symbols just outside the extent will be shown
private: private:
QString mEncoding; QString mEncoding;
QgsVectorFileWriter::WriterError mError; QgsVectorFileWriter::WriterError mError;
@ -90,9 +86,7 @@ class TestQgsMapRenderer : public QObject
QgsFields mFields; QgsFields mFields;
QgsMapSettings *mMapSettings; QgsMapSettings *mMapSettings;
QgsMapLayer * mpPolysLayer; QgsMapLayer * mpPolysLayer;
QgsVectorLayer* mPointsLayer;
QString mReport; QString mReport;
bool imageCheck(QgsMapSettings mapSettings, const QString& theTestType);
}; };
@ -189,14 +183,6 @@ void TestQgsMapRenderer::initTestCase()
mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(), mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
myPolyFileInfo.completeBaseName(), "ogr" ); myPolyFileInfo.completeBaseName(), "ogr" );
QVERIFY( mpPolysLayer->isValid() ); QVERIFY( mpPolysLayer->isValid() );
QString pointFileName = myTestDataDir + "regular_points.geojson";
QFileInfo pointFileInfo( pointFileName );
mPointsLayer = new QgsVectorLayer( pointFileInfo.filePath(),
pointFileInfo.completeBaseName(), "ogr" );
QVERIFY( mPointsLayer->isValid() );
// Register the layer with the registry // Register the layer with the registry
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer *>() << mpPolysLayer ); QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer *>() << mpPolysLayer );
// add the test layer to the maprender // add the test layer to the maprender
@ -346,39 +332,6 @@ void TestQgsMapRenderer::testFourAdjacentTiles()
QVERIFY( result ); QVERIFY( result );
} }
void TestQgsMapRenderer::testSymbolsOnEdgeOfExtent()
{
mReport += "<h2>Large symbols on edge of extent</h2>\n";
QgsMapSettings ms;
ms.setLayers( QStringList() << mPointsLayer->id() );
ms.setExtent( mPointsLayer->extent() );
mMapSettings->setDestinationCrs( QgsCoordinateReferenceSystem( "EPSG:3005" ) );
// ms.setExtent( QgsRectangle ( 778780, 965073, 780900, 970333 ) );
//BIG symbol
QgsStringMap properties;
properties.insert( "color", "0,0,0,255" );
properties.insert( "name", "circle" );
properties.insert( "size", "20.0" );
properties.insert( "outline_style", "no" );
QgsMarkerSymbolV2* pointSymbol = QgsMarkerSymbolV2::createSimple( properties );
mPointsLayer->setRendererV2( new QgsSingleSymbolRendererV2( pointSymbol ) );
QVERIFY( imageCheck( ms, "singlesymbol_orderby" ) );
}
bool TestQgsMapRenderer::imageCheck( QgsMapSettings mapSettings, const QString& theTestType )
{
mapSettings.setOutputDpi( 96 );
QgsRenderChecker myChecker;
myChecker.setControlName( "expected_" + theTestType );
myChecker.setMapSettings( mapSettings );
bool myResultFlag = myChecker.runTest( theTestType, 30 );
mReport += myChecker.report();
return myResultFlag;
}
QTEST_MAIN( TestQgsMapRenderer ) QTEST_MAIN( TestQgsMapRenderer )
#include "testqgsmaprenderer.moc" #include "testqgsmaprenderer.moc"