diff --git a/mainwindow.py b/mainwindow.py index 7a7e3ec..b0f28fc 100644 --- a/mainwindow.py +++ b/mainwindow.py @@ -667,16 +667,16 @@ class SocketClientApp(QMainWindow): self.status_bar.showMessage("状态: 数据绘制完成") # 速度有效值 - speed_rms_value = calc_vel_pass_rms(self.scaled_data, self.sampling_rate) + speed_rms_value = calc_vel_pass_rms(data_filter, self.sampling_rate) print("速度有效值:", round(speed_rms_value, 1)) # 速度峰值 - speed_vel_p = calc_vel_p(self.scaled_data, self.sampling_rate) + speed_vel_p = calc_vel_p(data_filter, self.sampling_rate) print("速度峰值:", round(speed_vel_p, 1)) # 加速度有效值 - acc_rms = calc_acc_rms(self.scaled_data, self.sampling_rate) + acc_rms = calc_acc_rms(data_filter, self.sampling_rate) print("加速度有效值:", round(acc_rms, 1)) # 加速度峰值 - acc_p = calc_acc_p(self.scaled_data, self.sampling_rate) + acc_p = calc_acc_p(data_filter, self.sampling_rate) print("加速度峰值:", round(acc_p, 1)) self.acceleration_label_rms.setText(f"加速度有效值:{round(acc_rms, 3)} m/s^2") self.acceleration_label_pp.setText(f"加速度峰值:{round(acc_p, 3)} m/s^2") diff --git a/mainwindow.spec b/mainwindow.spec index 33aacc8..2bef3dc 100644 --- a/mainwindow.spec +++ b/mainwindow.spec @@ -1,9 +1,6 @@ # -*- mode: python ; coding: utf-8 -*- -block_cipher = None - - a = Analysis( ['mainwindow.py'], pathex=[], @@ -14,18 +11,15 @@ a = Analysis( hooksconfig={}, runtime_hooks=[], excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, noarchive=False, + optimize=0, ) -pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) +pyz = PYZ(a.pure) exe = EXE( pyz, a.scripts, a.binaries, - a.zipfiles, a.datas, [], name='mainwindow', @@ -35,7 +29,7 @@ exe = EXE( upx=True, upx_exclude=[], runtime_tmpdir=None, - console=True, + console=False, disable_windowed_traceback=False, argv_emulation=False, target_arch=None,