Merge branch 'master' into delimited_text_bug_fixes_2

ccrook · ccrook · commit 2232c3d9bc8b · 2013-04-27T07:10:57.000+12:00
diff --git a/python/plugins/sextante/CMakeLists.txt b/python/plugins/sextante/CMakeLists.txt
@@ -2,6 +2,7 @@ SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
 
 ADD_SUBDIRECTORY(admintools)
 ADD_SUBDIRECTORY(algs)
+ADD_SUBDIRECTORY(commander)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(gdal)
 ADD_SUBDIRECTORY(grass)
diff --git a/python/plugins/sextante/SextantePlugin.py b/python/plugins/sextante/SextantePlugin.py
@@ -16,9 +16,6 @@
 *                                                                         *
 ***************************************************************************
 """
-from PyQt4 import QtGui
-from sextante.commander.parser import parse
-from sextante.commander.CommanderWindow import CommanderWindow
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -32,6 +29,8 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from qgis.core import *
+from PyQt4 import QtGui
+from sextante.commander.CommanderWindow import CommanderWindow
 from sextante.core.Sextante import Sextante
 from sextante.core.QGisLayers import QGisLayers
 from sextante.core.SextanteUtils import SextanteUtils
diff --git a/python/plugins/sextante/commander/CMakeLists.txt b/python/plugins/sextante/commander/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante ./commander ${PY_FILES})
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -560,8 +560,6 @@ void QgisAppInterface::preloadForm( QString uifile )
 
 void QgisAppInterface::cacheloadForm( QString uifile )
 {
-    QUiLoader loader;
-
     QFile file( uifile );
 
     if ( file.open( QFile::ReadOnly ) )
@@ -572,6 +570,7 @@ void QgisAppInterface::cacheloadForm( QString uifile )
       loader.setWorkingDirectory( fi.dir() );
       QWidget *myWidget = loader.load( &file );
       file.close();
+      delete myWidget;
     }
 }
 
diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.cpp b/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
@@ -126,6 +126,8 @@ void QgsMapCoordsDialog::maybeSetXY( const QgsPoint & xy, Qt::MouseButton button
 
   mPointFromCanvasPushButton->setChecked( false );
   buttonBox->button( QDialogButtonBox::Ok )->setFocus();
+  activateWindow();
+  raise();
 }
 
 void QgsMapCoordsDialog::setToolEmitPoint( bool isEnable )
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1851,6 +1851,9 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,
   if ( driverName == "ESRI Shapefile" )
   {
     papszOptions = CSLSetNameValue( papszOptions, "ENCODING", encoding.toLocal8Bit().data() );
+    // OGR Shapefile fails to create fields if given encoding is not supported by its side
+    // so disable encoding conversion of OGR Shapefile layer
+    CPLSetConfigOption( "SHAPE_ENCODING", "" );
   }
 
   OGRLayerH layer;
diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp
@@ -154,12 +154,14 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString
   if ( myChildren.size() > 0 )
   {
     QgsDebugMsg( QString( "has %1 items" ).arg( myChildren.size() ) );
+    QWARN( QString( "has %1 items" ).arg( myChildren.size() ).toLocal8Bit().data() );
     foreach ( QgsDataItem* item, myChildren )
     {
       QgsDebugMsg( QString( "child name=%1" ).arg( item->name() ) );
       QgsLayerItem *layerItem = dynamic_cast<QgsLayerItem*>( item );
       if ( layerItem )
       {
+        QWARN( QString( "child %1" ).arg( layerItem->path() ).toLocal8Bit().data() );
         QgsDebugMsg( QString( "child name=%1 provider=%2 path=%3" ).arg( layerItem->name() ).arg( layerItem->providerKey() ).arg( layerItem->path() ) );
         if ( myChildName == "" || myChildName == item->name() )
         {
@@ -175,6 +177,8 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString
             {
               QWARN( QString( "Invalid layer %1" ).arg( layerItem->path() ).toLocal8Bit().data() );
             }
+            else
+              QWARN( QString( "Valid layer %1" ).arg( layerItem->path() ).toLocal8Bit().data() );
             if ( myChildName == "" )
             {
               if ( ! ok )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FILE(GLOB PY_FILES *.py)`
	`2`	`+`
	`3`	`+PLUGIN_INSTALL(sextante ./commander ${PY_FILES})`
Original file line number	Diff line number	Diff line change
`@@ -560,8 +560,6 @@ void QgisAppInterface::preloadForm( QString uifile )`
`560`	`560`
`561`	`561`	`void QgisAppInterface::cacheloadForm( QString uifile )`
`562`	`562`	`{`
`563`		`- QUiLoader loader;`
`564`		`-`
`565`	`563`	`QFile file( uifile );`
`566`	`564`
`567`	`565`	`if ( file.open( QFile::ReadOnly ) )`
`@@ -572,6 +570,7 @@ void QgisAppInterface::cacheloadForm( QString uifile )`
`572`	`570`	`loader.setWorkingDirectory( fi.dir() );`
`573`	`571`	`QWidget *myWidget = loader.load( &file );`
`574`	`572`	`file.close();`
	`573`	`+ delete myWidget;`
`575`	`574`	`}`
`576`	`575`	`}`
`577`	`576`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,8 @@ void QgsMapCoordsDialog::maybeSetXY( const QgsPoint & xy, Qt::MouseButton button`
`126`	`126`
`127`	`127`	`mPointFromCanvasPushButton->setChecked( false );`
`128`	`128`	`buttonBox->button( QDialogButtonBox::Ok )->setFocus();`
	`129`	`+ activateWindow();`
	`130`	`+ raise();`
`129`	`131`	`}`
`130`	`132`
`131`	`133`	`void QgsMapCoordsDialog::setToolEmitPoint( bool isEnable )`
Original file line number	Diff line number	Diff line change
`@@ -1851,6 +1851,9 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,`
`1851`	`1851`	`if ( driverName == "ESRI Shapefile" )`
`1852`	`1852`	`{`
`1853`	`1853`	`papszOptions = CSLSetNameValue( papszOptions, "ENCODING", encoding.toLocal8Bit().data() );`
	`1854`	`+ // OGR Shapefile fails to create fields if given encoding is not supported by its side`
	`1855`	`+ // so disable encoding conversion of OGR Shapefile layer`
	`1856`	`+ CPLSetConfigOption( "SHAPE_ENCODING", "" );`
`1854`	`1857`	`}`
`1855`	`1858`
`1856`	`1859`	`OGRLayerH layer;`
Original file line number	Diff line number	Diff line change
`@@ -154,12 +154,14 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString`
`154`	`154`	`if ( myChildren.size() > 0 )`
`155`	`155`	`{`
`156`	`156`	`QgsDebugMsg( QString( "has %1 items" ).arg( myChildren.size() ) );`
	`157`	`+ QWARN( QString( "has %1 items" ).arg( myChildren.size() ).toLocal8Bit().data() );`
`157`	`158`	`foreach ( QgsDataItem* item, myChildren )`
`158`	`159`	`{`
`159`	`160`	`QgsDebugMsg( QString( "child name=%1" ).arg( item->name() ) );`
`160`	`161`	`QgsLayerItem layerItem = dynamic_cast<QgsLayerItem>( item );`
`161`	`162`	`if ( layerItem )`
`162`	`163`	`{`
	`164`	`+ QWARN( QString( "child %1" ).arg( layerItem->path() ).toLocal8Bit().data() );`
`163`	`165`	`QgsDebugMsg( QString( "child name=%1 provider=%2 path=%3" ).arg( layerItem->name() ).arg( layerItem->providerKey() ).arg( layerItem->path() ) );`
`164`	`166`	`if ( myChildName == "" \|\| myChildName == item->name() )`
`165`	`167`	`{`
`@@ -175,6 +177,8 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString`
`175`	`177`	`{`
`176`	`178`	`QWARN( QString( "Invalid layer %1" ).arg( layerItem->path() ).toLocal8Bit().data() );`
`177`	`179`	`}`
	`180`	`+ else`
	`181`	`+ QWARN( QString( "Valid layer %1" ).arg( layerItem->path() ).toLocal8Bit().data() );`
`178`	`182`	`if ( myChildName == "" )`
`179`	`183`	`{`
`180`	`184`	`if ( ! ok )`