Improved implementation

qgis · Jun 15, 2013 · 54956db · 54956db
1 parent d416555
commit 54956db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/python/plugins/fTools/tools/doPointDistance.py b/python/plugins/fTools/tools/doPointDistance.py
@@ -128,7 +128,7 @@ def accept(self):
             else: matType = "Summary"
             if self.chkNearest.isChecked(): nearest = self.spnNearest.value()
             else: nearest = 0
-            outName = ftools_utils.getShapefileName(outPath)
+            outName = ftools_utils.getShapefileName(outPath,'.csv')
             self.outFile.clear()
             self.compute(point1, point2, field1, field2, outPath, matType, nearest, self.progressBar)
             self.progressBar.setValue(100)

diff --git a/python/plugins/fTools/tools/ftools_utils.py b/python/plugins/fTools/tools/ftools_utils.py
@@ -383,12 +383,10 @@ def getShapesByGeometryType( baseDir, inShapes, geomType ):
 
   return outShapes
 
-def getShapefileName( outPath ):
+def getShapefileName( outPath, extension='.shp' ):
     import os.path
     outName=os.path.basename(outPath)
-    if outName.endswith('.shp'):
-        outName=outName[:-4]
-    if outName.endswith('.csv'):
-        outName=outName[:-4]
+    if outName.endswith(extension):
+        outName=outName[:-len(extension)]
     return outName