diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index fdd6cc5d5fa..bcd20c4b436 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -523,6 +523,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) : chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() ); chkUseRenderCaching->setChecked( settings.value( "/qgis/enable_render_caching", false ).toBool() ); + // Default simplify drawing configuration + mSimplifyDrawingGroupBox->setChecked( settings.value( "/qgis/simplifyDrawingHints", (int)QgsVectorLayer::FullSimplification ).toInt() != QgsVectorLayer::NoSimplification ); + mSimplifyDrawingSlider->setValue( (int)(5.0f * (settings.value( "/qgis/simplifyDrawingTol", 1.0F ).toFloat()-1)) ); + mSimplifyDrawingPanel->setVisible( mSimplifyDrawingSlider->value()>0 ); + // Slightly awkard here at the settings value is true to use QImage, // but the checkbox is true to use QPixmap chkUseQPixmap->setChecked( !( settings.value( "/qgis/use_qimage_to_render", true ).toBool() ) ); @@ -980,6 +985,10 @@ void QgsOptions::saveOptions() bool legendLayersCapitalise = settings.value( "/qgis/capitaliseLayerName", false ).toBool(); settings.setValue( "/qgis/capitaliseLayerName", capitaliseCheckBox->isChecked() ); + // Default simplify drawing configuration + settings.setValue( "/qgis/simplifyDrawingHints", (int)(mSimplifyDrawingGroupBox->isChecked() ? QgsVectorLayer::FullSimplification : QgsVectorLayer::NoSimplification) ); + settings.setValue( "/qgis/simplifyDrawingTol", (float)(1.0f + 0.2f*mSimplifyDrawingSlider->value()) ); + // project settings.setValue( "/qgis/projOpenAtLaunch", mProjectOnLaunchCmbBx->currentIndex() ); settings.setValue( "/qgis/projOpenAtLaunchPath", mProjectOnLaunchLineEdit->text() ); @@ -1850,3 +1859,7 @@ void QgsOptions::saveContrastEnhancement( QComboBox *cbox, QString name ) settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm/" + name, value ); } +void QgsOptions::on_mSimplifyDrawingSlider_valueChanged( int value ) +{ + mSimplifyDrawingPanel->setVisible( value>0 ); +} diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h index 4e747223ac1..11a34eb4d08 100644 --- a/src/app/qgsoptions.h +++ b/src/app/qgsoptions.h @@ -227,6 +227,8 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption */ void saveGdalDriverList(); + void on_mSimplifyDrawingSlider_valueChanged( int value ); + private: QStringList i18nList(); void initContrastEnhancement( QComboBox *cbox, QString name, QString defaultVal ); diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 25e5d8dbc39..89a212ee3bc 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -181,6 +181,12 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath, connect( this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( selectionChanged() ) ); connect( QgsProject::instance()->relationManager(), SIGNAL( relationsLoaded() ), this, SLOT( onRelationsLoaded() ) ); + + // Default simplify drawing configuration + QSettings settings; + setSimplifyDrawingHints( settings.value( "/qgis/simplifyDrawingHints", (int)mSimplifyDrawingHints ).toInt() ); + setSimplifyDrawingTol( settings.value( "/qgis/simplifyDrawingTol", mSimplifyDrawingTol ).toFloat() ); + } // QgsVectorLayer ctor diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui index 89c69e3889c..f52327c3044 100644 --- a/src/ui/qgsoptionsbase.ui +++ b/src/ui/qgsoptionsbase.ui @@ -1649,6 +1649,182 @@ + + + + By default simplify geometries + + + true + + + + + + + 0 + 0 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">By default new vector layers added to the map should simplify geometries to improve rendering speed. The simplification applies only during rendering of the layer and does not modify the layer geometry.</p></body></html> + + + true + + + 2 + + + + + + + Simplification factor (higher values result in more simplification): + + + 2 + + + + + + + + 130 + 16777215 + + + + Higher values result in more simplification + + + 0 + + + 20 + + + 0 + + + true + + + Qt::Horizontal + + + false + + + false + + + + + + + + 0 + 70 + + + + + 16777215 + 16777215 + + + + QFrame::Box + + + QFrame::Raised + + + + + 10 + 0 + 60 + 67 + + + + + 0 + 0 + + + + + 60 + 67 + + + + + 40 + 40 + + + + Qt::LeftToRight + + + false + + + + + + :/images/themes/default/mIconWarn.png + + + false + + + + + + 45 + 8 + 411 + 51 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><span style=" font-size:8pt; font-weight:600;">Warning:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> Increasing this factor will further speed up rendering, but may result in gaps </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> or topological errors in the layer display.</span></p></body></html> + + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + @@ -3858,7 +4034,7 @@ - +