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

Fix Qt5 build

Browse Source
This commit is contained in:
Matthias Kuhn 2016-03-03 20:36:47 +01:00
parent 23546775d2
commit 281117d78f
2 changed files with 2 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsogrutils.cpp
View File

@ -235,7 +235,7 @@ QgsFeatureList QgsOgrUtils::stringToFeatureList( const QString& string, const Qg
if ( string.isEmpty() )
return features;
QString randomFileName = QString( "/vsimem/%1" ).arg( QUuid::createUuid() );
QString randomFileName = QString( "/vsimem/%1" ).arg( QUuid::createUuid().toString() );
// create memory file system object from string buffer
QByteArray ba = string.toUtf8();
@ -279,7 +279,7 @@ QgsFields QgsOgrUtils::stringToFields( const QString& string, QTextCodec* encodi
if ( string.isEmpty() )
return fields;
QString randomFileName = QString( "/vsimem/%1" ).arg( QUuid::createUuid() );
QString randomFileName = QString( "/vsimem/%1" ).arg( QUuid::createUuid().toString() );
// create memory file system object from buffer
QByteArray ba = string.toUtf8();

203
src/core/qgsogrutils.cpp.bom
View File

@ -1,203 +0,0 @@
/***************************************************************************
qgsogrutils.cpp
---------------
begin : February 2016
copyright : (C) 2016 Nyall Dawson
email : nyall dot dawson at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "qgsogrutils.h"
#include "qgsapplication.h"
#include "qgslogger.h"
#include "qgsgeometry.h"
#include <QTextCodec>
QgsFeature QgsOgrUtils::readOgrFeature(OGRFeatureH ogrFet, const QgsFields& fields, QTextCodec* encoding)
{
QgsFeature feature;
feature.setFeatureId( OGR_F_GetFID( ogrFet ) );
feature.setValid( true );
if ( !readOgrFeatureGeometry( ogrFet, feature ) )
{
feature.setValid( false );
}
if ( !readOgrFeatureAttributes( ogrFet, fields, feature, encoding ) )
{
feature.setValid( false );
}
return feature;
}
QgsFields QgsOgrUtils::readOgrFields( OGRFeatureH ogrFet, QTextCodec* encoding )
{
QgsFields fields;
if ( !ogrFet )
return fields;
int fieldCount = OGR_F_GetFieldCount( fet );
for ( int i = 0; i < fieldCount; ++i )
{
OGRFieldDefnH fldDef = OGR_F_GetFieldDefnRef( ogrFet, i );
if ( !fldDef )
{
fields.append( QgsField() );
continue;
}
QString name = encoding->toUnicode( OGR_Fld_GetNameRef( fldDef ) );
QVariant::Type varType;
switch ( OGR_Fld_GetType( fldDef ) )
{
case OFTInteger:
varType = QVariant::Int;
break;
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 2000000
case OFTInteger64:
varType = QVariant::LongLong;
break;
#endif
case OFTReal:
varType = QVariant::Double;
break;
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1400
case OFTDate:
varType = QVariant::Date;
break;
case OFTTime:
varType = QVariant::Time;
break;
case OFTDateTime:
varType = QVariant::DateTime;
break;
case OFTString:
#endif
default:
varType = QVariant::String; // other unsupported, leave it as a string
}
fields.append( QgsField( name, varType ) );
}
return fields;
}
QVariant QgsOgrUtils::getOgrFeatureAttribute(OGRFeatureH ogrFet, const QgsFields& fields, int attIndex, QTextCodec* encoding , bool* ok)
{
OGRFieldDefnH fldDef = OGR_F_GetFieldDefnRef( ogrFet, attIndex );
if ( ! fldDef )
{
if ( ok )
*ok = false;
QgsDebugMsg( "ogrFet->GetFieldDefnRef(attindex) returns NULL" );
return QVariant();
}
QVariant value;
if ( ok )
*ok = true;
if ( OGR_F_IsFieldSet( ogrFet, attIndex ) )
{
switch ( fields.at( attIndex ).type() )
{
case QVariant::String:
value = QVariant( encoding->toUnicode( OGR_F_GetFieldAsString( ogrFet, attIndex ) ) );
break;
case QVariant::Int:
value = QVariant( OGR_F_GetFieldAsInteger( ogrFet, attIndex ) );
break;
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 2000000
case QVariant::LongLong:
value = QVariant( OGR_F_GetFieldAsInteger64( ogrFet, attIndex ) );
break;
#endif
case QVariant::Double:
value = QVariant( OGR_F_GetFieldAsDouble( ogrFet, attIndex ) );
break;
case QVariant::Date:
case QVariant::DateTime:
case QVariant::Time:
{
int year, month, day, hour, minute, second, tzf;
OGR_F_GetFieldAsDateTime( ogrFet, attIndex, &year, &month, &day, &hour, &minute, &second, &tzf );
if ( fields.at( attIndex ).type() == QVariant::Date )
value = QDate( year, month, day );
else if ( fields.at( attIndex ).type() == QVariant::Time )
value = QTime( hour, minute, second );
else
value = QDateTime( QDate( year, month, day ), QTime( hour, minute, second ) );
}
break;
default:
Q_ASSERT_X( false, "QgsOgrUtils::getOgrFeatureAttribute", "unsupported field type" );
if ( ok )
*ok = false;
}
}
else
{
value = QVariant( QString::null );
}
return value;
}
bool QgsOgrUtils::readOgrFeatureAttributes(OGRFeatureH ogrFet, const QgsFields& fields, QgsFeature& feature, QTextCodec* encoding )
{
// read all attributes
feature.initAttributes( fields.count() );
feature.setFields( fields );
bool ok = false;
for ( int idx = 0; idx < fields.count(); ++idx )
{
QVariant value = getOgrFeatureAttribute( ogrFet, fields, idx, encoding, &ok );
if ( ok )
{
feature.setAttribute( idx, value );
}
}
return true;
}
bool QgsOgrUtils::readOgrFeatureGeometry( OGRFeatureH ogrFet, QgsFeature& feature )
{
if ( !ogrFet )
return false;
OGRGeometryH geom = OGR_F_GetGeometryRef( ogrFet );
if ( !geom )
feature.setGeometry( nullptr );
else
feature.setGeometry( ogrGeometryToQgsGeometry( geom ) );
return true;
}
QgsGeometry* QgsOgrUtils::ogrGeometryToQgsGeometry( OGRGeometryH geom )
{
if ( !geom )
return nullptr;
// get the wkb representation
int memorySize = OGR_G_WkbSize( geom );
unsigned char *wkb = new unsigned char[memorySize];
OGR_G_ExportToWkb( geom, ( OGRwkbByteOrder ) QgsApplication::endian(), wkb );
QgsGeometry *g = new QgsGeometry();
g->fromWkb( wkb, memorySize );
return g;
}