98 changes: 49 additions & 49 deletions src/gui/qgssvgannotationitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,72 +33,72 @@ QgsSvgAnnotationItem::~QgsSvgAnnotationItem()

void QgsSvgAnnotationItem::writeXML( QDomDocument& doc ) const
{
QDomElement documentElem = doc.documentElement();
if ( documentElem.isNull() )
{
return;
}
QDomElement documentElem = doc.documentElement();
if ( documentElem.isNull() )
{
return;
}

QDomElement svgAnnotationElem = doc.createElement( "SVGAnnotationItem" );
svgAnnotationElem.setAttribute( "file", QgsProject::instance()->writePath( mFilePath ) );
_writeXML( doc, svgAnnotationElem );
documentElem.appendChild( svgAnnotationElem );
QDomElement svgAnnotationElem = doc.createElement( "SVGAnnotationItem" );
svgAnnotationElem.setAttribute( "file", QgsProject::instance()->writePath( mFilePath ) );
_writeXML( doc, svgAnnotationElem );
documentElem.appendChild( svgAnnotationElem );
}

void QgsSvgAnnotationItem::readXML( const QDomDocument& doc, const QDomElement& itemElem )
{
QString filePath = QgsProject::instance()->readPath( itemElem.attribute( "file" ) );
setFilePath( filePath );
QDomElement annotationElem = itemElem.firstChildElement( "AnnotationItem" );
if ( !annotationElem.isNull() )
{
_readXML( doc, annotationElem );
}
QString filePath = QgsProject::instance()->readPath( itemElem.attribute( "file" ) );
setFilePath( filePath );
QDomElement annotationElem = itemElem.firstChildElement( "AnnotationItem" );
if ( !annotationElem.isNull() )
{
_readXML( doc, annotationElem );
}
}

void QgsSvgAnnotationItem::paint( QPainter* painter )
{
if( !painter )
{
return;
}
if ( !painter )
{
return;
}

drawFrame( painter );
if ( mMapPositionFixed )
{
drawMarkerSymbol( painter );
}
drawFrame( painter );
if ( mMapPositionFixed )
{
drawMarkerSymbol( painter );
}

//keep width/height ratio of svg
QRect viewBox = mSvgRenderer.viewBox();
if( viewBox.isValid() )
//keep width/height ratio of svg
QRect viewBox = mSvgRenderer.viewBox();
if ( viewBox.isValid() )
{
double widthRatio = mFrameSize.width() / viewBox.width();
double heightRatio = mFrameSize.height() / viewBox.height();
double renderWidth = 0;
double renderHeight = 0;
if ( widthRatio <= heightRatio )
{
double widthRatio = mFrameSize.width() / viewBox.width();
double heightRatio = mFrameSize.height() / viewBox.height();
double renderWidth = 0;
double renderHeight = 0;
if( widthRatio <= heightRatio )
{
renderWidth = mFrameSize.width();
renderHeight = viewBox.height() * mFrameSize.width() / viewBox.width() ;
}
else
{
renderHeight = mFrameSize.height();
renderWidth = viewBox.width() * mFrameSize.height() /viewBox.height() ;
}

mSvgRenderer.render( painter, QRectF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y(), renderWidth,
renderHeight ) );
renderWidth = mFrameSize.width();
renderHeight = viewBox.height() * mFrameSize.width() / viewBox.width() ;
}
if ( isSelected() )
else
{
drawSelectionBoxes( painter );
renderHeight = mFrameSize.height();
renderWidth = viewBox.width() * mFrameSize.height() / viewBox.height() ;
}

mSvgRenderer.render( painter, QRectF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y(), renderWidth,
renderHeight ) );
}
if ( isSelected() )
{
drawSelectionBoxes( painter );
}
}

void QgsSvgAnnotationItem::setFilePath( const QString& file )
{
mFilePath = file;
mSvgRenderer.load( mFilePath );
mFilePath = file;
mSvgRenderer.load( mFilePath );
}
18 changes: 9 additions & 9 deletions src/gui/qgssvgannotationitem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@

class GUI_EXPORT QgsSvgAnnotationItem: public QgsAnnotationItem
{
public:
public:

QgsSvgAnnotationItem( QgsMapCanvas* canvas );
~QgsSvgAnnotationItem();

void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );

void paint( QPainter* painter );
void paint( QPainter* painter );

void setFilePath( const QString& file );
QString filePath() const { return mFilePath; }
void setFilePath( const QString& file );
QString filePath() const { return mFilePath; }

private:
QSvgRenderer mSvgRenderer;
QString mFilePath;
private:
QSvgRenderer mSvgRenderer;
QString mFilePath;
};

#endif // QGSSVGANNOTATIONITEM_H
6 changes: 3 additions & 3 deletions src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,9 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
if ( unique_vals.size() >= 1000 )
{
int res = QMessageBox::warning( 0, tr( "High number of classes!" ),
tr( "Classification would yield %1 entries which might not be expected. Continue?" ).arg( unique_vals.size() ),
QMessageBox::Ok | QMessageBox::Cancel,
QMessageBox::Cancel );
tr( "Classification would yield %1 entries which might not be expected. Continue?" ).arg( unique_vals.size() ),
QMessageBox::Ok | QMessageBox::Cancel,
QMessageBox::Cancel );
if ( res == QMessageBox::Cancel )
{
return;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/symbology-ng/qgssymbollayerv2widget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_editingFinished()
QUrl url( mFileLineEdit->text() );
if ( !url.isValid() )
{
return;
return;
}
}

Expand Down Expand Up @@ -996,7 +996,7 @@ void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_editingFinished()
QUrl url( mSVGLineEdit->text() );
if ( !url.isValid() )
{
return;
return;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/mapserver/qgsprojectparser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@ QList<QDomElement> QgsProjectParser::publishedComposerElements() const

void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const
{
if (doc.documentElement().tagName() == "WFS_Capabilities")
if ( doc.documentElement().tagName() == "WFS_Capabilities" )
{
serviceWFSCapabilities( parentElement, doc );
return;
Expand Down Expand Up @@ -2010,7 +2010,7 @@ void QgsProjectParser::serviceWFSCapabilities( QDomElement& parentElement, QDomD
}

serviceElem.appendChild( onlineResourceElem );

//Fees
QDomElement feesElem = propertiesElem.firstChildElement( "WMSFees" );
if ( !feesElem.isNull() )
Expand Down
2 changes: 1 addition & 1 deletion src/mapserver/qgssldparser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class QgsSLDParser: public QgsConfigParser

void describeFeatureType( const QString& , QDomElement& , QDomDocument& ) const {}
/**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/
QList<QgsMapLayer*> mapLayerFromTypeName( const QString&, bool ) const { QList<QgsMapLayer*> layerList; return layerList; }
QList<QgsMapLayer*> mapLayerFromTypeName( const QString&, bool ) const { QList<QgsMapLayer*> layerList; return layerList; }

/**Returns number of layers in configuration*/
int numberOfLayers() const;
Expand Down
94 changes: 48 additions & 46 deletions src/mapserver/qgswfsserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
fidElem = fidNodes.at( f ).toElement();
fid = fidElem.attribute( "fid" );
if ( fid.contains( "." ) ) {
if ( fid.contains( "." ) )
{
if ( fid.section( ".", 0, 0 ) != mTypeName )
continue;
fid = fid.section( ".", 1, 1 );
Expand All @@ -491,9 +492,9 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
QDomElement bboxElem = filterElem.firstChildElement();
QDomElement childElem = bboxElem.firstChildElement();
while ( !childElem.isNull() )
while ( !childElem.isNull() )
{
if ( childElem.tagName() == "Box" )
if ( childElem.tagName() == "Box" )
{
QgsRectangle* rect = new QgsRectangle( childElem );
provider->select( attrIndexes, *rect, mWithGeom, true );
Expand All @@ -518,7 +519,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
else
{
QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
if (mFilter->hasParserError())
if ( mFilter->hasParserError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
Expand All @@ -527,7 +528,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
{
QVariant res = mFilter->evaluate( &feature, fields );
if (mFilter->hasEvalError())
if ( mFilter->hasEvalError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
}
Expand Down Expand Up @@ -589,9 +590,9 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
if ( feature_id_it != mParameterMap.end() )
{
featureIdOk = true;
featureIdList = feature_id_it.value().split( ",");
featureIdList = feature_id_it.value().split( "," );
QStringList typeNameList;
foreach (const QString &fidStr, featureIdList)
foreach ( const QString &fidStr, featureIdList )
{
// testing typename in the WFS featureID
if ( !fidStr.contains( "." ) )
Expand Down Expand Up @@ -625,7 +626,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
QString errorMsg;
if ( !filter.setContent( filterIt.value(), true, &errorMsg ) )
{
throw QgsMapServiceException( "RequestNotWellFormed", QString("error message: %1. The XML string was: %2").arg( errorMsg ).arg( filterIt.value() ) );
throw QgsMapServiceException( "RequestNotWellFormed", QString( "error message: %1. The XML string was: %2" ).arg( errorMsg ).arg( filterIt.value() ) );
}
else
{
Expand Down Expand Up @@ -689,7 +690,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}

mTypeNames = mTypeName.split( "," );
foreach (const QString &tnStr, mTypeNames)
foreach ( const QString &tnStr, mTypeNames )
{
mTypeName = tnStr;
layerList = mConfigParser->mapLayerFromTypeName( tnStr );
Expand Down Expand Up @@ -769,15 +770,15 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
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.yMinimum() - 0.000001
, searchRect.xMaximum() + 0.000001
, searchRect.yMaximum() + 0.000001 );
QgsCoordinateReferenceSystem layerCrs = layer->crs();

long featCounter = 0;
if ( featureIdOk )
{
foreach (const QString &fidStr, featureIdList)
foreach ( const QString &fidStr, featureIdList )
{
if ( !fidStr.startsWith( tnStr ) )
continue;
Expand All @@ -795,7 +796,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
provider->select( attrIndexes, searchRect, mWithGeom, true );
QgsExpression *mFilter = new QgsExpression( expFilter );
if (mFilter->hasParserError())
if ( mFilter->hasParserError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
Expand All @@ -804,7 +805,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
{
QVariant res = mFilter->evaluate( &feature, fields );
if (mFilter->hasEvalError())
if ( mFilter->hasEvalError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
}
Expand Down Expand Up @@ -834,7 +835,8 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
fidElem = fidNodes.at( f ).toElement();
fid = fidElem.attribute( "fid" );
if ( fid.contains( "." ) ) {
if ( fid.contains( "." ) )
{
if ( fid.section( ".", 0, 0 ) != mTypeName )
continue;
fid = fid.section( ".", 1, 1 );
Expand All @@ -856,9 +858,9 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
{
QDomElement bboxElem = filterElem.firstChildElement();
QDomElement childElem = bboxElem.firstChildElement();
while ( !childElem.isNull() )
while ( !childElem.isNull() )
{
if ( childElem.tagName() == "Box" )
if ( childElem.tagName() == "Box" )
{
QgsRectangle* rect = new QgsRectangle( childElem );
provider->select( attrIndexes, *rect, mWithGeom, true );
Expand All @@ -882,33 +884,33 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}
else
{
QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
if (mFilter->hasParserError())
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
if ( mFilter )
QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
if ( mFilter->hasParserError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
if ( mFilter )
{
while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
{
while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
QVariant res = mFilter->evaluate( &feature, fields );
if ( mFilter->hasEvalError() )
{
QVariant res = mFilter->evaluate( &feature, fields );
if (mFilter->hasEvalError())
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
}
if ( res.toInt() != 0 )
{
if ( featureCounter == 0 )
startGetFeature( request, format, layerCrs, &searchRect );
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
}
if ( res.toInt() != 0 )
{
if ( featureCounter == 0 )
startGetFeature( request, format, layerCrs, &searchRect );

sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
++featureCounter;
++featCounter;
}
sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
++featureCounter;
++featCounter;
}
}
delete mFilter;
}
delete mFilter;
}
}
else
{
Expand Down Expand Up @@ -1447,7 +1449,7 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )

QDomElement mesElem = doc.createElement( "Message" );
QStringList mesErrors;
mesErrors << QString( "ERROR: %n feature(s) not added.").arg(inFeatList.size());
mesErrors << QString( "ERROR: %n feature(s) not added." ).arg( inFeatList.size() );
if ( provider->hasErrors() )
{
mesErrors << "\n Provider errors:" << provider->errors();
Expand All @@ -1461,15 +1463,15 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
// Get the Feature Ids of the inserted feature
for ( int j = 0; j < inFeatList.size(); j++ )
{
insertResults << mTypeName +"."+ QString::number(inFeatList[j].id() );
insertResults << mTypeName + "." + QString::number( inFeatList[j].id() );
}
}
}

// Put the Feature Ids of the inserted feature
if ( insertResults.size() > 0 )
{
foreach (const QString &fidStr, insertResults)
foreach ( const QString &fidStr, insertResults )
{
QDomElement irElem = doc.createElement( "InsertResult" );
QDomElement fiElem = doc.createElement( "ogc:FeatureId" );
Expand Down Expand Up @@ -1514,7 +1516,7 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( QDomElement filterElem, Qgs
else
{
QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
if (mFilter->hasParserError())
if ( mFilter->hasParserError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
}
Expand All @@ -1525,7 +1527,7 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( QDomElement filterElem, Qgs
while ( provider->nextFeature( feature ) )
{
QVariant res = mFilter->evaluate( &feature, fields );
if (mFilter->hasEvalError())
if ( mFilter->hasEvalError() )
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
}
Expand All @@ -1545,7 +1547,7 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, QgsCoordinateRefer
QString fStr = "{\"type\": \"Feature\",\n";

fStr += " \"id\": ";
fStr += mTypeName +"."+ QString::number( feat->id() );
fStr += mTypeName + "." + QString::number( feat->id() );
fStr += ",\n";

QgsGeometry* geom = feat->geometry();
Expand Down Expand Up @@ -1607,7 +1609,7 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc

//qgs:%TYPENAME%
QDomElement typeNameElement = doc.createElement( "qgs:" + mTypeName /*qgs:%TYPENAME%*/ );
typeNameElement.setAttribute( "fid", mTypeName +"."+ QString::number( feat->id() ) );
typeNameElement.setAttribute( "fid", mTypeName + "." + QString::number( feat->id() ) );
featureElement.appendChild( typeNameElement );

if ( mWithGeom )
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/globe/globe_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ namespace osgEarth
namespace Util
{
#ifdef USE_BACKPORTED_CONTROLS
namespace Controls21
namespace Controls21
#else
namespace Controls
namespace Controls
#endif
{
class NavigationControlHandler : public ControlEventHandler
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
* @param offset specifies offset to use for the pk value parameter
* @param alias specifies an optional alias given to the subject table
*/
QString pkParamWhereClause( int offset, const char* alias=0 ) const;
QString pkParamWhereClause( int offset, const char* alias = 0 ) const;
QString whereClause( QgsFeatureId featureId ) const;

bool hasSufficientPermsAndCapabilities();
Expand Down
10 changes: 5 additions & 5 deletions tests/src/core/testqgsexpression.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,10 @@ class TestQgsExpression: public QObject
QgsPolygon polygon;
polygon << polygon_ring;

QTest::newRow( "geomFromWKT Point" ) << "geomFromWKT('"+QgsGeometry::fromPoint( point )->exportToWkt()+"')" << ( void* ) QgsGeometry::fromPoint( point ) << false;
QTest::newRow( "geomFromWKT Line" ) << "geomFromWKT('"+QgsGeometry::fromPolyline( line )->exportToWkt()+"')" << ( void* ) QgsGeometry::fromPolyline( line ) << false;
QTest::newRow( "geomFromWKT Polyline" ) << "geomFromWKT('"+QgsGeometry::fromPolyline( polyline )->exportToWkt()+"')" << ( void* ) QgsGeometry::fromPolyline( polyline ) << false;
QTest::newRow( "geomFromWKT Polygon" ) << "geomFromWKT('"+QgsGeometry::fromPolygon( polygon )->exportToWkt()+"')" << ( void* ) QgsGeometry::fromPolygon( polygon ) << false;
QTest::newRow( "geomFromWKT Point" ) << "geomFromWKT('" + QgsGeometry::fromPoint( point )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPoint( point ) << false;
QTest::newRow( "geomFromWKT Line" ) << "geomFromWKT('" + QgsGeometry::fromPolyline( line )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( line ) << false;
QTest::newRow( "geomFromWKT Polyline" ) << "geomFromWKT('" + QgsGeometry::fromPolyline( polyline )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolyline( polyline ) << false;
QTest::newRow( "geomFromWKT Polygon" ) << "geomFromWKT('" + QgsGeometry::fromPolygon( polygon )->exportToWkt() + "')" << ( void* ) QgsGeometry::fromPolygon( polygon ) << false;
}

void eval_geometry_constructor()
Expand Down Expand Up @@ -668,7 +668,7 @@ class TestQgsExpression: public QObject
QgsPoint point2( 30, 20 );
QgsGeometry* pnt1 = QgsGeometry::fromPoint( point1 );
QgsGeometry* pnt2 = QgsGeometry::fromPoint( point2 );
QTest::newRow( "union" ) << "union( $geometry, geomFromWKT('"+pnt2->exportToWkt()+"') )" << ( void* ) pnt1 << false << true << ( void* ) pnt1->combine( pnt2 );
QTest::newRow( "union" ) << "union( $geometry, geomFromWKT('" + pnt2->exportToWkt() + "') )" << ( void* ) pnt1 << false << true << ( void* ) pnt1->combine( pnt2 );

geom = QgsGeometry::fromPolygon( polygon );
QTest::newRow( "intersection" ) << "intersection( $geometry, geomFromWKT('POLYGON((0 0, 0 10, 10 0, 0 0))') )" << ( void* ) geom << false << true << ( void* ) QgsGeometry::fromWkt( "POLYGON ((0 0,5 5,10 0,0 0))" );
Expand Down