48 changes: 24 additions & 24 deletions src/core/qgsogcutils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,13 +1004,13 @@ QDomElement QgsOgcUtils::rectangleToGMLBox( QgsRectangle* box, QDomDocument& doc
coordElem.setAttribute( "ts", " " );

QString coordString;
coordString += QString::number( box->xMinimum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( box->xMinimum() );
coordString += ",";
coordString += QString::number( box->yMinimum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( box->yMinimum() );
coordString += " ";
coordString += QString::number( box->xMaximum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( box->xMaximum() );
coordString += ",";
coordString += QString::number( box->yMaximum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( box->yMaximum() );

QDomText coordText = doc.createTextNode( coordString );
coordElem.appendChild( coordText );
Expand All @@ -1030,17 +1030,17 @@ QDomElement QgsOgcUtils::rectangleToGMLEnvelope( QgsRectangle* env, QDomDocument
QString posList;

QDomElement lowerCornerElem = doc.createElement( "gml:lowerCorner" );
posList = QString::number( env->xMinimum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
posList = qgsDoubleToString( env->xMinimum() );
posList += " ";
posList += QString::number( env->yMinimum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
posList += qgsDoubleToString( env->yMinimum() );
QDomText lowerCornerText = doc.createTextNode( posList );
lowerCornerElem.appendChild( lowerCornerText );
envElem.appendChild( lowerCornerElem );

QDomElement upperCornerElem = doc.createElement( "gml:upperCorner" );
posList = QString::number( env->xMaximum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
posList = qgsDoubleToString( env->xMaximum() );
posList += " ";
posList += QString::number( env->yMaximum(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
posList += qgsDoubleToString( env->yMaximum() );
QDomText upperCornerText = doc.createTextNode( posList );
upperCornerElem.appendChild( upperCornerText );
envElem.appendChild( upperCornerElem );
Expand Down Expand Up @@ -1097,10 +1097,10 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
QDomElement coordElem = baseCoordElem.cloneNode().toElement();
QString coordString;
x = ( double * )( wkb + 5 );
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
coordString += cs;
y = ( double * )( wkb + 5 + sizeof( double ) );
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
QDomText coordText = doc.createTextNode( coordString );
coordElem.appendChild( coordText );
pointElem.appendChild( coordElem );
Expand All @@ -1125,11 +1125,11 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
QDomElement coordElem = baseCoordElem.cloneNode().toElement();
QString coordString;
x = ( double * )( ptr );
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
coordString += cs;
ptr += sizeof( double );
y = ( double * )( ptr );
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
QDomText coordText = doc.createTextNode( coordString );
coordElem.appendChild( coordText );
pointElem.appendChild( coordElem );
Expand Down Expand Up @@ -1166,11 +1166,11 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
coordString += ts;
}
x = ( double * ) ptr;
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
coordString += cs;
ptr += sizeof( double );
y = ( double * ) ptr;
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -1209,11 +1209,11 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
coordString += ts;
}
x = ( double * ) ptr;
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
ptr += sizeof( double );
coordString += cs;
y = ( double * ) ptr;
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -1270,11 +1270,11 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
coordString += ts;
}
x = ( double * ) ptr;
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
coordString += cs;
ptr += sizeof( double );
y = ( double * ) ptr;
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -1330,11 +1330,11 @@ QDomElement QgsOgcUtils::geometryToGML( QgsGeometry* geometry, QDomDocument& doc
coordString += ts;
}
x = ( double * ) ptr;
coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *x );
ptr += sizeof( double );
coordString += cs;
y = ( double * ) ptr;
coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( *y );
ptr += sizeof( double );
if ( hasZValue )
{
Expand Down Expand Up @@ -1376,9 +1376,9 @@ QDomElement QgsOgcUtils::createGMLCoordinates( const QgsPolyline &points, QDomDo
{
coordString += " ";
}
coordString += QString::number( pointIt->x(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( pointIt->x() );
coordString += ",";
coordString += QString::number( pointIt->y(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( pointIt->y() );
}

QDomText coordText = doc.createTextNode( coordString );
Expand All @@ -1401,9 +1401,9 @@ QDomElement QgsOgcUtils::createGMLPositions( const QgsPolyline &points, QDomDocu
{
coordString += " ";
}
coordString += QString::number( pointIt->x(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( pointIt->x() );
coordString += " ";
coordString += QString::number( pointIt->y(), 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
coordString += qgsDoubleToString( pointIt->y() );
}

QDomText coordText = doc.createTextNode( coordString );
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspoint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ QString QgsPoint::toDegreesMinutes( int thePrecision ) const

QString QgsPoint::wellKnownText() const
{
return QString( "POINT(%1 %2)" ).arg( QString::number( m_x, 'f', 18 ) ).arg( QString::number( m_y, 'f', 18 ) );
return QString( "POINT(%1 %2)" ).arg( qgsDoubleToString( m_x ) ).arg( qgsDoubleToString( m_y ) );
}

double QgsPoint::sqrDist( double x, double y ) const
Expand Down
40 changes: 17 additions & 23 deletions src/core/qgsrectangle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,8 @@ bool QgsRectangle::isEmpty() const
QString QgsRectangle::asWktCoordinates() const
{
QString rep =
QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) );
qgsDoubleToString( xmin ) + " " + qgsDoubleToString( ymin ) + ", " +
qgsDoubleToString( xmax ) + " " + qgsDoubleToString( ymax );

return rep;
}
Expand All @@ -199,16 +197,11 @@ QString QgsRectangle::asWktPolygon() const
{
QString rep =
QString( "POLYGON((" ) +
QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) +
qgsDoubleToString( xmin ) + " " + qgsDoubleToString( ymin ) + ", " +
qgsDoubleToString( xmax ) + " " + qgsDoubleToString( ymin ) + ", " +
qgsDoubleToString( xmax ) + " " + qgsDoubleToString( ymax ) + ", " +
qgsDoubleToString( xmin ) + " " + qgsDoubleToString( ymax ) + ", " +
qgsDoubleToString( xmin ) + " " + qgsDoubleToString( ymin ) +
QString( "))" );

return rep;
Expand Down Expand Up @@ -273,11 +266,12 @@ QString QgsRectangle::asPolygon() const
foo.setRealNumberNotation( QTextStream::FixedNotation );
// NOTE: a polygon isn't a polygon unless its closed. In the case of
// a rectangle, that means 5 points (last == first)
foo << xmin << " " << ymin << ", "
<< xmin << " " << ymax << ", "
<< xmax << " " << ymax << ", "
<< xmax << " " << ymin << ", "
<< xmin << " " << ymin;
foo
<< xmin << " " << ymin << ", "
<< xmin << " " << ymax << ", "
<< xmax << " " << ymax << ", "
<< xmax << " " << ymin << ", "
<< xmin << " " << ymin;

return rep;

Expand All @@ -286,10 +280,10 @@ QString QgsRectangle::asPolygon() const

bool QgsRectangle::operator==( const QgsRectangle & r1 ) const
{
return ( r1.xMaximum() == xMaximum() &&
r1.xMinimum() == xMinimum() &&
r1.yMaximum() == yMaximum() &&
r1.yMinimum() == yMinimum() );
return r1.xMaximum() == xMaximum() &&
r1.xMinimum() == xMinimum() &&
r1.yMaximum() == yMaximum() &&
r1.yMinimum() == yMinimum();
}


Expand Down
19 changes: 11 additions & 8 deletions src/plugins/georeferencer/qgsgeorefplugingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1223,9 +1223,12 @@ void QgsGeorefPluginGui::saveGCPs()
points << "mapX,mapY,pixelX,pixelY,enable" << endl;
foreach ( QgsGeorefDataPoint *pt, mPoints )
{
points << ( QString( "%1,%2,%3,%4,%5" ).arg( pt->mapCoords().x(), 0, 'f', 15 ).
arg( pt->mapCoords().y(), 0, 'f', 15 ).arg( pt->pixelCoords().x(), 0, 'f', 15 ).
arg( pt->pixelCoords().y(), 0, 'f', 15 ) ).arg( pt->isEnabled() ) << endl;
points << QString( "%1,%2,%3,%4,%5" )
.arg( qgsDoubleToString( pt->mapCoords().x() ) )
.arg( qgsDoubleToString( pt->mapCoords().y() ) )
.arg( qgsDoubleToString( pt->pixelCoords().x() ) )
.arg( qgsDoubleToString( pt->pixelCoords().y() ) )
.arg( pt->isEnabled() ) << endl;
}

mInitialPoints = mPoints;
Expand Down Expand Up @@ -1377,12 +1380,12 @@ bool QgsGeorefPluginGui::writeWorldFile( QgsPoint origin, double pixelXSize, dou
}

QTextStream stream( &file );
stream << QString::number( pixelXSize, 'f', 15 ) << endl
stream << qgsDoubleToString( pixelXSize ) << endl
<< rotationX << endl
<< rotationY << endl
<< QString::number( -pixelYSize, 'f', 15 ) << endl
<< QString::number( origin.x(), 'f', 15 ) << endl
<< QString::number( origin.y(), 'f', 15 ) << endl;
<< qgsDoubleToString( -pixelYSize ) << endl
<< qgsDoubleToString( origin.x() ) << endl
<< qgsDoubleToString( origin.y() ) << endl;
return true;
}

Expand Down Expand Up @@ -1703,7 +1706,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
{
currentGCPStrings << tr( "no" );
}
currentGCPStrings << QString::number(( *gcpIt )->pixelCoords().x(), 'f', 0 ) << QString::number(( *gcpIt )->pixelCoords().y(), 'f', 0 ) << QString::number(( *gcpIt )->mapCoords().x(), 'f', 3 )\
currentGCPStrings << QString::number(( *gcpIt )->pixelCoords().x(), 'f', 0 ) << QString::number(( *gcpIt )->pixelCoords().y(), 'f', 0 ) << QString::number(( *gcpIt )->mapCoords().x(), 'f', 3 )
<< QString::number(( *gcpIt )->mapCoords().y(), 'f', 3 ) << QString::number( residual.x() ) << QString::number( residual.y() ) << QString::number( residualTot );
gcpTable->addRow( currentGCPStrings );
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/georeferencer/qgsmapcoordsdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ void QgsMapCoordsDialog::maybeSetXY( const QgsPoint & xy, Qt::MouseButton button

leXCoord->clear();
leYCoord->clear();
leXCoord->setText( QString::number( mapCoordPoint.x(), 'f', 7 ) );
leYCoord->setText( QString::number( mapCoordPoint.y(), 'f', 7 ) );
leXCoord->setText( qgsDoubleToString( mapCoordPoint.x() ) );
leYCoord->setText( qgsDoubleToString( mapCoordPoint.y() ) );
}

parentWidget()->showNormal();
Expand Down
16 changes: 8 additions & 8 deletions src/plugins/grass/qgsgrassmodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,21 +421,21 @@ QString QgsGrassModelItem::info()
str += htmlTableRow( QObject::tr( "Projection Type" ), proj );
if ( window.proj == PROJECTION_UTM )
str += htmlTableRow( QObject::tr( "Zone" ), QString::number( window.zone ) );
str += htmlTableRow( QObject::tr( "North" ), QString::number( window.north, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "South" ), QString::number( window.south, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "East" ), QString::number( window.east, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "West" ), QString::number( window.west, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "North" ), qgsDoubleToString( window.north ) );
str += htmlTableRow( QObject::tr( "South" ), qgsDoubleToString( window.south ) );
str += htmlTableRow( QObject::tr( "East" ), qgsDoubleToString( window.east ) );
str += htmlTableRow( QObject::tr( "West" ), qgsDoubleToString( window.west ) );
str += htmlTableRow( QObject::tr( "Columns" ), QString::number( window.cols ) );
str += htmlTableRow( QObject::tr( "Rows" ), QString::number( window.rows ) );
str += htmlTableRow( QObject::tr( "E-W resolution" ), QString::number( window.ew_res, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "N-S resolution" ), QString::number( window.ns_res, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "E-W resolution" ), qgsDoubleToString( window.ew_res ) );
str += htmlTableRow( QObject::tr( "N-S resolution" ), qgsDoubleToString( window.ns_res ) );
str += htmlTableRow( QObject::tr( "Top" ), QString::number( window.top ) );
str += htmlTableRow( QObject::tr( "Bottom" ), QString::number( window.bottom ) );
str += htmlTableRow( QObject::tr( "3D Cols" ), QString::number( window.cols3 ) );
str += htmlTableRow( QObject::tr( "3D Rows" ), QString::number( window.rows3 ) );
str += htmlTableRow( QObject::tr( "Depths" ), QString::number( window.depths ) );
str += htmlTableRow( QObject::tr( "E-W 3D resolution" ), QString::number( window.ew_res3, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "N-S 3D resolution" ), QString::number( window.ns_res3, 'f', 8 ) );
str += htmlTableRow( QObject::tr( "E-W 3D resolution" ), qgsDoubleToString( window.ew_res3 ) );
str += htmlTableRow( QObject::tr( "N-S 3D resolution" ), qgsDoubleToString( window.ns_res3 ) );
}
str += "</table>";
return str;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/qgsshapefile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_

// FIXME: OGR_F_GetFieldAsString returns junk when called with a 8.255 float field
if ( column_types[n] == "float" )
val = QString::number( OGR_F_GetFieldAsDouble( feat, n ), 'f', 16 );
val = qgsDoubleToString( OGR_F_GetFieldAsDouble( feat, n ) );
else
val = codec->toUnicode( OGR_F_GetFieldAsString( feat, n ) );

Expand Down
9 changes: 9 additions & 0 deletions src/providers/mssql/qgsmssqlprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,15 @@ void QgsMssqlProvider::loadFields()
sqlTypeName,
query.value( 7 ).toInt() ) );
}
else if ( sqlType == QVariant::Double )
{
mAttributeFields.append(
QgsField(
query.value( 3 ).toString(), sqlType,
sqlTypeName,
query.value( 7 ).toInt(),
query.value( 8 ).toInt() ) );
}
else
{
mAttributeFields.append(
Expand Down
8 changes: 4 additions & 4 deletions src/providers/oracle/qgsoraclefeatureiterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleProvider *p, const
"mdsys.sdo_ordinate_array(%2,%3,%4,%5)"
")" )
.arg( P->mSrid < 1 ? "NULL" : QString::number( P->mSrid ) )
.arg( rect.xMinimum(), 0, 'f', 16 )
.arg( rect.yMinimum(), 0, 'f', 16 )
.arg( rect.xMaximum(), 0, 'f', 16 )
.arg( rect.yMaximum(), 0, 'f', 16 );
.arg( qgsDoubleToString( rect.xMinimum() ) )
.arg( qgsDoubleToString( rect.yMinimum() ) )
.arg( qgsDoubleToString( rect.xMaximum() ) )
.arg( qgsDoubleToString( rect.yMaximum() ) );

if ( !P->mSpatialIndex.isNull() )
{
Expand Down
8 changes: 4 additions & 4 deletions src/providers/oracle/qgsoracleprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2225,8 +2225,8 @@ bool QgsOracleProvider::createSpatialIndex()
"mdsys.sdo_dim_element('X', %1, %2, 0.001),"
"mdsys.sdo_dim_element('Y', %3, %4, 0.001)"
") WHERE table_name=%5 AND column_name=%6" )
.arg( r.xMinimum(), 0, 'f', 16 ).arg( r.xMaximum(), 0, 'f', 16 )
.arg( r.yMinimum(), 0, 'f', 16 ).arg( r.yMaximum(), 0, 'f', 16 )
.arg( qgsDoubleToString( r.xMinimum() ) ).arg( qgsDoubleToString( r.xMaximum() ) )
.arg( qgsDoubleToString( r.yMinimum() ) ).arg( qgsDoubleToString( r.yMaximum() ) )
.arg( quotedValue( mTableName ) )
.arg( quotedValue( mGeometryColumn ) ) )
)
Expand All @@ -2249,8 +2249,8 @@ bool QgsOracleProvider::createSpatialIndex()
.arg( quotedValue( mTableName ) )
.arg( quotedValue( mGeometryColumn ) )
.arg( mSrid < 1 ? "NULL" : QString::number( mSrid ) )
.arg( r.xMinimum(), 0, 'f', 16 ).arg( r.xMaximum(), 0, 'f', 16 )
.arg( r.yMinimum(), 0, 'f', 16 ).arg( r.yMaximum(), 0, 'f', 16 )
.arg( qgsDoubleToString( r.xMinimum() ) ).arg( qgsDoubleToString( r.xMaximum() ) )
.arg( qgsDoubleToString( r.yMinimum() ) ).arg( qgsDoubleToString( r.yMaximum() ) )
) )
{
QgsMessageLog::logMessage( tr( "Could not insert metadata for %1.%2.\nSQL:%3\nError: %4" )
Expand Down
8 changes: 4 additions & 4 deletions src/providers/postgres/qgspostgresfeatureiterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
else
{
qBox = QString( "st_makeenvelope(%1,%2,%3,%4,%5)" )
.arg( rect.xMinimum(), 0, 'f', 16 )
.arg( rect.yMinimum(), 0, 'f', 16 )
.arg( rect.xMaximum(), 0, 'f', 16 )
.arg( rect.yMaximum(), 0, 'f', 16 )
.arg( qgsDoubleToString( rect.xMinimum() ) )
.arg( qgsDoubleToString( rect.yMinimum() ) )
.arg( qgsDoubleToString( rect.xMaximum() ) )
.arg( qgsDoubleToString( rect.yMaximum() ) )
.arg( P->mRequestedSrid.isEmpty() ? P->mDetectedSrid : P->mRequestedSrid );
}

Expand Down
18 changes: 9 additions & 9 deletions src/providers/spatialite/qgsspatialitefeatureiterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()
if ( P->spatialIndexRTree )
{
// using the RTree spatial index
QString mbrFilter = QString( "xmin <= %1 AND " ).arg( QString::number( rect.xMaximum(), 'f', 6 ) );
mbrFilter += QString( "xmax >= %1 AND " ).arg( QString::number( rect.xMinimum(), 'f', 6 ) );
mbrFilter += QString( "ymin <= %1 AND " ).arg( QString::number( rect.yMaximum(), 'f', 6 ) );
mbrFilter += QString( "ymax >= %1" ).arg( QString::number( rect.yMinimum(), 'f', 6 ) );
QString mbrFilter = QString( "xmin <= %1 AND " ).arg( qgsDoubleToString( rect.xMaximum() ) );
mbrFilter += QString( "xmax >= %1 AND " ).arg( qgsDoubleToString( rect.xMinimum() ) );
mbrFilter += QString( "ymin <= %1 AND " ).arg( qgsDoubleToString( rect.yMaximum() ) );
mbrFilter += QString( "ymax >= %1" ).arg( qgsDoubleToString( rect.yMinimum() ) );
QString idxName = QString( "idx_%1_%2" ).arg( P->mIndexTable ).arg( P->mIndexGeometry );
whereClause += QString( "%1 IN (SELECT pkid FROM %2 WHERE %3)" )
.arg( quotedPrimaryKey() )
Expand Down Expand Up @@ -258,11 +258,11 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()

QString QgsSpatiaLiteFeatureIterator::mbr( const QgsRectangle& rect )
{
return QString( "%1, %2, %3, %4" ).
arg( QString::number( rect.xMinimum(), 'f', 6 ) ).
arg( QString::number( rect.yMinimum(), 'f', 6 ) ).
arg( QString::number( rect.xMaximum(), 'f', 6 ) ).
arg( QString::number( rect.yMaximum(), 'f', 6 ) );
return QString( "%1, %2, %3, %4" )
.arg( qgsDoubleToString( rect.xMinimum() ) )
.arg( qgsDoubleToString( rect.yMinimum() ) )
.arg( qgsDoubleToString( rect.xMaximum() ) )
.arg( qgsDoubleToString( rect.yMaximum() ) );
}


Expand Down
16 changes: 8 additions & 8 deletions src/providers/wcs/qgswcsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,10 +689,10 @@ void QgsWcsProvider::getCache( int bandNo, QgsRectangle const & viewExtent, int

// Bounding box in WCS format (Warning: does not work with scientific notation)
QString bbox = QString( changeXY ? "%2,%1,%4,%3" : "%1,%2,%3,%4" )
.arg( extent.xMinimum(), 0, 'f', 16 )
.arg( extent.yMinimum(), 0, 'f', 16 )
.arg( extent.xMaximum(), 0, 'f', 16 )
.arg( extent.yMaximum(), 0, 'f', 16 );
.arg( qgsDoubleToString( extent.xMinimum() ) )
.arg( qgsDoubleToString( extent.yMinimum() ) )
.arg( qgsDoubleToString( extent.xMaximum() ) )
.arg( qgsDoubleToString( extent.yMaximum() ) );

QUrl url( mIgnoreGetCoverageUrl ? mBaseUrl : mCapabilities.getCoverageUrl() );

Expand Down Expand Up @@ -756,8 +756,8 @@ void QgsWcsProvider::getCache( int bandNo, QgsRectangle const & viewExtent, int
// Mapserver 6.0.3 does not work with origin on yMinimum (lower left)
// Geoserver works OK with yMinimum (lower left)
QString gridOrigin = QString( changeXY ? "%2,%1" : "%1,%2" )
.arg( extent.xMinimum(), 0, 'f', 16 )
.arg( extent.yMaximum(), 0, 'f', 16 );
.arg( qgsDoubleToString( extent.xMinimum() ) )
.arg( qgsDoubleToString( extent.yMaximum() ) );
setQueryItem( url, "GRIDORIGIN", gridOrigin );

// GridOffsets WCS 1.1:
Expand All @@ -776,8 +776,8 @@ void QgsWcsProvider::getCache( int bandNo, QgsRectangle const & viewExtent, int
QString gridOffsets = QString( changeXY ? "%2,%1" : "%1,%2" )
//setQueryItem( url, "GRIDTYPE", "urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs" );
//QString gridOffsets = QString( changeXY ? "%2,0,0,%1" : "%1,0,0,%2" )
.arg( xRes, 0, 'f', 16 )
.arg( yOff, 0, 'f', 16 );
.arg( qgsDoubleToString( xRes ) )
.arg( qgsDoubleToString( yOff ) );
setQueryItem( url, "GRIDOFFSETS", gridOffsets );
}

Expand Down
8 changes: 4 additions & 4 deletions src/providers/wfs/qgswfscapabilities.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ QString QgsWFSCapabilities::uriGetFeature( QString typeName, QString crsString,
if ( !bBox.isEmpty() )
{
bBoxString = QString( "&BBOX=%1,%2,%3,%4" )
.arg( bBox.xMinimum(), 0, 'f' )
.arg( bBox.yMinimum(), 0, 'f' )
.arg( bBox.xMaximum(), 0, 'f' )
.arg( bBox.yMaximum(), 0, 'f' );
.arg( qgsDoubleToString( bBox.xMinimum() ) )
.arg( qgsDoubleToString( bBox.yMinimum() ) )
.arg( qgsDoubleToString( bBox.xMaximum() ) )
.arg( qgsDoubleToString( bBox.yMaximum() ) );
}

QString uri = mBaseUrl;
Expand Down
8 changes: 4 additions & 4 deletions src/providers/wfs/qgswfsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ QgsFeatureIterator QgsWFSProvider::getFeatures( const QgsFeatureRequest& request
.arg( mLayer->name(), mGetExtent.asWktCoordinates() ) );
dsURI = dsURI.replace( QRegExp( "BBOX=[^&]*" ),
QString( "BBOX=%1,%2,%3,%4" )
.arg( mGetExtent.xMinimum(), 0, 'f' )
.arg( mGetExtent.yMinimum(), 0, 'f' )
.arg( mGetExtent.xMaximum(), 0, 'f' )
.arg( mGetExtent.yMaximum(), 0, 'f' ) );
.arg( qgsDoubleToString( mGetExtent.xMinimum() ) )
.arg( qgsDoubleToString( mGetExtent.yMinimum() ) )
.arg( qgsDoubleToString( mGetExtent.xMaximum() ) )
.arg( qgsDoubleToString( mGetExtent.yMaximum() ) ) );
//TODO: BBOX may not be combined with FILTER. WFS spec v. 1.1.0, sec. 14.7.3 ff.
// if a FILTER is present, the BBOX must be merged into it, capabilities permitting.
// Else one criterion must be abandoned and the user warned. [WBC 111221]
Expand Down
34 changes: 17 additions & 17 deletions src/providers/wms/qgswmsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,10 +590,10 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i

// Bounding box in WMS format (Warning: does not work with scientific notation)
QString bbox = QString( changeXY ? "%2,%1,%4,%3" : "%1,%2,%3,%4" )
.arg( viewExtent.xMinimum(), 0, 'f', 16 )
.arg( viewExtent.yMinimum(), 0, 'f', 16 )
.arg( viewExtent.xMaximum(), 0, 'f', 16 )
.arg( viewExtent.yMaximum(), 0, 'f', 16 );
.arg( qgsDoubleToString( viewExtent.xMinimum() ) )
.arg( qgsDoubleToString( viewExtent.yMinimum() ) )
.arg( qgsDoubleToString( viewExtent.xMaximum() ) )
.arg( qgsDoubleToString( viewExtent.yMaximum() ) );

mCachedImage = new QImage( pixelWidth, pixelHeight, QImage::Format_ARGB32 );
mCachedImage->fill( 0 );
Expand Down Expand Up @@ -745,15 +745,15 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
}

QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )
.arg( mLayerExtent.xMinimum(), 0, 'f' )
.arg( mLayerExtent.yMinimum(), 0, 'f' )
.arg( qgsDoubleToString( mLayerExtent.xMinimum() ) )
.arg( qgsDoubleToString( mLayerExtent.yMinimum() ) )
.arg( mLayerExtent.width() )
.arg( mLayerExtent.height() )
);

QgsDebugMsg( QString( "view extent: %1,%2 %3x%4 res:%5" )
.arg( viewExtent.xMinimum(), 0, 'f' )
.arg( viewExtent.yMinimum(), 0, 'f' )
.arg( qgsDoubleToString( viewExtent.xMinimum() ) )
.arg( qgsDoubleToString( viewExtent.yMinimum() ) )
.arg( viewExtent.width() )
.arg( viewExtent.height() )
.arg( vres, 0, 'f' )
Expand All @@ -769,7 +769,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
// calculate tile coordinates
double twMap = tm->tileWidth * tres;
double thMap = tm->tileHeight * tres;
QgsDebugMsg( QString( "tile map size: %1,%2" ).arg( twMap, 0, 'f' ).arg( thMap, 0, 'f' ) );
QgsDebugMsg( QString( "tile map size: %1,%2" ).arg( qgsDoubleToString( twMap ) ).arg( qgsDoubleToString( thMap ) ) );

int minTileCol = 0;
int maxTileCol = tm->matrixWidth - 1;
Expand Down Expand Up @@ -851,10 +851,10 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
QString turl;
turl += url.toString();
turl += QString( changeXY ? "&BBOX=%2,%1,%4,%3" : "&BBOX=%1,%2,%3,%4" )
.arg( tm->topLeft.x() + col * twMap /* + twMap * 0.001 */, 0, 'f', 16 )
.arg( tm->topLeft.y() - ( row + 1 ) * thMap /* - thMap * 0.001 */, 0, 'f', 16 )
.arg( tm->topLeft.x() + ( col + 1 ) * twMap /* - twMap * 0.001 */, 0, 'f', 16 )
.arg( tm->topLeft.y() - row * thMap /* + thMap * 0.001 */, 0, 'f', 16 );
.arg( qgsDoubleToString( tm->topLeft.x() + col * twMap /* + twMap * 0.001 */ ) )
.arg( qgsDoubleToString( tm->topLeft.y() - ( row + 1 ) * thMap /* - thMap * 0.001 */ ) )
.arg( qgsDoubleToString( tm->topLeft.x() + ( col + 1 ) * twMap /* - twMap * 0.001 */ ) )
.arg( qgsDoubleToString( tm->topLeft.y() - row * thMap /* + thMap * 0.001 */ ) );

QNetworkRequest request( turl );
setAuthorization( request );
Expand Down Expand Up @@ -4005,10 +4005,10 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs

// Compose request to WMS server
QString bbox = QString( changeXY ? "%2,%1,%4,%3" : "%1,%2,%3,%4" )
.arg( myExtent.xMinimum(), 0, 'f', 16 )
.arg( myExtent.yMinimum(), 0, 'f', 16 )
.arg( myExtent.xMaximum(), 0, 'f', 16 )
.arg( myExtent.yMaximum(), 0, 'f', 16 );
.arg( qgsDoubleToString( myExtent.xMinimum() ) )
.arg( qgsDoubleToString( myExtent.yMinimum() ) )
.arg( qgsDoubleToString( myExtent.xMaximum() ) )
.arg( qgsDoubleToString( myExtent.yMaximum() ) );

//QgsFeatureList featureList;

Expand Down