Skip to content

Commit 6e38336

Browse files
author
jef
committed
revert r15747
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15762 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6939937 commit 6e38336

File tree

11 files changed

+40
-91
lines changed

11 files changed

+40
-91
lines changed

‎python/core/qgsdataprovider.sip

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ class QgsDataProvider : QObject
6060
*/
6161
virtual QgsRectangle extent() = 0;
6262

63-
/**
64-
* Set the extent of the layer
65-
* @param extent the layer extent
66-
* @note added in 1.8
67-
*/
68-
virtual void setExtent( QgsRectangle extent );
6963

7064
/**
7165
* Returns true if this is a valid layer. It is up to individual providers

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6278,8 +6278,7 @@ QgsRasterLayer* QgisApp::addRasterLayer(
62786278
QStringList const & layers,
62796279
QStringList const & styles,
62806280
QString const &format,
6281-
QString const &crs,
6282-
QgsRectangle extent )
6281+
QString const &crs )
62836282
{
62846283
QgsDebugMsg( "about to get library for " + providerKey );
62856284

@@ -6308,7 +6307,7 @@ QgsRasterLayer* QgisApp::addRasterLayer(
63086307
+ " and CRS of " + crs );
63096308

63106309
// TODO: Remove the 0 when the raster layer becomes a full provider gateway.
6311-
layer = new QgsRasterLayer( 0, rasterLayerPath, baseName, providerKey, layers, styles, format, crs, extent );
6310+
layer = new QgsRasterLayer( 0, rasterLayerPath, baseName, providerKey, layers, styles, format, crs );
63126311

63136312
QgsDebugMsg( "Constructed new layer." );
63146313

‎src/app/qgisapp.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
123123
QStringList const & layers,
124124
QStringList const & styles,
125125
QString const & format,
126-
QString const & crs,
127-
QgsRectangle extent );
126+
QString const & crs );
128127

129128
/** open a raster layer for the given file
130129
@returns false if unable to open a raster layer for rasterFile

‎src/app/qgisappinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ QgsRasterLayer* QgisAppInterface::addRasterLayer( QString rasterLayerPath, QStri
111111
QgsRasterLayer* QgisAppInterface::addRasterLayer( const QString& url, const QString& baseName, const QString& providerKey,
112112
const QStringList& layers, const QStringList& styles, const QString& format, const QString& crs )
113113
{
114-
return qgis->addRasterLayer( url, baseName, providerKey, layers, styles, format, crs, QgsRectangle() );
114+
return qgis->addRasterLayer( url, baseName, providerKey, layers, styles, format, crs );
115115
}
116116

117117

‎src/app/qgswmssourceselect.cpp

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl )
5555
: QDialog( parent, fl )
56-
, mWmsProvider( 0 )
5756
, mCurrentTileset( 0 )
5857
{
5958
setupUi( this );
@@ -164,10 +163,9 @@ QgsWMSSourceSelect::~QgsWMSSourceSelect()
164163
QSettings settings;
165164
QgsDebugMsg( "saving geometry" );
166165
settings.setValue( "/Windows/WMSSourceSelect/geometry", saveGeometry() );
167-
168-
delete mWmsProvider;
169166
}
170167

168+
171169
void QgsWMSSourceSelect::populateConnectionList()
172170
{
173171
QSettings settings;
@@ -283,20 +281,20 @@ QgsNumericSortTreeWidgetItem *QgsWMSSourceSelect::createItem(
283281
return item;
284282
}
285283

286-
bool QgsWMSSourceSelect::populateLayerList()
284+
bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
287285
{
288286
mCRSs.clear();
289287

290288
QVector<QgsWmsLayerProperty> layers;
291-
if ( !mWmsProvider->supportedLayers( layers ) )
289+
if ( !wmsProvider->supportedLayers( layers ) )
292290
return false;
293291

294292
foreach( QAbstractButton *b, mImageFormatGroup->buttons() )
295293
{
296294
b->setHidden( true );
297295
}
298296

299-
foreach( QString encoding, mWmsProvider->supportedImageEncodings() )
297+
foreach( QString encoding, wmsProvider->supportedImageEncodings() )
300298
{
301299
int id = mMimeMap.value( encoding, -1 );
302300
if ( id < 0 )
@@ -313,7 +311,7 @@ bool QgsWMSSourceSelect::populateLayerList()
313311
QMap<int, QgsNumericSortTreeWidgetItem *> items;
314312
QMap<int, int> layerParents;
315313
QMap<int, QStringList> layerParentNames;
316-
mWmsProvider->layerParents( layerParents, layerParentNames );
314+
wmsProvider->layerParents( layerParents, layerParentNames );
317315

318316
lstLayers->clear();
319317
lstLayers->setSortingEnabled( true );
@@ -350,7 +348,7 @@ bool QgsWMSSourceSelect::populateLayerList()
350348
lstLayers->sortByColumn( 0, Qt::AscendingOrder );
351349

352350
QVector<QgsWmsTileSetProfile> tilesets;
353-
mWmsProvider->supportedTileSets( tilesets );
351+
wmsProvider->supportedTileSets( tilesets );
354352

355353
tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), tilesets.size() > 0 );
356354
if ( tabServers->isTabEnabled( tabServers->indexOf( tabTilesets ) ) )
@@ -474,23 +472,24 @@ void QgsWMSSourceSelect::on_btnConnect_clicked()
474472
// load the server data provider plugin
475473
QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
476474

477-
delete mWmsProvider;
478-
479-
mWmsProvider = static_cast< QgsWmsProvider * >( pReg->getProvider( "wms", mConnectionInfo ) );
475+
QgsWmsProvider *wmsProvider =
476+
( QgsWmsProvider* ) pReg->getProvider( "wms", mConnectionInfo );
480477

481-
if ( mWmsProvider )
478+
if ( wmsProvider )
482479
{
483480
QApplication::setOverrideCursor( Qt::WaitCursor );
484481

485-
connect( mWmsProvider, SIGNAL( statusChanged( QString ) ), this, SLOT( showStatusMessage( QString ) ) );
482+
connect( wmsProvider, SIGNAL( statusChanged( QString ) ), this, SLOT( showStatusMessage( QString ) ) );
486483

487484
// WMS Provider all set up; let's get some layers
488485

489-
if ( !populateLayerList() )
486+
if ( !populateLayerList( wmsProvider ) )
490487
{
491-
showError();
488+
showError( wmsProvider );
492489
}
493490

491+
delete wmsProvider;
492+
494493
QApplication::restoreOverrideCursor();
495494
}
496495
else
@@ -541,14 +540,9 @@ void QgsWMSSourceSelect::addClicked()
541540
}
542541
}
543542

544-
// set the layers to retrieve the correct extent
545-
mWmsProvider->addLayers( layers, styles );
546-
mWmsProvider->setImageEncoding( format );
547-
mWmsProvider->setImageCrs( crs );
548-
549543
QgisApp::instance()->addRasterLayer( connInfo,
550544
leLayerName->text().isEmpty() ? layers.join( "/" ) : leLayerName->text(),
551-
"wms", layers, styles, format, crs, mWmsProvider->extent() );
545+
"wms", layers, styles, format, crs );
552546
}
553547

554548
void QgsWMSSourceSelect::enableLayersForCrs( QTreeWidgetItem *item )
@@ -1001,18 +995,18 @@ void QgsWMSSourceSelect::showStatusMessage( QString const &theMessage )
1001995
}
1002996

1003997

1004-
void QgsWMSSourceSelect::showError()
998+
void QgsWMSSourceSelect::showError( QgsWmsProvider * wms )
1005999
{
10061000
QgsMessageViewer * mv = new QgsMessageViewer( this );
1007-
mv->setWindowTitle( mWmsProvider->lastErrorTitle() );
1001+
mv->setWindowTitle( wms->lastErrorTitle() );
10081002

1009-
if ( mWmsProvider->lastErrorFormat() == "text/html" )
1003+
if ( wms->lastErrorFormat() == "text/html" )
10101004
{
1011-
mv->setMessageAsHtml( mWmsProvider->lastError() );
1005+
mv->setMessageAsHtml( wms->lastError() );
10121006
}
10131007
else
10141008
{
1015-
mv->setMessageAsPlainText( tr( "Could not understand the response. The %1 provider said:\n%2" ).arg( mWmsProvider->name() ).arg( mWmsProvider->lastError() ) );
1009+
mv->setMessageAsPlainText( tr( "Could not understand the response. The %1 provider said:\n%2" ).arg( wms->name() ).arg( wms->lastError() ) );
10161010
}
10171011
mv->showMessage( true ); // Is deleted when closed
10181012
}

‎src/app/qgswmssourceselect.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "ui_qgswmssourceselectbase.h"
2222
#include "qgisgui.h"
2323
#include "qgscontexthelp.h"
24-
#include "qgsrectangle.h"
2524

2625
#include <QStringList>
2726
#include <QPushButton>
@@ -85,7 +84,7 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
8584
void showStatusMessage( QString const &theMessage );
8685

8786
//! show whatever error is exposed by the QgsWmsProvider.
88-
void showError();
87+
void showError( QgsWmsProvider *wms );
8988

9089
//! Stores the selected datasource whenerver it is changed
9190
void on_cmbConnections_activated( int );
@@ -144,7 +143,7 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
144143
* \retval false if the layers could not be retrieved or parsed -
145144
* see mWmsProvider->errorString() for more info
146145
*/
147-
bool populateLayerList();
146+
bool populateLayerList( QgsWmsProvider *wmsProvider );
148147

149148
//! create an item including possible parents
150149
QgsNumericSortTreeWidgetItem *createItem( int id,
@@ -187,7 +186,6 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
187186
QString selectedImageEncoding();
188187

189188
QList<QTreeWidgetItem*> mCurrentSelection;
190-
QgsWmsProvider *mWmsProvider;
191189
QTableWidgetItem* mCurrentTileset;
192190

193191
private slots:

‎src/core/qgsdataprovider.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#include <QString>
2323
#include <QStringList>
2424

25-
#include <qgsrectangle.h>
26-
25+
class QgsRectangle;
2726
class QgsCoordinateReferenceSystem;
2827

2928

@@ -91,15 +90,6 @@ class CORE_EXPORT QgsDataProvider : public QObject
9190
*/
9291
virtual QgsRectangle extent() = 0;
9392

94-
/**
95-
* Set the extent of the layer
96-
* @param extent the layer extent
97-
* @note added in 1.8
98-
*/
99-
virtual void setExtent( QgsRectangle extent )
100-
{
101-
// NOP by default
102-
}
10393

10494
/**
10595
* Returns true if this is a valid layer. It is up to individual providers

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ QgsRasterLayer::QgsRasterLayer(
9999

100100
// TODO, call constructor with provider key for now
101101
init();
102-
setDataProvider( "gdal", QStringList(), QStringList(), QString(), QString(), loadDefaultStyleFlag, QgsRectangle() );
102+
setDataProvider( "gdal", QStringList(), QStringList(), QString(), QString(), loadDefaultStyleFlag );
103103
return;
104104

105105

@@ -116,8 +116,7 @@ QgsRasterLayer::QgsRasterLayer( int dummy,
116116
QStringList const & layers,
117117
QStringList const & styles,
118118
QString const & format,
119-
QString const & crs,
120-
QgsRectangle extent )
119+
QString const & crs )
121120
: QgsMapLayer( RasterLayer, baseName, rasterLayerPath )
122121
, mStandardDeviations( 0 )
123122
, mDataProvider( 0 )
@@ -140,7 +139,7 @@ QgsRasterLayer::QgsRasterLayer( int dummy,
140139
init();
141140
// if we're given a provider type, try to create and bind one to this layer
142141
bool loadDefaultStyleFlag = false ; // ???
143-
setDataProvider( providerKey, layers, styles, format, crs, loadDefaultStyleFlag, extent );
142+
setDataProvider( providerKey, layers, styles, format, crs, loadDefaultStyleFlag );
144143

145144
// Default for the popup menu
146145
// TODO: popMenu = 0;
@@ -2251,7 +2250,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
22512250
QString const & format,
22522251
QString const & crs )
22532252
{
2254-
setDataProvider( provider, layers, styles, format, crs, false, QgsRectangle() );
2253+
setDataProvider( provider, layers, styles, format, crs, false );
22552254
}
22562255

22572256
/** Copied from QgsVectorLayer::setDataProvider
@@ -2262,8 +2261,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
22622261
QStringList const & styles,
22632262
QString const & format,
22642263
QString const & crs,
2265-
bool loadDefaultStyleFlag,
2266-
QgsRectangle extent )
2264+
bool loadDefaultStyleFlag )
22672265
{
22682266
// XXX should I check for and possibly delete any pre-existing providers?
22692267
// XXX How often will that scenario occur?
@@ -2287,6 +2285,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
22872285
return;
22882286
}
22892287

2288+
22902289
QgsDebugMsg( "Instantiated the data provider plugin"
22912290
+ QString( " with layer list of " ) + layers.join( ", " )
22922291
+ " and style list of " + styles.join( ", " )
@@ -2303,18 +2302,8 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
23032302

23042303
setNoDataValue( mDataProvider->noDataValue() );
23052304

2306-
QgsRectangle mbr;
2307-
if ( mDataProvider && !extent.isEmpty() )
2308-
{
2309-
// set the extent
2310-
mDataProvider->setExtent( extent );
2311-
mbr = extent;
2312-
}
2313-
else
2314-
{
2315-
// get the extent
2316-
mbr = mDataProvider->extent();
2317-
}
2305+
// get the extent
2306+
QgsRectangle mbr = mDataProvider->extent();
23182307

23192308
// show the extent
23202309
QString s = mbr.toString();
@@ -4468,7 +4457,6 @@ double QgsRasterLayer::readValue( void *data, int type, int index )
44684457
bool QgsRasterLayer::update()
44694458
{
44704459
QgsDebugMsg( "entered." );
4471-
44724460
// Check if data changed
44734461
if ( mDataProvider->dataTimestamp() > mDataProvider->timestamp() )
44744462
{

‎src/core/raster/qgsrasterlayer.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
207207
const QStringList & layers = QStringList(),
208208
const QStringList & styles = QStringList(),
209209
const QString & format = QString(),
210-
const QString & crs = QString(),
211-
const QgsRectangle extent = QgsRectangle() );
210+
const QString & crs = QString() );
212211

213212

214213
/** \brief The destructor */
@@ -313,8 +312,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
313312
const QStringList & styles,
314313
const QString & format,
315314
const QString & crs,
316-
bool loadDefaultStyleFlag,
317-
QgsRectangle extent );
315+
bool loadDefaultStyleFlag );
318316

319317
static QLibrary* loadProviderLibrary( QString theProviderKey );
320318
static QgsRasterDataProvider* loadProvider( QString theProviderKey, QString theDataSource = 0 );

‎src/providers/wms/qgswmsprovider.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )
899899

900900
QNetworkRequest request( url );
901901
setAuthorization( request );
902-
request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, forceRefresh ? QNetworkRequest::PreferNetwork : QNetworkRequest::PreferCache );
902+
request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork );
903903
request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
904904

905905
QgsDebugMsg( QString( "getcapabilities: %1" ).arg( url ) );
@@ -978,9 +978,6 @@ void QgsWmsProvider::capabilitiesReplyFinished()
978978
return;
979979
}
980980

981-
QgsDebugMsg( QString( "getcapabilities from cache: %1" )
982-
.arg( mCapabilitiesReply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool() ? "yes" : "no" ) );
983-
984981
httpcapabilitiesresponse = mCapabilitiesReply->readAll();
985982

986983
if ( httpcapabilitiesresponse.isEmpty() )
@@ -2031,11 +2028,7 @@ void QgsWmsProvider::parseServiceException( QDomElement const & e )
20312028
QgsDebugMsg( "exiting." );
20322029
}
20332030

2034-
void QgsWmsProvider::setExtent( QgsRectangle extent )
2035-
{
2036-
layerExtent = extent;
2037-
extentDirty = false;
2038-
}
2031+
20392032

20402033
QgsRectangle QgsWmsProvider::extent()
20412034
{
@@ -2177,6 +2170,7 @@ bool QgsWmsProvider::calculateExtent()
21772170
QgsDebugMsg( "exiting with '" + layerExtent.toString() + "'." );
21782171

21792172
return true;
2173+
21802174
}
21812175

21822176

0 commit comments

Comments
 (0)