Merge pull request #999 from vasole/cfg

[PyMcaBatch] Force default to cfg for the fit configuration file.
vasole · May 16, 2023 · 683e059 · 683e059
2 parents 2b9e840 + 3fa7346
commit 683e059
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/PyMca5/PyMcaGui/io/ConfigurationFileDialogs.py b/PyMca5/PyMcaGui/io/ConfigurationFileDialogs.py
@@ -1,8 +1,8 @@
 #/*##########################################################################
-# Copyright (C) 2019 European Synchrotron Radiation Facility
+# Copyright (C) 2019-2023 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
-# the ESRF by the Software group.
+# the ESRF.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/PyMca5/PyMcaGui/pymca/PyMcaBatch.py b/PyMca5/PyMcaGui/pymca/PyMcaBatch.py
@@ -1142,7 +1142,7 @@ def browseList(self):
             self.inputDir =  os.getcwd()
         wdir = self.inputDir
         wfilter = self.inputFilter
-        filetypes = "McaFiles (*.mca)\nEdfFiles (*.edf)\n"
+        filetypes = "McaFiles (*.mca)\nEdfFiles (*.edf)\nCSV (*.csv *.CSV)\n"
         if HDF5SUPPORT:
             filetypes += "HDF5 (*.nxs *.h5 *.hdf *.hdf5)\n"
         filetypes += "SpecFiles (*.spec)\nSpecFiles (*.dat)\nAll files (*)"
@@ -1169,7 +1169,8 @@ def browseConfig(self):
         fileList = ConfigurationFileDialogs.getFitConfigurationFilePath(self,
                                                 currentdir=wdir,
                                                 mode="OPEN",
-                                                single=True)
+                                                single=True,
+                                                currentfilter="Fit configuration files (*.cfg)")
 
         if fileList:
             self.setConfigFile(fileList[0])