Skip to content

Commit

Permalink
minor documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
AleksMat committed Apr 23, 2018
1 parent 8c87121 commit 1f354cd
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions SentinelHub/SentinelHub.py
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ def get_proxy_config():
""" Get proxy config from QSettings and builds proxy parameters
:return: dictionary of transfer protocols mapped to addresses, also authentication if set in QSettings
:rtype: dict, ... or dict, None
:rtype: (dict, requests.auth.HTTPProxyAuth) or (dict, None)
"""
enabled, host, port, user, password = SentinelHub.get_proxy_from_qsettings()

Expand All @@ -576,8 +576,10 @@ def get_proxy_config():

@staticmethod
def get_proxy_from_qsettings():
"""
Gets the proxy configuration from QSettings
""" Gets the proxy configuration from QSettings
:return: Proxy settings: flag specifying if proxy is enabled, host, port, user and password
:rtype: tuple(str)
"""
settings = QSettings()
settings.beginGroup('proxy')
Expand Down Expand Up @@ -642,7 +644,7 @@ def add_wms_layer(self, current_position=False):
self.update_parameters()
name = '{} - {}'.format(self.get_source_name(), Settings.parameters['title'])
new_layer = QgsRasterLayer(self.get_wms_uri(), name, 'wms')
#new_layer = QgsRasterLayer(self.get_wmts_uri(), name, 'wms')
# new_layer = QgsRasterLayer(self.get_wmts_uri(), name, 'wms')
if new_layer.isValid():
if not current_position and self.get_qgis_layers():
self.iface.setActiveLayer(self.get_qgis_layers()[0])
Expand Down

0 comments on commit 1f354cd

Please sign in to comment.