[QGIS Commit] r15177 - in trunk/qgis/src: plugins/delimited_text providers/delimitedtext

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-16 01:52:24 -0800 (Wed, 16 Feb 2011)
New Revision: 15177

Modified:
   trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
   trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
Log:
fix #3490

Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp	2011-02-16 09:11:48 UTC (rev 15176)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp	2011-02-16 09:52:24 UTC (rev 15177)
@@ -58,11 +58,11 @@
   }
 
   QString delimiterChars = settings.value( key + "/delimiterChars", " " ).toString();
-  cbxDelimSpace->setChecked( delimiterChars.contains(" "));
-  cbxDelimTab->setChecked( delimiterChars.contains("\\t"));
-  cbxDelimColon->setChecked( delimiterChars.contains(":"));
-  cbxDelimSemicolon->setChecked( delimiterChars.contains(":"));
-  cbxDelimComma->setChecked( delimiterChars.contains(","));
+  cbxDelimSpace->setChecked( delimiterChars.contains( " " ) );
+  cbxDelimTab->setChecked( delimiterChars.contains( "\\t" ) );
+  cbxDelimColon->setChecked( delimiterChars.contains( ":" ) );
+  cbxDelimSemicolon->setChecked( delimiterChars.contains( ":" ) );
+  cbxDelimComma->setChecked( delimiterChars.contains( "," ) );
 
   cmbXField->setDisabled( true );
   cmbYField->setDisabled( true );
@@ -107,33 +107,33 @@
     else if ( delimiterRegexp->isChecked() )
       delimiterType = "regexp";
 
-    QUrl url(txtFilePath->text());
-    url.addQueryItem("delimiter",txtDelimiter->text());
-    url.addQueryItem("delimiterType",delimiterType);
+    QUrl url = QUrl::fromLocalFile( txtFilePath->text() );
+    url.addQueryItem( "delimiter", txtDelimiter->text() );
+    url.addQueryItem( "delimiterType", delimiterType );
 
     if ( geomTypeXY->isChecked() )
     {
       if ( !cmbXField->currentText().isEmpty() && !cmbYField->currentText().isEmpty() )
       {
-          url.addQueryItem("xField",cmbXField->currentText());
-          url.addQueryItem("yField",cmbYField->currentText());
+        url.addQueryItem( "xField", cmbXField->currentText() );
+        url.addQueryItem( "yField", cmbYField->currentText() );
       }
     }
     else
     {
       if ( ! cmbWktField->currentText().isEmpty() )
       {
-        url.addQueryItem("wktField",cmbWktField->currentText());
+        url.addQueryItem( "wktField", cmbWktField->currentText() );
       }
     }
 
     int skipLines = rowCounter->value();
     if ( skipLines > 0 )
-        url.addQueryItem("skipLines",QString( "%1" ).arg( skipLines ));
+      url.addQueryItem( "skipLines", QString( "%1" ).arg( skipLines ) );
 
     // add the layer to the map
 
-    QString uri(url.toEncoded());
+    QString uri( url.toEncoded() );
     emit drawVectorLayer( uri, txtLayerName->text(), "delimitedtext" );
     // store the settings
 
@@ -149,7 +149,7 @@
       settings.setValue( key + "/delimiterType", "plain" );
     else
       settings.setValue( key + "/delimiterType", "regexp" );
-    settings.setValue( key + "/delimiterChars", selectedChars());
+    settings.setValue( key + "/delimiterChars", selectedChars() );
 
     accept();
   }
@@ -166,13 +166,13 @@
 
 QString QgsDelimitedTextPluginGui::selectedChars()
 {
-    QString chars = "";
-    if ( cbxDelimSpace->isChecked() ) chars += " ";
-    if ( cbxDelimTab->isChecked() ) chars += "\\t";
-    if ( cbxDelimSemicolon->isChecked() ) chars += ";";
-    if ( cbxDelimComma->isChecked() ) chars += ",";
-    if ( cbxDelimColon->isChecked() ) chars += ":";
-    return chars;
+  QString chars = "";
+  if ( cbxDelimSpace->isChecked() ) chars += " ";
+  if ( cbxDelimTab->isChecked() ) chars += "\\t";
+  if ( cbxDelimSemicolon->isChecked() ) chars += ";";
+  if ( cbxDelimComma->isChecked() ) chars += ",";
+  if ( cbxDelimColon->isChecked() ) chars += ":";
+  return chars;
 }
 
 QStringList QgsDelimitedTextPluginGui::splitLine( QString line )

Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2011-02-16 09:11:48 UTC (rev 15176)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2011-02-16 09:52:24 UTC (rev 15177)
@@ -154,7 +154,7 @@
 
   // Extract the provider definition from the url
 
-  mFileName = url.path();
+  mFileName = url.toLocalFile();
 
   QString wktField( "" );
   QString xField( "" );