Skip to content

Commit 9b33c24

Browse files
pangdulupangdulu
committed
update
1 parent 3c57764 commit 9b33c24

15 files changed

+97
-91
lines changed

‎geopytool/.idea/inspectionProfiles/Project_Default.xml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎geopytool/.idea/workspace.xml

+16-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎geopytool/BackTrace.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@ def create_main_frame(self):
213213
w=self.width()
214214
h=self.height()
215215

216-
#setFixedWidth(w/10)
216+
#setFixedWidth(int(w/10))
217217

218-
self.type_slider.setFixedWidth(w/10)
219-
self.standard_slider.setMinimumWidth(w/4)
220-
self.right_label.setMinimumWidth(w/10)
221-
self.item_left_label.setFixedWidth(w/10)
218+
self.type_slider.setFixedWidth(int(w/10))
219+
self.standard_slider.setMinimumWidth(int(w/4))
220+
self.right_label.setMinimumWidth(int(w/10))
221+
self.item_left_label.setFixedWidth(int(w/10))
222222

223223

224224

‎geopytool/CustomClass.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version="0.9.22.0.001"
1+
version="0.9.23.0.001"
22

3-
date = '2022-7-5'
3+
date = '2023-2-28'
44

55
dpi = 64
66
# coding:utf-8

‎geopytool/ImportDependence.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@
9292

9393

9494
from sklearn import mixture
95-
import keras
96-
from keras.layers import Conv1D, Flatten, Dense, Dropout, Input, Activation, Reshape
97-
from keras.models import Model,Sequential
98-
from keras.datasets import mnist
99-
# from keras.layers.advanced_activations import LeakyReLU
100-
from keras.layers import LeakyReLU
95+
import tensorflow.keras as keras
96+
from tensorflow.keras.layers import Conv1D, Flatten, Dense, Dropout, Input, Activation, Reshape
97+
from tensorflow.keras.models import Model,Sequential
98+
from tensorflow.keras.datasets import mnist
99+
# from tensorflow.keras.layers.advanced_activations import LeakyReLU
100+
from tensorflow.keras.layers import LeakyReLU
101101
from tqdm import tqdm_notebook as tqdm # 进度条
102102

103103
import tensorflow as tf
104104

105-
from keras.layers import Input, Dense, Lambda, concatenate
106-
from keras.models import Model
107-
# from keras.optimizers import Adam
105+
from tensorflow.keras.layers import Input, Dense, Lambda, concatenate
106+
from tensorflow.keras.models import Model
107+
# from tensorflow.keras.optimizers import Adam
108108
from tensorflow.keras.optimizers import SGD, Adam
109109
import keras.backend as K
110110

@@ -116,8 +116,8 @@
116116
import numpy as np
117117
import tensorflow as tf
118118

119-
from keras.layers import Input, Dense, Lambda, concatenate
120-
from keras.models import Model
119+
from tensorflow.keras.layers import Input, Dense, Lambda, concatenate
120+
from tensorflow.keras.models import Model
121121
import keras.backend as K
122122

123123

‎geopytool/OldTrace.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ def create_main_frame(self):
212212
w=self.width()
213213
h=self.height()
214214

215-
#setFixedWidth(w/10)
215+
#setFixedWidth(int(w/10))
216216

217-
self.type_slider.setFixedWidth(w/10)
218-
self.standard_slider.setMinimumWidth(w/4)
219-
self.right_label.setMinimumWidth(w/10)
220-
self.item_left_label.setFixedWidth(w/10)
217+
self.type_slider.setFixedWidth(int(w/10))
218+
self.standard_slider.setMinimumWidth(int(w/4))
219+
self.right_label.setMinimumWidth(int(w/10))
220+
self.item_left_label.setFixedWidth(int(w/10))
221221

222222

223223

‎geopytool/QAPF.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -447,11 +447,11 @@ def create_main_frame(self):
447447
w=self.width()
448448
h=self.height()
449449

450-
#setFixedWidth(w/10)
450+
#setFixedWidth(int(w/10))
451451

452-
self.slider.setMinimumWidth(w/10)
453-
self.slider_left_label.setMinimumWidth(w/10)
454-
self.slider_right_label.setMinimumWidth(w/10)
452+
self.slider.setMinimumWidth(int(w/10))
453+
self.slider_left_label.setMinimumWidth(int(w/10))
454+
self.slider_right_label.setMinimumWidth(int(w/10))
455455

456456

457457
def QAPF(self):
@@ -1025,4 +1025,4 @@ def Explain(self):
10251025
# self.OutPutData = self.OutPutData.set_index('Label')
10261026

10271027
self.tablepop = TableViewer(df=self.OutPutData, title='QPAF Result')
1028-
self.tablepop.show()
1028+
self.tablepop.show()

‎geopytool/REE.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ def create_main_frame(self):
240240
w=self.width()
241241
h=self.height()
242242

243-
#setFixedWidth(w/10)
243+
#setFixedWidth(int(w/10))
244244

245-
self.standard_slider.setMinimumWidth(w/4)
246-
self.standard_right_label.setFixedWidth(w/2)
247-
self.item_left_label.setMinimumWidth(w/4)
245+
self.standard_slider.setMinimumWidth(int(w/4))
246+
self.standard_right_label.setFixedWidth(int(w/2))
247+
self.item_left_label.setMinimumWidth(int(w/4))
248248
#self.item_left_label.setMinimumWidth(w/5)
249249

250-
self.item_left_label.setFixedWidth(w/10)
250+
self.item_left_label.setFixedWidth(int(w/10))
251251

252252
def REE(self, Left=0, Right=16, X0=1, X1=15, X_Gap=15, Base=-1,
253253
Top=6, Y0=-1,

‎geopytool/Saccani.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def create_main_frame(self):
118118
w=self.width()
119119
h=self.height()
120120

121-
self.standard_slider.setMinimumWidth(w/4)
122-
self.right_label.setMinimumWidth(w/10)
121+
self.standard_slider.setMinimumWidth(int(w/4))
122+
self.right_label.setMinimumWidth(int(w/10))
123123

124124

125125
def Saccani(self):

‎geopytool/Stereo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ def create_main_frame(self):
106106
w=self.width()
107107
h=self.height()
108108

109-
self.shape_slider.setFixedWidth(w/20)
110-
self.type_slider.setFixedWidth(w/20)
109+
self.shape_slider.setFixedWidth(int(w/20))
110+
self.type_slider.setFixedWidth(int(w/20))
111111

112112

113113

‎geopytool/TAS.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ def create_main_frame(self):
201201
h=self.height()
202202

203203

204-
self.slider_left_label.setFixedWidth(w/10)
204+
self.slider_left_label.setFixedWidth(int(w/10))
205205

206-
self.slider.setFixedWidth(w/10)
206+
self.slider.setFixedWidth(int(w/10))
207207

208-
self.slider_right_label.setFixedWidth(w/10)
208+
self.slider_right_label.setFixedWidth(int(w/10))
209209

210210
def Irvine(self,x, a = 39.0, b = 3.9492, c = -2.1111, d = 0.86096, e = -0.15188, f = 0.012030, g = -(3.3539 / 10000)):
211211

‎geopytool/Trace.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ def create_main_frame(self):
212212
w=self.width()
213213
h=self.height()
214214

215-
#setFixedWidth(w/10)
215+
#setFixedWidth(int(w/10))
216216

217-
self.type_slider.setFixedWidth(w/10)
218-
self.standard_slider.setMinimumWidth(w/4)
219-
self.right_label.setMinimumWidth(w/10)
220-
self.item_left_label.setFixedWidth(w/10)
217+
self.type_slider.setFixedWidth(int(w/10))
218+
self.standard_slider.setMinimumWidth(int(w/4))
219+
self.right_label.setMinimumWidth(int(w/10))
220+
self.item_left_label.setFixedWidth(int(w/10))
221221

222222

223223

‎geopytool/TraceNew.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@ def create_main_frame(self):
213213
w=self.width()
214214
h=self.height()
215215

216-
#setFixedWidth(w/10)
216+
#setFixedWidth(int(w/10))
217217

218-
self.type_slider.setFixedWidth(w/10)
219-
self.standard_slider.setMinimumWidth(w/4)
220-
self.right_label.setMinimumWidth(w/10)
221-
self.item_left_label.setFixedWidth(w/10)
218+
self.type_slider.setFixedWidth(int(w/10))
219+
self.standard_slider.setMinimumWidth(int(w/4))
220+
self.right_label.setMinimumWidth(int(w/10))
221+
self.item_left_label.setFixedWidth(int(w/10))
222222

223223

224224

‎geopytool/XY.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def create_main_frame(self):
398398
w=self.width()
399399
h=self.height()
400400

401-
#self.load_data_button.setFixedWidth(w/4)
401+
#self.load_data_button.setFixedWidth(int(w/4))
402402

403403

404404
self.kernel_select = QSlider(Qt.Horizontal)
@@ -473,45 +473,45 @@ def create_main_frame(self):
473473
w=self.width()
474474
h=self.height()
475475

476-
self.x_seter.setFixedWidth(w/10)
477-
self.y_seter.setFixedWidth(w/10)
476+
self.x_seter.setFixedWidth(int(w/10))
477+
self.y_seter.setFixedWidth(int(w/10))
478478

479-
self.x_multiplier.setFixedWidth(w/10)
480-
self.y_multiplier.setFixedWidth(w/10)
479+
self.x_multiplier.setFixedWidth(int(w/10))
480+
self.y_multiplier.setFixedWidth(int(w/10))
481481

482482

483483
'''
484-
self.save_plot_button.setFixedWidth(w/10)
485-
self.stat_button.setFixedWidth(w/10)
486-
self.load_data_button.setFixedWidth(w/4)
487-
self.save_predict_button_selected.setFixedWidth(w/4)
488-
self.save_predict_button.setFixedWidth(w/4)
484+
self.save_plot_button.setFixedWidth(int(w/10))
485+
self.stat_button.setFixedWidth(int(w/10))
486+
self.load_data_button.setFixedWidth(int(w/4))
487+
self.save_predict_button_selected.setFixedWidth(int(w/4))
488+
self.save_predict_button.setFixedWidth(int(w/4))
489489
'''
490490

491491
self.standard_slider.setFixedWidth(w/5)
492492

493493
self.right_label.setFixedWidth(w/5)
494494

495-
self.fit_seter.setFixedWidth(w/20)
495+
self.fit_seter.setFixedWidth(int(w/20))
496496

497497
self.load_img_button.setFixedWidth(w/5)
498498
self.unload_img_button.setFixedWidth(w/5)
499499

500-
self.width_size_seter_label.setFixedWidth(w/10)
501-
self.height_size_seter_label.setFixedWidth(w/10)
500+
self.width_size_seter_label.setFixedWidth(int(w/10))
501+
self.height_size_seter_label.setFixedWidth(int(w/10))
502502

503-
self.width_size_seter.setMinimumWidth(w/20)
504-
self.height_size_seter.setMinimumWidth(w/20)
503+
self.width_size_seter.setMinimumWidth(int(w/20))
504+
self.height_size_seter.setMinimumWidth(int(w/20))
505505

506-
self.Right_size_seter_label.setFixedWidth(w/10)
507-
self.Left_size_seter_label.setFixedWidth(w/10)
508-
self.Up_size_seter_label.setFixedWidth(w/10)
509-
self.Down_size_seter_label.setFixedWidth(w/10)
506+
self.Right_size_seter_label.setFixedWidth(int(w/10))
507+
self.Left_size_seter_label.setFixedWidth(int(w/10))
508+
self.Up_size_seter_label.setFixedWidth(int(w/10))
509+
self.Down_size_seter_label.setFixedWidth(int(w/10))
510510

511-
self.Right_size_seter.setFixedWidth(w/20)
512-
self.Left_size_seter.setFixedWidth(w/20)
513-
self.Up_size_seter.setFixedWidth(w/20)
514-
self.Down_size_seter.setFixedWidth(w/20)
511+
self.Right_size_seter.setFixedWidth(int(w/20))
512+
self.Left_size_seter.setFixedWidth(int(w/20))
513+
self.Up_size_seter.setFixedWidth(int(w/20))
514+
self.Down_size_seter.setFixedWidth(int(w/20))
515515

516516

517517
def loadDataToTest(self):

‎geopytool/XYZ.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -484,13 +484,13 @@ def create_main_frame(self):
484484

485485
w=self.width()
486486
h=self.height()
487-
self.x_seter.setFixedWidth(w/10)
488-
self.y_seter.setFixedWidth(w/10)
489-
self.z_seter.setFixedWidth(w/10)
487+
self.x_seter.setFixedWidth(int(w/10))
488+
self.y_seter.setFixedWidth(int(w/10))
489+
self.z_seter.setFixedWidth(int(w/10))
490490

491-
self.x_multiplier.setFixedWidth(w/10)
492-
self.y_multiplier.setFixedWidth(w/10)
493-
self.z_multiplier.setFixedWidth(w/10)
491+
self.x_multiplier.setFixedWidth(int(w/10))
492+
self.y_multiplier.setFixedWidth(int(w/10))
493+
self.z_multiplier.setFixedWidth(int(w/10))
494494

495495

496496
#self.standard_slider.setMinimumWidth(w/5)

0 commit comments

Comments
 (0)