[processing] fixed using temporary files in field calculator

qgis · Jun 22, 2015 · 5013bb5 · 5013bb5
1 parent 1579a68
commit 5013bb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py
@@ -151,9 +151,6 @@ def checkParameterValuesBeforeExecuting(self):
         if newField and len(fieldName) == 0:
             return self.tr('Field name is not set. Please enter a field name')
 
-        outputName = self.getOutputValue(self.OUTPUT_LAYER).strip()
-        if outputName == '':
-            return self.tr('Output is not set. Please specify valid filename')
 
     def getCustomParametersDialog(self):
         return FieldsCalculatorDialog(self)
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py b/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
@@ -142,8 +142,8 @@ def selectFile(self):
             filename = unicode(files[0])
             selectedFileFilter = unicode(fileDialog.selectedNameFilter())
             if not filename.lower().endswith(
-                    tuple(re.findall("\*(\.[a-z]{1,5})", fileFilter))):
-                ext = re.search("\*(\.[a-z]{1,5})", selectedFileFilter)
+                    tuple(re.findall("\*(\.[a-z]{1,10})", fileFilter))):
+                ext = re.search("\*(\.[a-z]{1,10})", selectedFileFilter)
                 if ext:
                     filename = filename + ext.group(1)
             self.leOutputFile.setText(filename)
@@ -184,8 +184,7 @@ def setParamValues(self):
         self.alg.setParameterValue('NEW_FIELD',
                 self.mNewFieldGroupBox.isChecked())
         self.alg.setParameterValue('FORMULA', self.builder.expressionText())
-        self.alg.setOutputValue('OUTPUT_LAYER',
-                self.leOutputFile.text())
+        self.alg.setOutputValue('OUTPUT_LAYER', self.leOutputFile.text().strip() or None)
 
         msg = self.alg.checkParameterValuesBeforeExecuting()
         if msg: