18 changes: 18 additions & 0 deletions src/providers/wms/qgswmsprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,23 @@ struct QgsWmsSupportedFormat
QString label;
};

enum QgsWmsTileAttribute
{
TileReqNo = QNetworkRequest::User + 0,
TileIndex = QNetworkRequest::User + 1,
TileRect = QNetworkRequest::User + 2,
TileRetry = QNetworkRequest::User + 3,
};

enum QgsWmsDpiMode
{
dpiNone = 0,
dpiQGIS = 1,
dpiUMN = 2,
dpiGeoServer = 4,
dpiAll = dpiQGIS | dpiUMN | dpiUMN,
};

/**
\brief Data provider for OGC WMS layers.
Expand Down Expand Up @@ -1096,6 +1113,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
bool mIgnoreAxisOrientation;
bool mInvertAxisOrientation;
bool mSmoothPixmapTransform;
enum QgsWmsDpiMode mDpiMode;

//! supported formats for GetFeatureInfo in order of preference
QStringList mSupportedGetFeatureFormats;
Expand Down
36 changes: 26 additions & 10 deletions src/ui/qgsnewhttpconnectionbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>475</width>
<height>415</height>
<height>463</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -33,6 +33,16 @@
<string>Connection details</string>
</property>
<layout class="QGridLayout">
<item row="8" column="0">
<widget class="QLabel" name="lblDpiMode">
<property name="text">
<string>DPI-Mode</string>
</property>
<property name="buddy">
<cstring>cmbDpiMode</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
Expand Down Expand Up @@ -134,35 +144,35 @@
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<item row="13" column="0" colspan="2">
<widget class="QCheckBox" name="cbxIgnoreGetFeatureInfoURI">
<property name="text">
<string>Ignore GetFeatureInfo URI reported in capabilities</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="cbxIgnoreGetMapURI">
<property name="text">
<string>Ignore GetMap URI reported in capabilities</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<item row="14" column="0" colspan="2">
<widget class="QCheckBox" name="cbxIgnoreAxisOrientation">
<property name="text">
<string>Ignore axis orientation (WMS 1.3/WMTS)</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<item row="15" column="0" colspan="2">
<widget class="QCheckBox" name="cbxInvertAxisOrientation">
<property name="text">
<string>Invert axis orientation</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<item row="16" column="0" colspan="2">
<widget class="QCheckBox" name="cbxSmoothPixmapTransform">
<property name="text">
<string>Smooth pixmap transform</string>
Expand All @@ -177,8 +187,14 @@
<property name="text">
<string>Referer</string>
</property>
<property name="buddy">
<cstring>txtReferer</cstring>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QComboBox" name="cmbDpiMode"/>
</item>
</layout>
</widget>
</item>
Expand All @@ -197,8 +213,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>412</x>
<y>244</y>
<x>421</x>
<y>453</y>
</hint>
<hint type="destinationlabel">
<x>430</x>
Expand All @@ -213,8 +229,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>321</x>
<y>244</y>
<x>330</x>
<y>453</y>
</hint>
<hint type="destinationlabel">
<x>426</x>
Expand Down
16 changes: 15 additions & 1 deletion src/ui/qgsoptionsbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2500,7 +2500,7 @@
</property>
</widget>
</item>
<item row="5" column="3">
<item row="5" column="3">
<widget class="QRadioButton" name="radNautical">
<property name="text">
<string>Nautical Miles</string>
Expand Down Expand Up @@ -3814,6 +3814,20 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_34">
<item>
<widget class="QLabel" name="lblUserAgent">
<property name="text">
<string>User-Agent</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="leUserAgent"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down