[FEATURE]: possibility to export vector symbology (using ogr feature …

…style)
qgis · Jan 29, 2013 · a00e413 · a00e413
2 parents 81dacc7 + 9f9ce32
commit a00e413
Show file tree

Hide file tree

Showing 18 changed files with 780 additions and 77 deletions.
diff --git a/python/core/symbology-ng/qgssymbollayerv2utils.sip b/python/core/symbology-ng/qgssymbollayerv2utils.sip
@@ -168,9 +168,9 @@ class QgsSymbolLayerV2Utils
     static QColor parseColor( QString colorStr );
 
     /**Returns the line width scale factor depending on the unit and the paint device*/
-    static double lineWidthScaleFactor( QgsRenderContext& c, QgsSymbolV2::OutputUnit u );
+    static double lineWidthScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u );
     /**Returns scale factor painter units -> pixel dimensions*/
-    static double pixelSizeScaleFactor( QgsRenderContext& c, QgsSymbolV2::OutputUnit u );
+    static double pixelSizeScaleFactor( const QgsRenderContext& c, QgsSymbolV2::OutputUnit u );
     /**Creates a render context for a pixel based device*/
     static QgsRenderContext createRenderContext( QPainter* p );
 

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -82,6 +82,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/renderer
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
+  ${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
   interpolation
   ${PROJ_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}

diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -62,6 +62,12 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* par
 
   mEncodingComboBox->setCurrentIndex( idx );
   on_mFormatComboBox_currentIndexChanged( mFormatComboBox->currentIndex() );
+
+  //symbology export combo box
+  mSymbologyExportComboBox->addItem( tr( "No symbology" ), QgsVectorFileWriter::NoSymbology );
+  mSymbologyExportComboBox->addItem( tr( "Feature symbology" ), QgsVectorFileWriter::FeatureSymbology );
+  mSymbologyExportComboBox->addItem( tr( "Symbol layer symbology" ), QgsVectorFileWriter::SymbolLayerSymbology );
+  on_mSymbologyExportComboBox_currentIndexChanged( mSymbologyExportComboBox->currentText() );
 }
 
 QgsVectorLayerSaveAsDialog::~QgsVectorLayerSaveAsDialog()
@@ -190,3 +196,24 @@ bool QgsVectorLayerSaveAsDialog::addToCanvas() const
 {
   return mAddToCanvas->isChecked();
 }
+
+int QgsVectorLayerSaveAsDialog::symbologyExport() const
+{
+  return mSymbologyExportComboBox->itemData( mSymbologyExportComboBox->currentIndex() ).toInt();
+}
+
+double QgsVectorLayerSaveAsDialog::scaleDenominator() const
+{
+  return mScaleSpinBox->value();
+}
+
+void QgsVectorLayerSaveAsDialog::on_mSymbologyExportComboBox_currentIndexChanged( const QString& text )
+{
+  bool scaleEnabled = true;
+  if ( text == tr( "No symbology" ) )
+  {
+    scaleEnabled = false;
+  }
+  mScaleSpinBox->setEnabled( scaleEnabled );
+  mScaleLabel->setEnabled( scaleEnabled );
+}
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h
@@ -41,13 +41,20 @@ class QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSav
     long crs() const;
     bool skipAttributeCreation() const;
     bool addToCanvas() const;
+    /**Returns type of symbology export.
+        0: No symbology
+        1: Feature symbology
+        2: Symbol level symbology*/
+    int symbologyExport() const;
+    double scaleDenominator() const;
 
   private slots:
     void on_mFormatComboBox_currentIndexChanged( int idx );
     void on_mCRSSelection_currentIndexChanged( int idx );
     void on_browseFilename_clicked();
     void on_browseCRS_clicked();
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+    void on_mSymbologyExportComboBox_currentIndexChanged( const QString& text );
     void accept();
 
   private:

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4268,7 +4268,9 @@ void QgisApp::saveAsVectorFileGeneral( bool saveOnlySelection )
               &errorMessage,
               datasourceOptions, dialog->layerOptions(),
               dialog->skipAttributeCreation(),
-              &newFilename );
+              &newFilename,
+              ( QgsVectorFileWriter::SymbologyExport )( dialog->symbologyExport() ),
+              dialog->scaleDenominator() );
 
     QApplication::restoreOverrideCursor();