Skip to content

Commit f87ddbc

Browse files
cycleusercycleuser
committed
fix xlsx xlrd problem
1 parent ead91dd commit f87ddbc

File tree

6 files changed

+75
-38
lines changed

6 files changed

+75
-38
lines changed

‎geopytool/CustomClass.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version="0.9.21.0.002"
1+
version="0.9.21.0.003"
22

3-
date = '2021-01-01'
3+
date = '2021-01-21'
44

55
dpi = 128
66
# coding:utf-8
@@ -690,9 +690,9 @@ def dragEnterEvent(self, event):
690690
self.path = f
691691

692692
if ('csv' in f):
693-
self.parent().raw = pd.read_csv(f)
693+
self.parent().raw = pd.read_csv(f,engine='python')
694694
elif ('xls' in f):
695-
self.parent().raw = pd.read_excel(f)
695+
self.parent().raw = pd.read_excel(f,engine='openpyxl')
696696

697697
# #print(self.raw)
698698

@@ -1283,9 +1283,9 @@ def getDataFiles(self, limit=6):
12831283
for i in range(len(DataFilesInput)):
12841284
if i < limit:
12851285
if ('csv' in DataFilesInput[i]):
1286-
DataFramesList.append(pd.read_csv(DataFilesInput[i]))
1286+
DataFramesList.append(pd.read_csv(DataFilesInput[i]),engine='python')
12871287
elif ('xls' in DataFilesInput[i]):
1288-
DataFramesList.append(pd.read_excel(DataFilesInput[i]))
1288+
DataFramesList.append(pd.read_excel(DataFilesInput[i]),engine='openpyxl')
12891289
else:
12901290
# self.ErrorEvent(text='You can only open up to 6 Data Files at a time.')
12911291
pass
@@ -1302,10 +1302,12 @@ def getDataFile(self, CleanOrNot=True):
13021302

13031303
raw_input_data = pd.DataFrame()
13041304

1305+
1306+
13051307
if ('csv' in DataFileInput):
1306-
raw_input_data = pd.read_csv(DataFileInput)
1308+
raw_input_data = pd.read_csv(DataFileInput, engine='python')
13071309
elif ('xls' in DataFileInput):
1308-
raw_input_data = pd.read_excel(DataFileInput)
1310+
raw_input_data = pd.read_excel(DataFileInput,engine='openpyxl')
13091311

13101312
if len(raw_input_data) > 0:
13111313
return (raw_input_data, DataFileInput)

‎geopytool/RemovedTabelViewer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ def dragEnterEvent(self, event):
139139
self.path=f
140140

141141
if ('csv' in f):
142-
self.parent().raw = pd.read_csv(f)
142+
self.parent().raw = pd.read_csv(f,engine='python')
143143
elif ('xls' in f):
144-
self.parent().raw = pd.read_excel(f)
144+
self.parent().raw = pd.read_excel(f,engine='openpyxl')
145145

146146
# #print(self.raw)
147147

‎geopytool/Trans.py

+56-20
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,21 @@ def create_main_frame(self):
6868

6969

7070
self.transpose_button = QPushButton('&Transpose')
71-
self.center_Geometric_button = QPushButton('&Center by Geometric Mean')
72-
self.center_Arithmetic_button = QPushButton('&Center by Arithmetic Mean')
71+
self.center_Geometric_button = QPushButton('&Divide by Geometric Mean')
72+
self.center_Arithmetic_button = QPushButton('&Subtract Arithmetic Average')
7373

7474
self.min_max_button = QPushButton('&Min-Max Standard')
75-
self.std_button = QPushButton('&Standard Transform')
76-
self.log_button = QPushButton('&Log Transform')
77-
self.log_ten_button = QPushButton('&Log 10 Transform')
78-
self.log_e_button = QPushButton('&Log e Transform')
75+
self.std_button = QPushButton('&Standard')
76+
self.log_button = QPushButton('&Log')
77+
78+
self.log_ten_button = QPushButton('&Log 10')
79+
self.log_e_button = QPushButton('&Log e')
80+
81+
82+
self.exp_ten_button = QPushButton('&10 Exponential')
83+
self.exp_e_button = QPushButton('&e Exponential')
84+
85+
self.divide_by_sum_button = QPushButton('&Divide by Sum')
7986

8087
self.fill_NaN_button = QPushButton('&Fill Blanks With 0')
8188
self.remove_row_with_0_button = QPushButton('&Remove Rows With Blanks')
@@ -93,10 +100,17 @@ def create_main_frame(self):
93100
self.center_Geometric_button.clicked.connect(self.center_Geometric)
94101
self.center_Arithmetic_button.clicked.connect(self.center_Arithmetic)
95102
self.min_max_button.clicked.connect(self.min_max)
96-
self.std_button.clicked.connect(self.std_trans)
97-
self.log_button.clicked.connect(self.log_trans)
98-
self.log_ten_button.clicked.connect(self.log_ten_trans)
99-
self.log_e_button.clicked.connect(self.log_e_trans)
103+
self.std_button.clicked.connect(self.std)
104+
105+
self.log_button.clicked.connect(self.log)
106+
107+
self.log_ten_button.clicked.connect(self.log_ten)
108+
self.log_e_button.clicked.connect(self.log_e)
109+
110+
self.exp_ten_button.clicked.connect(self.exp_ten)
111+
self.exp_e_button.clicked.connect(self.exp_e)
112+
113+
self.divide_by_sum_button.clicked.connect(self.divide_by_sum)
100114

101115

102116

@@ -111,6 +125,7 @@ def create_main_frame(self):
111125
self.hbox0 =QHBoxLayout()
112126
self.hbox1 =QHBoxLayout()
113127
self.hbox2 =QHBoxLayout()
128+
self.hbox3 =QHBoxLayout()
114129

115130
#self.vbox.addWidget(self.canvas)
116131
self.vbox.addWidget(self.tableView)
@@ -122,21 +137,25 @@ def create_main_frame(self):
122137
for w in [self.center_Arithmetic_button,
123138
self.center_Geometric_button,
124139
self.min_max_button,
125-
self.std_button,
126-
self.log_ten_button,
127-
self.log_e_button,]:
140+
self.std_button]:
128141
self.hbox1.addWidget(w)
129142

143+
for w in [self.log_ten_button,self.exp_ten_button,
144+
self.log_e_button,self.exp_e_button,
145+
self.divide_by_sum_button]:
146+
self.hbox2.addWidget(w)
147+
130148
for w in [self.transpose_button,
131149
self.fill_NaN_button,
132150
self.remove_row_with_0_button,
133151
self.remove_column_with_0_button]:
134-
self.hbox2.addWidget(w)
152+
self.hbox3.addWidget(w)
135153

136154

137155
self.vbox.addLayout(self.hbox0)
138156
self.vbox.addLayout(self.hbox1)
139157
self.vbox.addLayout(self.hbox2)
158+
self.vbox.addLayout(self.hbox3)
140159

141160
self.main_frame.setLayout(self.vbox)
142161
self.setCentralWidget(self.main_frame)
@@ -230,7 +249,6 @@ def transpose(self):
230249
def remove_row_with_0(self):
231250
self.settings_backup = self._df
232251
self.settings_backup = self.settings_backup.dropna()
233-
234252
#dataframe = self._df
235253
ItemsAvalibale = self._df.columns.values.tolist()
236254

@@ -271,7 +289,6 @@ def center_Arithmetic(self):
271289
self.tableView.setModel(self.tableresult)
272290
self.show()
273291

274-
275292
def min_max(self):
276293
# mean=self.result.T.mean(numeric_only= float)
277294
# std=self.result.T.std(numeric_only= float)
@@ -281,7 +298,7 @@ def min_max(self):
281298
self.tableView.setModel(self.tableresult)
282299
self.show()
283300

284-
def std_trans(self):
301+
def std(self):
285302
mean=self.result.T.mean(numeric_only= float)
286303
std=self.result.T.std(numeric_only= float)
287304
tmpresult=(self.result.T-mean)/std
@@ -290,22 +307,41 @@ def std_trans(self):
290307
self.tableView.setModel(self.tableresult)
291308
self.show()
292309

293-
def log_trans(self):
310+
def log(self):
294311
self.result=np.log(self.result)
295312
self.tableresult=PandasModel(self.result)
296313
self.tableView.setModel(self.tableresult)
297314
self.show()
298315

299-
def log_ten_trans(self):
316+
def log_ten(self):
300317
self.result=np.log10(self.result)
301318
self.tableresult=PandasModel(self.result)
302319
self.tableView.setModel(self.tableresult)
303320
self.show()
304321

305-
def log_e_trans(self):
322+
def exp_ten(self):
323+
self.result = np.power(10,self.result)
324+
self.tableresult = PandasModel(self.result)
325+
self.tableView.setModel(self.tableresult)
326+
self.show()
327+
328+
def log_e(self):
306329
self.result=np.log(self.result)
307330
self.tableresult=PandasModel(self.result)
308331
self.tableView.setModel(self.tableresult)
309332
self.show()
310333

334+
def exp_e(self):
335+
self.result = np.power(np.e,self.result)
336+
self.tableresult = PandasModel(self.result)
337+
self.tableView.setModel(self.tableresult)
338+
self.show()
311339

340+
def divide_by_sum(self):
341+
sum=self.result.T.sum(numeric_only= float)
342+
print(sum)
343+
tmpresult=(self.result.T)/sum
344+
self.result=tmpresult.T
345+
self.tableresult=PandasModel(self.result)
346+
self.tableView.setModel(self.tableresult)
347+
self.show()

‎geopytool/__init__.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ def getDataFiles(self, limit=6):
950950
if ('csv' in DataFilesInput[i]):
951951
DataFramesList.append(pd.read_csv(DataFilesInput[i], engine='python'))
952952
elif ('xls' in DataFilesInput[i]):
953-
DataFramesList.append(pd.read_excel(DataFilesInput[i]))
953+
DataFramesList.append(pd.read_excel(DataFilesInput[i]),engine='openpyxl')
954954
else:
955955
# self.ErrorEvent(text='You can only open up to 6 Data Files at a time.')
956956
pass
@@ -971,7 +971,7 @@ def getDataFile(self, CleanOrNot=True):
971971
if ('csv' in DataFileInput):
972972
self.raw = pd.read_csv(DataFileInput, engine='python')
973973
elif ('xls' in DataFileInput):
974-
self.raw = pd.read_excel(DataFileInput)
974+
self.raw = pd.read_excel(DataFileInput,engine='openpyxl')
975975
# #print(self.raw)
976976

977977
if len(self.raw) > 0:
@@ -1050,7 +1050,7 @@ def OldCombine(self):
10501050
if ('csv' in i):
10511051
DataFramesList.append(pd.read_csv(i), engine='python')
10521052
elif ('xls' in i):
1053-
DataFramesList.append(pd.read_excel(i))
1053+
DataFramesList.append(pd.read_excel(i),engine='openpyxl')
10541054
pass
10551055

10561056
# result = pd.concat(DataFramesList,axis=1,sort=False)
@@ -1087,7 +1087,7 @@ def Combine(self):
10871087
if ('csv' in i):
10881088
DataFramesList.append(pd.read_csv(i, engine='python'))
10891089
elif ('xls' in i):
1090-
DataFramesList.append(pd.read_excel(i))
1090+
DataFramesList.append(pd.read_excel(i),engine='openpyxl')
10911091
pass
10921092

10931093
# result = pd.concat(DataFramesList,axis=1,sort=False)
@@ -1120,7 +1120,7 @@ def Combine_transverse(self):
11201120
if ('csv' in DataFilesInput[i]):
11211121
tmpdf = pd.read_csv(DataFilesInput[i], engine='python')
11221122
elif ('xls' in DataFilesInput[i]):
1123-
tmpdf = pd.read_excel(DataFilesInput[i])
1123+
tmpdf = pd.read_excel(DataFilesInput[i],engine='openpyxl')
11241124
# name_list = tmpdf.columns.values.tolist()
11251125
tmpname_dic = {}
11261126
tmpname_list = []

‎geopytool/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
setup(name='geopytool',
21-
version="0.9.21.0.002",
21+
version="0.9.21.0.003",
2222
description='a tool for daily geology related task. visit geopytool.com for further information',
2323
longdescription=README,
2424
author='cycleuser',

‎setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
setup(name='geopytool',
21-
version="0.9.21.0.002",
21+
version="0.9.21.0.003",
2222
description='a tool for daily geology related task. visit geopytool.com for further information',
2323
longdescription=README,
2424
author='cycleuser',
@@ -45,6 +45,5 @@
4545
'keras',
4646
'tqdm',
4747
'gym',
48-
'DRL',
4948
],
5049
)

0 commit comments

Comments
 (0)