Skip to content

Commit

Permalink
Further changes to fix ticket #8 (wms not working through a web proxy…
Browse files Browse the repository at this point in the history
…). Should work now, but needs a bit of testing to be sure, which I'll do over the next few days.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5723 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Aug 22, 2006
1 parent 84c41eb commit 879400d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
15 changes: 12 additions & 3 deletions src/gui/qgisapp.cpp
Expand Up @@ -1970,7 +1970,11 @@ void QgisApp::addWmsLayer()
wmss->selectedLayers(),
wmss->selectedStylesForSelectedLayers(),
wmss->selectedImageEncoding(),
wmss->selectedCrs()
wmss->selectedCrs(),
wmss->connProxyHost(),
wmss->connProxyPort(),
wmss->connProxyUser(),
wmss->connProxyPass()
);
}
}
Expand Down Expand Up @@ -4970,7 +4974,11 @@ void QgisApp::addRasterLayer(QString const & rasterLayerPath,
QStringList const & layers,
QStringList const & styles,
QString const & format,
QString const & crs)
QString const & crs,
QString const & proxyHost,
int proxyPort,
QString const & proxyUser,
QString const & proxyPassword)
{

#ifdef QGISDEBUG
Expand Down Expand Up @@ -5000,7 +5008,8 @@ void QgisApp::addRasterLayer(QString const & rasterLayerPath,
#endif

// TODO: Remove the 0 when the raster layer becomes a full provider gateway.
layer = new QgsRasterLayer(0, rasterLayerPath, baseName, providerKey, layers, styles, format, crs);
layer = new QgsRasterLayer(0, rasterLayerPath, baseName, providerKey, layers, styles, format, crs,
proxyHost, proxyPort, proxyUser, proxyPassword);

#ifdef QGISDEBUG
std::cout << "QgisApp::addRasterLayer: Constructed new layer." << std::endl;
Expand Down
6 changes: 5 additions & 1 deletion src/gui/qgisapp.h
Expand Up @@ -112,7 +112,11 @@ class QgisApp : public QMainWindow, public Ui::QgisAppBase
QStringList const & layers,
QStringList const & styles,
QString const & format,
QString const & crs);
QString const & crs,
QString const & proxyHost = QString(),
int proxyPort = 80,
QString const & proxyUser = QString(),
QString const & proxyPassword = QString());

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

0 comments on commit 879400d

Please sign in to comment.