Skip to content

Commit 483a8d8

Browse files
timlinuxtimlinux
committedOct 28, 2011
Merge branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents 0d79669 + 05e3258 commit 483a8d8

21 files changed

+40
-203
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ qgis (1.8.0) UNRELEASED; urgency=low
1010
* drop abi postfix from sqlanywhere plugin
1111
* include network analysis library
1212
* build package with libspatialindex where available
13-
* drop wfsplugin
13+
* drop wfsplugin & displaceplugin
1414

15-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Oct 2011 20:03:51 +0000
15+
-- Jürgen E. Fischer <jef@norbit.de> Fri, 28 Oct 2011 08:52:45 +0200
1616

1717
qgis (1.7.0) UNRELEASED; urgency=low
1818

‎debian/qgis.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ usr/lib/qgis/plugins/libdiagramoverlay.so
1010
usr/lib/qgis/plugins/libevis.so
1111
usr/lib/qgis/plugins/librasterterrainplugin.so
1212
usr/lib/qgis/plugins/libspatialqueryplugin.so
13-
usr/lib/qgis/plugins/libdisplacementplugin.so
1413
usr/lib/qgis/plugins/libofflineeditingplugin.so
1514
usr/lib/qgis/plugins/libroadgraphplugin.so
1615
usr/lib/qgis/plugins/libzonalstatisticsplugin.so

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
327327
{
328328
static QString authid = QString::null;
329329
QSettings mySettings;
330-
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
330+
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
331331
if ( myDefaultProjectionOption == "prompt" )
332332
{
333333
//@note this class is not a descendent of QWidget so we cant pass

‎src/app/qgsoptions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
177177
// set the display update threshold
178178
spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
179179
//set the default projection behaviour radio buttongs
180-
if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )
180+
if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )
181181
{
182182
radPromptForProjection->setChecked( true );
183183
}
184-
else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )
184+
else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )
185185
{
186186
radUseProjectProjection->setChecked( true );
187187
}

‎src/core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ SET(QGIS_CORE_SRCS
3939
symbology-ng/qgssymbologyv2conversion.cpp
4040
symbology-ng/qgssvgcache.cpp
4141
symbology-ng/qgsellipsesymbollayerv2.cpp
42+
symbology-ng/qgspointdisplacementrenderer.cpp
4243

4344
qgis.cpp
4445
qgsapplication.cpp

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,18 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q
267267
{
268268
mAuthId = QString( "USER:%1" ).arg( mSrsId );
269269
}
270+
else if ( mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
271+
{
272+
OSRDestroySpatialReference( mCRS );
273+
mCRS = OSRNewSpatialReference( NULL );
274+
mIsValidFlag = OSRSetFromUserInput( mCRS, mAuthId.toLower().toAscii() ) == OGRERR_NONE;
275+
setMapUnits();
276+
}
270277

271-
setProj4String( toProj4 );
272-
setMapUnits();
278+
if ( !mIsValidFlag )
279+
{
280+
setProj4String( toProj4 );
281+
}
273282
}
274283
else
275284
{

‎src/core/qgsscalecalculator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void QgsScaleCalculator::setMapUnits( QGis::UnitType mapUnits )
4545

4646
QGis::UnitType QgsScaleCalculator::mapUnits() const
4747
{
48-
QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 3 );
48+
QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 4 );
4949
return mMapUnits;
5050
}
5151

‎src/core/symbology-ng/qgsrendererv2registry.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "qgscategorizedsymbolrendererv2.h"
66
#include "qgsgraduatedsymbolrendererv2.h"
77
#include "qgsrulebasedrendererv2.h"
8+
#include "qgspointdisplacementrenderer.h"
89

910
QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;
1011

@@ -24,6 +25,9 @@ QgsRendererV2Registry::QgsRendererV2Registry()
2425
addRenderer( new QgsRendererV2Metadata( "RuleRenderer",
2526
QObject::tr( "Rule-based" ),
2627
QgsRuleBasedRendererV2::create ) );
28+
addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
29+
QObject::tr( "Point displacement" ),
30+
QgsPointDisplacementRenderer::create ) );
2731
}
2832

2933
QgsRendererV2Registry::~QgsRendererV2Registry()

‎src/gui/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
2222
symbology-ng/characterwidget.cpp
2323
symbology-ng/qgsstylev2exportimportdialog.cpp
2424
symbology-ng/qgsellipsesymbollayerv2widget.cpp
25+
symbology-ng/qgspointdisplacementrendererwidget.cpp
2526

2627
attributetable/qgsattributetablemodel.cpp
2728
attributetable/qgsattributetablememorymodel.cpp
@@ -98,6 +99,7 @@ symbology-ng/qgspenstylecombobox.h
9899
symbology-ng/qgsbrushstylecombobox.h
99100
symbology-ng/qgsstylev2exportimportdialog.h
100101
symbology-ng/qgsellipsesymbollayerv2widget.h
102+
symbology-ng/qgspointdisplacementrendererwidget.h
101103

102104
attributetable/qgsattributetableview.h
103105
attributetable/qgsattributetablemodel.h

‎src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "qgscategorizedsymbolrendererv2widget.h"
1010
#include "qgsgraduatedsymbolrendererv2widget.h"
1111
#include "qgsrulebasedrendererv2widget.h"
12+
#include "qgspointdisplacementrendererwidget.h"
1213

1314
#include "qgssymbollevelsv2dialog.h"
1415

@@ -53,6 +54,7 @@ static void _initRendererWidgetFunctions()
5354
_initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
5455
_initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
5556
_initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
57+
_initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
5658
initialized = true;
5759
}
5860

‎src/plugins/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(raster_terrain_analysis)
1010
ADD_SUBDIRECTORY(coordinate_capture)
1111
ADD_SUBDIRECTORY(dxf2shp_converter)
1212
ADD_SUBDIRECTORY(evis)
13-
ADD_SUBDIRECTORY(point_displacement_renderer)
1413
ADD_SUBDIRECTORY(spatialquery)
1514
ADD_SUBDIRECTORY(sqlanywhere)
1615
ADD_SUBDIRECTORY(roadgraph)

‎src/plugins/georeferencer/qgsopenrasterdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void QgsOpenRasterDialog::on_tbnSelectRaster_clicked()
9393

9494
// What DOING this code?
9595
QgsProject* prj = QgsProject::instance();
96-
QString projBehaviour = settings.value( "/Projections/defaultBehaviour" ).toString();
96+
QString projBehaviour = settings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
9797
QString projectCRS = prj->readEntry( "SpatialRefSys", "/ProjectCRSProj4String" );
9898
int projectCrsId = prj->readNumEntry( "SpatialRefSys", "/ProjectCrsId" );
9999

‎src/plugins/point_displacement_renderer/CMakeLists.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎src/plugins/point_displacement_renderer/qgsdisplacementplugin.h

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,13 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
186186
if ( primaryKeyType.isEmpty() )
187187
{
188188
primaryKeyType = "serial";
189-
/* TODO
190-
// check the feature count to choose if create a serial8 pk field
189+
#if 0
190+
// TODO: check the feature count to choose if create a serial8 pk field
191191
if ( layer->featureCount() > 0xFFFFFF )
192192
{
193193
primaryKeyType = "serial8";
194-
}*/
194+
}
195+
#endif
195196
}
196197

197198
try
@@ -1153,13 +1154,15 @@ qint64 QgsPostgresProvider::getBinaryInt( PGresult *queryResult, int row, int co
11531154
char *p = PQgetvalue( queryResult, row, col );
11541155
size_t s = PQgetlength( queryResult, row, col );
11551156

1157+
#ifdef QGISDEBUG
11561158
QString buf = "";
11571159
for ( size_t i = 0; i < s; i++ )
11581160
{
11591161
buf += QString( "%1 " ).arg( *( unsigned char * )( p + i ), 0, 16, QLatin1Char( ' ' ) );
11601162
}
11611163

1162-
QgsDebugMsgLevel( QString( "int in hex:%1" ).arg( buf ), 3 );
1164+
QgsDebugMsgLevel( QString( "int in hex:%1" ).arg( buf ), 4 );
1165+
#endif
11631166

11641167
switch ( s )
11651168
{
@@ -1191,18 +1194,18 @@ qint64 QgsPostgresProvider::getBinaryInt( PGresult *queryResult, int row, int co
11911194

11921195
if ( swapEndian )
11931196
{
1194-
QgsDebugMsg( QString( "swap oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ) );
1197+
QgsDebugMsgLevel( QString( "swap oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ), 4 );
11951198
oid0 = ntohl( oid0 );
11961199
oid1 = ntohl( oid1 );
11971200
}
11981201

1199-
QgsDebugMsg( QString( "oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ) );
1202+
QgsDebugMsgLevel( QString( "oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ), 4 );
12001203
oid = oid0;
1201-
QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
1204+
QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
12021205
oid <<= 32;
1203-
QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
1206+
QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
12041207
oid |= oid1;
1205-
QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
1208+
QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
12061209
}
12071210
break;
12081211

@@ -1226,7 +1229,7 @@ bool QgsPostgresProvider::getFeature( PGresult *queryResult, int row, bool fetch
12261229
try
12271230
{
12281231
QgsFeatureId oid = getBinaryInt( queryResult, row, 0 );
1229-
QgsDebugMsgLevel( QString( "oid=%1" ).arg( oid ), 3 );
1232+
QgsDebugMsgLevel( QString( "oid=%1" ).arg( oid ), 4 );
12301233

12311234
feature.setFeatureId( oid );
12321235
feature.clearAttributeMap();

0 commit comments

Comments
 (0)
Please sign in to comment.