Skip to content

Commit 45510c0

Browse files
Jean-RocJean-Roc
committed
Merge branch 'master' of git://github.com/qgis/Quantum-GIS
2 parents 07e4fb1 + bfd846a commit 45510c0

File tree

6 files changed

+68
-46
lines changed

6 files changed

+68
-46
lines changed

‎debian/control.lucid

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends:
1010
grass-dev,
1111
libexpat1-dev,
1212
libfcgi-dev,
13-
libgdal1-dev,
13+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
@@ -80,7 +80,7 @@ Section: libdevel
8080
Depends:
8181
grass-dev,
8282
libexpat1-dev,
83-
libgdal1-dev,
83+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
8484
libgeos-dev (>= 3.0.0),
8585
libgsl0-dev,
8686
libpq-dev,

‎debian/control.oneiric

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends:
1010
grass-dev,
1111
libexpat1-dev,
1212
libfcgi-dev,
13-
libgdal1-dev,
13+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
@@ -81,7 +81,7 @@ Section: libdevel
8181
Depends:
8282
grass-dev,
8383
libexpat1-dev,
84-
libgdal1-dev,
84+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
8585
libgeos-dev (>= 3.0.0),
8686
libgsl0-dev,
8787
libpq-dev,

‎debian/control.precise

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends:
1010
grass-dev,
1111
libexpat1-dev,
1212
libfcgi-dev,
13-
libgdal1-dev,
13+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
@@ -84,7 +84,7 @@ Section: libdevel
8484
Depends:
8585
grass-dev,
8686
libexpat1-dev,
87-
libgdal1-dev,
87+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
8888
libgeos-dev (>= 3.0.0),
8989
libgsl0-dev,
9090
libpq-dev,

‎python/plugins/fTools/tools/doGeometry.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@ def geometry( self, myLayer, myParam, myField ):
232232
self.shapefileName = None
233233
self.encoding = None
234234

235+
res = QMessageBox.warning( self, self.tr( "Geometry"),
236+
self.tr( "Currently QGIS doesn't allow simultaneous access from \
237+
different threads to the same datasource. Make sure your layer's \
238+
attribute tables are closed. Continue?"),
239+
QMessageBox.Yes | QMessageBox.No )
240+
if res == QMessageBox.No:
241+
return
242+
235243
self.buttonOk.setEnabled( False )
236244
self.testThread = geometryThread( self.iface.mainWindow(), self, self.myFunction,
237245
vlayer, myParam, myField, self.shapefileName, self.encoding,

‎python/plugins/fTools/tools/doSimplify.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ def accept( self ):
104104
self.workThread = GeomThread( self.myFunction, vLayer, self.chkUseSelection.isChecked(),
105105
self.spnTolerance.value(), True, outFileName, self.encoding )
106106
else:
107+
res = QMessageBox.warning( self, self.tr( "Warning"),
108+
self.tr( "Currently QGIS doesn't allow simultaneous access from \
109+
different threads to the same datasource. Make sure your layer's \
110+
attribute tables are closed. Continue?"),
111+
QMessageBox.Yes | QMessageBox.No )
112+
if res == QMessageBox.No:
113+
return
114+
107115
self.workThread = GeomThread( self.myFunction, vLayer, self.chkUseSelection.isChecked(),
108116
self.spnTolerance.value(), False, None, None )
109117

‎src/providers/wms/qgswmsprovider.cpp

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2936,51 +2936,57 @@ QStringList QgsWmsProvider::identifyAs( const QgsPoint& point, QString format )
29362936
++layers, ++styles )
29372937
{
29382938
// Is sublayer visible?
2939-
if ( activeSubLayerVisibility.find( *layers ).value() )
2940-
{
2941-
// Is sublayer queryable?
2942-
if ( mQueryableForLayer.find( *layers ).value() )
2943-
{
2944-
QgsDebugMsg( "Layer '" + *layers + "' is queryable." );
2945-
2946-
QUrl requestUrl( mGetFeatureInfoUrlBase );
2947-
setQueryItem( requestUrl, "SERVICE", "WMS" );
2948-
setQueryItem( requestUrl, "VERSION", mCapabilities.version );
2949-
setQueryItem( requestUrl, "REQUEST", "GetFeatureInfo" );
2950-
setQueryItem( requestUrl, "BBOX", bbox );
2951-
setQueryItem( requestUrl, crsKey, imageCrs );
2952-
setQueryItem( requestUrl, "WIDTH", QString::number( cachedViewWidth ) );
2953-
setQueryItem( requestUrl, "HEIGHT", QString::number( cachedViewHeight ) );
2954-
setQueryItem( requestUrl, "LAYERS", *layers );
2955-
setQueryItem( requestUrl, "STYLES", *styles );
2956-
setQueryItem( requestUrl, "FORMAT", imageMimeType );
2957-
setQueryItem( requestUrl, "QUERY_LAYERS", *layers );
2958-
setQueryItem( requestUrl, "INFO_FORMAT", format );
2959-
setQueryItem( requestUrl, "X", QString::number( point.x() ) );
2960-
setQueryItem( requestUrl, "Y", QString::number( point.y() ) );
2961-
2962-
if ( mFeatureCount > 0 )
2963-
{
2964-
setQueryItem( requestUrl, "FEATURE_COUNT", QString::number( mFeatureCount ) );
2965-
}
2939+
if ( !activeSubLayerVisibility.find( *layers ).value() )
2940+
continue;
29662941

2967-
// X,Y in WMS 1.1.1; I,J in WMS 1.3.0
2968-
// requestUrl += QString( "&I=%1&J=%2" ).arg( point.x() ).arg( point.y() );
2942+
// Is sublayer queryable?
2943+
if ( !mQueryableForLayer.find( *layers ).value() )
2944+
continue;
29692945

2970-
QgsDebugMsg( QString( "getfeatureinfo: %1" ).arg( requestUrl.toString() ) );
2971-
QNetworkRequest request( requestUrl );
2972-
setAuthorization( request );
2973-
mIdentifyReply = QgsNetworkAccessManager::instance()->get( request );
2974-
connect( mIdentifyReply, SIGNAL( finished() ), this, SLOT( identifyReplyFinished() ) );
2946+
QgsDebugMsg( "Layer '" + *layers + "' is queryable." );
29752947

2976-
while ( mIdentifyReply )
2977-
{
2978-
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
2979-
}
2948+
QUrl requestUrl( mGetFeatureInfoUrlBase );
2949+
setQueryItem( requestUrl, "SERVICE", "WMS" );
2950+
setQueryItem( requestUrl, "VERSION", mCapabilities.version );
2951+
setQueryItem( requestUrl, "REQUEST", "GetFeatureInfo" );
2952+
setQueryItem( requestUrl, "BBOX", bbox );
2953+
setQueryItem( requestUrl, crsKey, imageCrs );
2954+
setQueryItem( requestUrl, "WIDTH", QString::number( cachedViewWidth ) );
2955+
setQueryItem( requestUrl, "HEIGHT", QString::number( cachedViewHeight ) );
2956+
setQueryItem( requestUrl, "LAYERS", *layers );
2957+
setQueryItem( requestUrl, "STYLES", *styles );
2958+
setQueryItem( requestUrl, "FORMAT", imageMimeType );
2959+
setQueryItem( requestUrl, "QUERY_LAYERS", *layers );
2960+
setQueryItem( requestUrl, "INFO_FORMAT", format );
29802961

2981-
results << mIdentifyResult;
2982-
}
2962+
if ( mCapabilities.version == "1.3.0" || mCapabilities.version == "1.3" )
2963+
{
2964+
setQueryItem( requestUrl, "I", QString::number( point.x() ) );
2965+
setQueryItem( requestUrl, "J", QString::number( point.y() ) );
2966+
}
2967+
else
2968+
{
2969+
setQueryItem( requestUrl, "X", QString::number( point.x() ) );
2970+
setQueryItem( requestUrl, "Y", QString::number( point.y() ) );
2971+
}
2972+
2973+
if ( mFeatureCount > 0 )
2974+
{
2975+
setQueryItem( requestUrl, "FEATURE_COUNT", QString::number( mFeatureCount ) );
2976+
}
2977+
2978+
QgsDebugMsg( QString( "getfeatureinfo: %1" ).arg( requestUrl.toString() ) );
2979+
QNetworkRequest request( requestUrl );
2980+
setAuthorization( request );
2981+
mIdentifyReply = QgsNetworkAccessManager::instance()->get( request );
2982+
connect( mIdentifyReply, SIGNAL( finished() ), this, SLOT( identifyReplyFinished() ) );
2983+
2984+
while ( mIdentifyReply )
2985+
{
2986+
QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
29832987
}
2988+
2989+
results << mIdentifyResult;
29842990
}
29852991

29862992
QgsDebugMsg( "Exiting with: " + results.join( "\n------\n" ) );

0 commit comments

Comments
 (0)