From 6a81d2dacaaffd74262b6bbd315651ca94ddf32a Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 15 Feb 2019 12:09:14 +0100 Subject: [PATCH 1/2] Remove server unused/unimplemented option Allow Request Defined DataSources --- src/app/qgsprojectproperties.cpp | 4 - src/ui/qgsprojectpropertiesbase.ui | 865 ++++++++++++++--------------- 2 files changed, 413 insertions(+), 456 deletions(-) diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index e7e093f03a1..60d8a043bc4 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -613,9 +613,6 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa bool addWktGeometry = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSAddWktGeometry" ), QStringLiteral( "/" ) ); mAddWktGeometryCheckBox->setChecked( addWktGeometry ); - bool requestDefinedSources = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSRequestDefinedDataSources" ), QStringLiteral( "/" ), false ); - mAllowRequestDefinedDataSourcesBox->setChecked( requestDefinedSources ); - bool segmentizeFeatureInfoGeometry = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSSegmentizeFeatureInfoGeometry" ), QStringLiteral( "/" ) ); mSegmentizeFeatureInfoGeometryCheckBox->setChecked( segmentizeFeatureInfoGeometry ); @@ -1265,7 +1262,6 @@ void QgsProjectProperties::apply() } QgsProject::instance()->writeEntry( QStringLiteral( "WMSAddWktGeometry" ), QStringLiteral( "/" ), mAddWktGeometryCheckBox->isChecked() ); - QgsProject::instance()->writeEntry( QStringLiteral( "WMSRequestDefinedDataSources" ), QStringLiteral( "/" ), mAllowRequestDefinedDataSourcesBox->isChecked() ); QgsProject::instance()->writeEntry( QStringLiteral( "WMSSegmentizeFeatureInfoGeometry" ), QStringLiteral( "/" ), mSegmentizeFeatureInfoGeometryCheckBox->isChecked() ); QgsProject::instance()->writeEntry( QStringLiteral( "WMSUseLayerIDs" ), QStringLiteral( "/" ), mWmsUseLayerIDs->isChecked() ); diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui index 127e4e0fb8c..51faea7606a 100644 --- a/src/ui/qgsprojectpropertiesbase.ui +++ b/src/ui/qgsprojectpropertiesbase.ui @@ -265,8 +265,8 @@ 0 0 - 590 - 782 + 537 + 795 @@ -281,7 +281,7 @@ General Settings - + projgeneral @@ -546,7 +546,7 @@ Measurements - + projgeneral @@ -615,7 +615,7 @@ Coordinate Display - + projgeneral @@ -705,7 +705,7 @@ false - + projgeneral @@ -863,8 +863,8 @@ 0 0 - 603 - 161 + 546 + 164 @@ -938,8 +938,8 @@ 0 0 - 290 - 552 + 269 + 553 @@ -948,7 +948,7 @@ Default Symbols - + projstyles @@ -1175,7 +1175,7 @@ Options - + projstyles @@ -1189,7 +1189,7 @@ - + Qt::StrongFocus @@ -1514,8 +1514,8 @@ 0 0 - 168 - 54 + 167 + 55 @@ -1575,9 +1575,9 @@ 0 - -1198 + -731 671 - 2647 + 2706 @@ -1598,13 +1598,13 @@ false - + false - + projowsserver - + true @@ -1841,238 +1841,36 @@ WMS capabilities - + projowsserver - - - - Ad&vertised extent + + + + + + Advertised URL + + + + + + + + + + + + Use layer ids as names - - true - - - false - - - false - - - true - - - - - - Min. &X - - - mWMSExtMinX - - - - - - - - - - - - - - Min. &Y - - - mWMSExtMinY - - - - - - - - - - - - - - Max. X - - - mWMSExtMaxX - - - - - - - - - - - - - - Max. Y - - - mWMSExtMaxY - - - - - - - - - - - - - - Use Current Canvas Extent - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - CRS restrictions + + + + Add geometry to feature response - - true - - - false - - - false - - - true - - - - - - Add new CRS - - - - :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg - - - - - - - - - - Fetch all CRS's from layers - - - Used - - - - - - - Remove selected CRS - - - - :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg - - - - - - - - - - Excl&ude layouts - - - true - - - false - - - false - - - true - - - - - - - - - Add layout to exclude - - - - - - - :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg - - - - - - - Remove selected layout - - - - - - - :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg - - - - - - - Qt::Horizontal - - - - 0 - 20 - - - - - @@ -2086,10 +1884,10 @@ false - + false - + true @@ -2140,6 +1938,125 @@ + + + + + + Quality for JPEG images ( 10 : smaller image - 100 : best quality ) + + + + + + + 10 + + + 100 + + + 5 + + + 90 + + + + + + + + + + + GetFeatureInfo geometry precision (decimal places) + + + + + + + 1 + + + 17 + + + 8 + + + + + + + + + + + Width + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 6 + 20 + + + + + + + + + + + + + + Height + + + + + + + Maximums for GetMap request + + + + + + + + + + + Maximum features for Atlas print requests + + + + + + + 9999999 + + + 1 + + + + + @@ -2272,166 +2189,242 @@ - - - - Use layer ids as names - - - - - - - Add geometry to feature response - - - - - - Allow defining datasources in server requests - - - - Segmentize feature info geometry - - - - - - GetFeatureInfo geometry precision (decimal places) - - - - - - - 1 - - - 17 - - - 8 - - - - + + + + Ad&vertised extent + + + true + + + false + + + false + + + true + + + + + + Min. &X + + + mWMSExtMinX + + + + + + + + + + + + + + Min. &Y + + + mWMSExtMinY + + + + + + + + + + + + + + Max. X + + + mWMSExtMaxX + + + + + + + + + + + + + + Max. Y + + + mWMSExtMaxY + + + + + + + + + + + + + + Use Current Canvas Extent + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - - - Advertised URL - - - - - - - + + + + CRS restrictions + + + true + + + false + + + false + + + true + + + + + + Add new CRS + + + + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg + + + + + + + + + + Fetch all CRS's from layers + + + Used + + + + + + + Remove selected CRS + + + + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg + + + + + - - - - - - Width - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 6 - 20 - - - - - - - - - - - - - - Height - - - - - - - Maximums for GetMap request - - - - - - - - - - - Quality for JPEG images ( 10 : smaller image - 100 : best quality ) - - - - - - - 10 - - - 100 - - - 5 - - - 90 - - - - - - - - - - - Maximum features for Atlas print requests - - - - - - - 9999999 - - - 1 - - - - + + + + Excl&ude layouts + + + true + + + false + + + false + + + true + + + + + + + + + Add layout to exclude + + + + + + + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg + + + + + + + Remove selected layout + + + + + + + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg + + + + + + + Qt::Horizontal + + + + 0 + 20 + + + + + + @@ -2595,7 +2588,7 @@ WFS capabilities (also influences DXF export) - + projowsserver @@ -2681,7 +2674,7 @@ WCS capabilities - + projowsserver @@ -2868,12 +2861,6 @@ - - QgsCollapsibleGroupBox - QGroupBox -
qgscollapsiblegroupbox.h
- 1 - QgsColorButton QToolButton @@ -2881,14 +2868,15 @@ 1 - QgsFilterLineEdit - QLineEdit -
qgsfilterlineedit.h
+ QgsColorSchemeList + QWidget +
qgscolorschemelist.h
+ 1 - QgsOpacityWidget - QWidget -
qgsopacitywidget.h
+ QgsCollapsibleGroupBox + QGroupBox +
qgscollapsiblegroupbox.h
1 @@ -2904,9 +2892,20 @@ 1 - QgsColorSchemeList + QgsFilterLineEdit + QLineEdit +
qgsfilterlineedit.h
+ + + QgsDatumTransformTableWidget QWidget -
qgscolorschemelist.h
+
qgsdatumtransformtablewidget.h
+ 1 + + + QgsOpacityWidget + QWidget +
qgsopacitywidget.h
1 @@ -2921,12 +2920,6 @@
qgsprojectionselectiontreewidget.h
1 - - QgsDatumTransformTableWidget - QWidget -
qgsdatumtransformtablewidget.h
- 1 - mOptionsListWidget @@ -3024,7 +3017,6 @@ mWMSInspireMetadataDate mWmsUseLayerIDs mAddWktGeometryCheckBox - mAllowRequestDefinedDataSourcesBox mSegmentizeFeatureInfoGeometryCheckBox mWMSPrecisionSpinBox mWMSUrlLineEdit @@ -3046,37 +3038,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 53a14e240235393343c1ed45dc5cd42bd46bb77f Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 15 Feb 2019 12:10:24 +0100 Subject: [PATCH 2/2] Server: better formatting when logging request params --- src/server/qgsfcgiserverrequest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/qgsfcgiserverrequest.cpp b/src/server/qgsfcgiserverrequest.cpp index 0d759c81508..5b4e33cabe4 100644 --- a/src/server/qgsfcgiserverrequest.cpp +++ b/src/server/qgsfcgiserverrequest.cpp @@ -199,7 +199,7 @@ void QgsFcgiServerRequest::printRequestInfos() { if ( getenv( envVar.toStdString().c_str() ) ) { - QgsMessageLog::logMessage( envVar + QString( getenv( envVar.toStdString().c_str() ) ), QStringLiteral( "Server" ), Qgis::Info ); + QgsMessageLog::logMessage( QStringLiteral( "%1: %2" ).arg( envVar ).arg( QString( getenv( envVar.toStdString().c_str() ) ) ), QStringLiteral( "Server" ), Qgis::Info ); } } }