Skip to content
Permalink
Browse files

Merge branch 'master' into delimited_text_bug_fixes_2

  • Loading branch information
ccrook committed Apr 26, 2013
2 parents f7dc548 + f384277 commit 2232c3d9bc8ba8efa03b55d76179f86b2f39ce81
@@ -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)
@@ -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
@@ -0,0 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(sextante ./commander ${PY_FILES})
@@ -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;
}
}

@@ -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 )
@@ -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;
@@ -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 )

0 comments on commit 2232c3d

Please sign in to comment.
You can’t perform that action at this time.