Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Oct 28, 2011 · 483a8d8 · 483a8d8
2 parents 0d79669 + 05e3258
commit 483a8d8
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 203 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -10,9 +10,9 @@ qgis (1.8.0) UNRELEASED; urgency=low
   * drop abi postfix from sqlanywhere plugin
   * include network analysis library
   * build package with libspatialindex where available
-  * drop wfsplugin
+  * drop wfsplugin & displaceplugin
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 Oct 2011 20:03:51 +0000
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 28 Oct 2011 08:52:45 +0200
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

diff --git a/debian/qgis.install b/debian/qgis.install
@@ -10,7 +10,6 @@ usr/lib/qgis/plugins/libdiagramoverlay.so
 usr/lib/qgis/plugins/libevis.so 
 usr/lib/qgis/plugins/librasterterrainplugin.so
 usr/lib/qgis/plugins/libspatialqueryplugin.so
-usr/lib/qgis/plugins/libdisplacementplugin.so
 usr/lib/qgis/plugins/libofflineeditingplugin.so
 usr/lib/qgis/plugins/libroadgraphplugin.so
 usr/lib/qgis/plugins/libzonalstatisticsplugin.so

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -327,7 +327,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
 {
   static QString authid = QString::null;
   QSettings mySettings;
-  QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
+  QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
   if ( myDefaultProjectionOption == "prompt" )
   {
     //@note this class is not a descendent of QWidget so we cant pass

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -177,11 +177,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   // set the display update threshold
   spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
   //set the default projection behaviour radio buttongs
-  if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )
+  if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )
   {
     radPromptForProjection->setChecked( true );
   }
-  else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )
+  else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )
   {
     radUseProjectProjection->setChecked( true );
   }

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -39,6 +39,7 @@ SET(QGIS_CORE_SRCS
   symbology-ng/qgssymbologyv2conversion.cpp
   symbology-ng/qgssvgcache.cpp
   symbology-ng/qgsellipsesymbollayerv2.cpp
+  symbology-ng/qgspointdisplacementrenderer.cpp
 
   qgis.cpp
   qgsapplication.cpp

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -267,9 +267,18 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q
     {
       mAuthId = QString( "USER:%1" ).arg( mSrsId );
     }
+    else if ( mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
+    {
+      OSRDestroySpatialReference( mCRS );
+      mCRS = OSRNewSpatialReference( NULL );
+      mIsValidFlag = OSRSetFromUserInput( mCRS, mAuthId.toLower().toAscii() ) == OGRERR_NONE;
+      setMapUnits();
+    }
 
-    setProj4String( toProj4 );
-    setMapUnits();
+    if ( !mIsValidFlag )
+    {
+      setProj4String( toProj4 );
+    }
   }
   else
   {

diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
@@ -45,7 +45,7 @@ void QgsScaleCalculator::setMapUnits( QGis::UnitType mapUnits )
 
 QGis::UnitType QgsScaleCalculator::mapUnits() const
 {
-  QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 3 );
+  QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 4 );
   return mMapUnits;
 }
 

diff --git a/...renderer/qgspointdisplacementrenderer.cpp → ...ology-ng/qgspointdisplacementrenderer.cpp b/...renderer/qgspointdisplacementrenderer.cpp → ...ology-ng/qgspointdisplacementrenderer.cpp
diff --git a/...t_renderer/qgspointdisplacementrenderer.h → ...mbology-ng/qgspointdisplacementrenderer.h b/...t_renderer/qgspointdisplacementrenderer.h → ...mbology-ng/qgspointdisplacementrenderer.h
diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -5,6 +5,7 @@
 #include "qgscategorizedsymbolrendererv2.h"
 #include "qgsgraduatedsymbolrendererv2.h"
 #include "qgsrulebasedrendererv2.h"
+#include "qgspointdisplacementrenderer.h"
 
 QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;
 
@@ -24,6 +25,9 @@ QgsRendererV2Registry::QgsRendererV2Registry()
   addRenderer( new QgsRendererV2Metadata( "RuleRenderer",
                                           QObject::tr( "Rule-based" ),
                                           QgsRuleBasedRendererV2::create ) );
+  addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
+                                          QObject::tr( "Point displacement" ),
+                                          QgsPointDisplacementRenderer::create ) );
 }
 
 QgsRendererV2Registry::~QgsRendererV2Registry()

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -22,6 +22,7 @@ symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
 symbology-ng/characterwidget.cpp
 symbology-ng/qgsstylev2exportimportdialog.cpp
 symbology-ng/qgsellipsesymbollayerv2widget.cpp
+symbology-ng/qgspointdisplacementrendererwidget.cpp
 
 attributetable/qgsattributetablemodel.cpp
 attributetable/qgsattributetablememorymodel.cpp
@@ -98,6 +99,7 @@ symbology-ng/qgspenstylecombobox.h
 symbology-ng/qgsbrushstylecombobox.h
 symbology-ng/qgsstylev2exportimportdialog.h
 symbology-ng/qgsellipsesymbollayerv2widget.h
+symbology-ng/qgspointdisplacementrendererwidget.h
 
 attributetable/qgsattributetableview.h
 attributetable/qgsattributetablemodel.h

diff --git a/...er/qgspointdisplacementrendererwidget.cpp → ...ng/qgspointdisplacementrendererwidget.cpp b/...er/qgspointdisplacementrendererwidget.cpp → ...ng/qgspointdisplacementrendererwidget.cpp
diff --git a/...erer/qgspointdisplacementrendererwidget.h → ...y-ng/qgspointdisplacementrendererwidget.h b/...erer/qgspointdisplacementrendererwidget.h → ...y-ng/qgspointdisplacementrendererwidget.h
diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
@@ -9,6 +9,7 @@
 #include "qgscategorizedsymbolrendererv2widget.h"
 #include "qgsgraduatedsymbolrendererv2widget.h"
 #include "qgsrulebasedrendererv2widget.h"
+#include "qgspointdisplacementrendererwidget.h"
 
 #include "qgssymbollevelsv2dialog.h"
 
@@ -53,6 +54,7 @@ static void _initRendererWidgetFunctions()
   _initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
   _initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
   _initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
+  _initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
   initialized = true;
 }
 

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(raster_terrain_analysis)
 ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(dxf2shp_converter)
 ADD_SUBDIRECTORY(evis)
-ADD_SUBDIRECTORY(point_displacement_renderer)
 ADD_SUBDIRECTORY(spatialquery)
 ADD_SUBDIRECTORY(sqlanywhere)
 ADD_SUBDIRECTORY(roadgraph)

diff --git a/src/plugins/georeferencer/qgsopenrasterdialog.cpp b/src/plugins/georeferencer/qgsopenrasterdialog.cpp
@@ -93,7 +93,7 @@ void QgsOpenRasterDialog::on_tbnSelectRaster_clicked()
 
   // What DOING this code?
   QgsProject* prj = QgsProject::instance();
-  QString projBehaviour = settings.value( "/Projections/defaultBehaviour" ).toString();
+  QString projBehaviour = settings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
   QString projectCRS = prj->readEntry( "SpatialRefSys", "/ProjectCRSProj4String" );
   int projectCrsId = prj->readNumEntry( "SpatialRefSys", "/ProjectCrsId" );
 

diff --git a/src/plugins/point_displacement_renderer/CMakeLists.txt b/src/plugins/point_displacement_renderer/CMakeLists.txt
diff --git a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp b/src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp
diff --git a/src/plugins/point_displacement_renderer/qgsdisplacementplugin.h b/src/plugins/point_displacement_renderer/qgsdisplacementplugin.h
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -186,12 +186,13 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
   if ( primaryKeyType.isEmpty() )
   {
     primaryKeyType = "serial";
-    /* TODO
-    // check the feature count to choose if create a serial8 pk field
+#if 0
+    // TODO: check the feature count to choose if create a serial8 pk field
     if ( layer->featureCount() > 0xFFFFFF )
     {
       primaryKeyType = "serial8";
-    }*/
+    }
+#endif
   }
 
   try
@@ -1153,13 +1154,15 @@ qint64 QgsPostgresProvider::getBinaryInt( PGresult *queryResult, int row, int co
   char *p = PQgetvalue( queryResult, row, col );
   size_t s = PQgetlength( queryResult, row, col );
 
+#ifdef QGISDEBUG
   QString buf = "";
   for ( size_t i = 0; i < s; i++ )
   {
     buf += QString( "%1 " ).arg( *( unsigned char * )( p + i ), 0, 16, QLatin1Char( ' ' ) );
   }
 
-  QgsDebugMsgLevel( QString( "int in hex:%1" ).arg( buf ), 3 );
+  QgsDebugMsgLevel( QString( "int in hex:%1" ).arg( buf ), 4 );
+#endif
 
   switch ( s )
   {
@@ -1191,18 +1194,18 @@ qint64 QgsPostgresProvider::getBinaryInt( PGresult *queryResult, int row, int co
 
       if ( swapEndian )
       {
-        QgsDebugMsg( QString( "swap oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ) );
+        QgsDebugMsgLevel( QString( "swap oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ), 4 );
         oid0 = ntohl( oid0 );
         oid1 = ntohl( oid1 );
       }
 
-      QgsDebugMsg( QString( "oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ) );
+      QgsDebugMsgLevel( QString( "oid0:%1 oid1:%2" ).arg( oid0 ).arg( oid1 ), 4 );
       oid   = oid0;
-      QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
+      QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
       oid <<= 32;
-      QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
+      QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
       oid  |= oid1;
-      QgsDebugMsg( QString( "oid:%1" ).arg( oid ) );
+      QgsDebugMsgLevel( QString( "oid:%1" ).arg( oid ), 4 );
     }
     break;
 
@@ -1226,7 +1229,7 @@ bool QgsPostgresProvider::getFeature( PGresult *queryResult, int row, bool fetch
   try
   {
     QgsFeatureId oid = getBinaryInt( queryResult, row, 0 );
-    QgsDebugMsgLevel( QString( "oid=%1" ).arg( oid ), 3 );
+    QgsDebugMsgLevel( QString( "oid=%1" ).arg( oid ), 4 );
 
     feature.setFeatureId( oid );
     feature.clearAttributeMap();

diff --git a/...qgspointdisplacementrendererwidgetbase.ui → ...qgspointdisplacementrendererwidgetbase.ui b/...qgspointdisplacementrendererwidgetbase.ui → ...qgspointdisplacementrendererwidgetbase.ui