Look for lat/long before looking for x/y column names

g_j_m · g_j_m · commit c90276ece20a · 2006-09-30T23:24:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5897 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
@@ -129,17 +129,17 @@ void QgsDelimitedTextPluginGui::updateFieldLists()
         }  
         // Have a go at setting the selected items in the X and Y
         // combo boxes to something sensible.
-        int indexX = cmbXField->findText("X", Qt::MatchContains);
-        int indexY = cmbXField->findText("Y", Qt::MatchContains);
+        int indexX = cmbXField->findText("lon", Qt::MatchContains);
+        int indexY = cmbXField->findText("lat", Qt::MatchContains);
         if (indexX != -1 && indexY != -1)
         {
           cmbXField->setCurrentIndex(indexX);
           cmbYField->setCurrentIndex(indexY);
         }
         else
         {
-          indexX = cmbXField->findText("lon", Qt::MatchContains);
-          indexY = cmbXField->findText("lat", Qt::MatchContains);
+          indexX = cmbXField->findText("x", Qt::MatchContains);
+          indexY = cmbXField->findText("y", Qt::MatchContains);
           if (indexX != -1 && indexY != -1)
           {
             cmbXField->setCurrentIndex(indexX);

Original file line number	Diff line number	Diff line change
`@@ -129,17 +129,17 @@ void QgsDelimitedTextPluginGui::updateFieldLists()`
`129`	`129`	`}`
`130`	`130`	`// Have a go at setting the selected items in the X and Y`
`131`	`131`	`// combo boxes to something sensible.`
`132`		`- int indexX = cmbXField->findText("X", Qt::MatchContains);`
`133`		`- int indexY = cmbXField->findText("Y", Qt::MatchContains);`
	`132`	`+ int indexX = cmbXField->findText("lon", Qt::MatchContains);`
	`133`	`+ int indexY = cmbXField->findText("lat", Qt::MatchContains);`
`134`	`134`	`if (indexX != -1 && indexY != -1)`
`135`	`135`	`{`
`136`	`136`	`cmbXField->setCurrentIndex(indexX);`
`137`	`137`	`cmbYField->setCurrentIndex(indexY);`
`138`	`138`	`}`
`139`	`139`	`else`
`140`	`140`	`{`
`141`		`- indexX = cmbXField->findText("lon", Qt::MatchContains);`
`142`		`- indexY = cmbXField->findText("lat", Qt::MatchContains);`
	`141`	`+ indexX = cmbXField->findText("x", Qt::MatchContains);`
	`142`	`+ indexY = cmbXField->findText("y", Qt::MatchContains);`
`143`	`143`	`if (indexX != -1 && indexY != -1)`
`144`	`144`	`{`
`145`	`145`	`cmbXField->setCurrentIndex(indexX);`