Skip to content

Commit df38bb4

Browse files
cycleusercycleuser
committed
CSV front of XLSX
1 parent 031dd0a commit df38bb4

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎geopytool/CustomClass.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version="0.9.21.0.009"
1+
version="0.9.21.0.010"
22

3-
date = '2021-10-14'
3+
date = '2021-10-17'
44

55
dpi = 64
66
# coding:utf-8
@@ -1274,7 +1274,7 @@ def getDataFiles(self, limit=6):
12741274
print('get Multiple Data Files called \n')
12751275
DataFilesInput, filetype = QFileDialog.getOpenFileNames(self, u'Choose Data File',
12761276
'~/',
1277-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
1277+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
12781278
# print(DataFileInput,filetype)
12791279

12801280
DataFramesList = []
@@ -1297,7 +1297,7 @@ def getDataFile(self, CleanOrNot=True):
12971297

12981298
DataFileInput, filetype = QFileDialog.getOpenFileName(self, _translate('MainWindow', u'Choose Data File'),
12991299
'~/',
1300-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
1300+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
13011301
print(DataFileInput)
13021302

13031303
raw_input_data = pd.DataFrame()

‎geopytool/__init__.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ def getDataFiles(self, limit=6):
939939
print('get Multiple Data Files called \n')
940940
DataFilesInput, filetype = QFileDialog.getOpenFileNames(self, u'Choose Data File',
941941
'~/',
942-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
942+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
943943
# print(DataFileInput,filetype)
944944

945945
DataFramesList = []
@@ -962,7 +962,7 @@ def getDataFile(self, CleanOrNot=True):
962962

963963
DataFileInput, filetype = QFileDialog.getOpenFileName(self, _translate('MainWindow', u'Choose Data File'),
964964
'~/',
965-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
965+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
966966
# #print(DataFileInput,filetype)
967967

968968
self.DataLocation = DataFileInput
@@ -1040,7 +1040,7 @@ def OldCombine(self):
10401040

10411041
DataFilesInput, filetype = QFileDialog.getOpenFileNames(self, _translate('MainWindow', u'Choose Data File'),
10421042
'~/',
1043-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
1043+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
10441044
# #print(DataFileInput,filetype)
10451045

10461046
DataFramesList = []
@@ -1077,7 +1077,7 @@ def Combine(self):
10771077

10781078
DataFilesInput, filetype = QFileDialog.getOpenFileNames(self, _translate('MainWindow', u'Choose Data File'),
10791079
'~/',
1080-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
1080+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
10811081
# #print(DataFileInput,filetype)
10821082

10831083
DataFramesList = []
@@ -1111,7 +1111,7 @@ def Combine_transverse(self):
11111111
print('Combine called \n')
11121112
DataFilesInput, filetype = QFileDialog.getOpenFileNames(self, _translate('MainWindow', u'Choose Data File'),
11131113
'~/',
1114-
'Excel Files (*.xlsx);;Excel 2003 Files (*.xls);;CSV Files (*.csv)') # 设置文件扩展名过滤,注意用双分号间隔
1114+
'CSV Files (*.csv);;Excel Files (*.xlsx);;Excel 2003 Files (*.xls)') # 设置文件扩展名过滤,注意用双分号间隔
11151115
DataFramesList = []
11161116
filenamelist = self.getFileName(DataFilesInput)
11171117
if len(DataFilesInput) > 1:

0 commit comments

Comments
 (0)