[QGIS Commit] r9802 - branches/vector_overlay_branch/src/plugins/diagram_overlay

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-12-15 02:56:03 -0500 (Mon, 15 Dec 2008)
New Revision: 9802

Modified:
   branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramdialog.cpp
   branches/vector_overlay_branch/src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
Log:
added missing slog in svg diagram widget

Modified: branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramdialog.cpp
===================================================================
--- branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramdialog.cpp	2008-12-15 06:56:21 UTC (rev 9801)
+++ branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramdialog.cpp	2008-12-15 07:56:03 UTC (rev 9802)
@@ -31,7 +31,6 @@
 QgsDiagramDialog::QgsDiagramDialog(QgsVectorLayer* vl): mVectorLayer(vl)
 {
   setupUi(this);
-  QObject::connect(mClassificationComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(changeClassificationAttribute(const QString&)));
 
   mDiagramTypeComboBox->insertItem(0, tr("Pie chart"));
   mDiagramTypeComboBox->insertItem(1, tr("Bar chart"));

Modified: branches/vector_overlay_branch/src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
===================================================================
--- branches/vector_overlay_branch/src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp	2008-12-15 06:56:21 UTC (rev 9801)
+++ branches/vector_overlay_branch/src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp	2008-12-15 07:56:03 UTC (rev 9802)
@@ -21,6 +21,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QProgressDialog>
 
 QgsSVGDiagramFactoryWidget::QgsSVGDiagramFactoryWidget(): QgsDiagramFactoryWidget()
@@ -72,6 +73,44 @@
     //nothing to be done
 }
 
+void QgsSVGDiagramFactoryWidget::on_mPictureBrowseButton_clicked()
+{
+  QString openDir;
+  QString lineEditText = mPictureLineEdit->text();
+  if ( !lineEditText.isEmpty() )
+  {
+    QFileInfo openDirFileInfo( lineEditText );
+    openDir = openDirFileInfo.path();
+  }
+
+
+  //show file dialog
+  QString filePath = QFileDialog::getOpenFileName( 0, tr( "Select svg file" ), openDir );
+  if ( filePath.isEmpty() )
+  {
+    return;
+  }
+
+  //check if file exists
+  QFileInfo fileInfo( filePath );
+  if ( !fileInfo.exists() || !fileInfo.isReadable() )
+  {
+    QMessageBox::critical( 0, "Invalid file", "Error, file does not exist or is not readable" );
+    return;
+  }
+
+  //check if it is a valid svg file
+   if(!testSvgFile(filePath))
+   {
+      QMessageBox::critical( 0, "Invalid file", "Error, the selected file is not a valid svg file" );
+    return;
+   }
+
+  mPictureLineEdit->blockSignals( true );
+  mPictureLineEdit->setText( filePath );
+  mPictureLineEdit->blockSignals( false );
+}
+
 void QgsSVGDiagramFactoryWidget::on_mPreviewListWidget_currentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
 {
   if(!current)