Merge branch 'main' of http://140.206.38.58:8181/esea_info/viper

3 years ago · f151b99924
parent 1833d2c6c2 4a5238c08d
commit f151b99924
23 changed files with 14 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+/__pycache__/
+/dist/
+/build/
+/*/__pycache__
+*.log
--- a/README.md
+++ b/README.md
@ -0,0 +1,7 @@
+## Readme
+
+## issue
+
+
+## bug fix
+2023-04-11 修改 .gitignore
--- a/pycache/configuration.cpython-38.pyc
+++ b/pycache/configuration.cpython-38.pyc
--- a/pycache/dataplot.cpython-38.pyc
+++ b/pycache/dataplot.cpython-38.pyc
--- a/pycache/listctrl.cpython-38.pyc
+++ b/pycache/listctrl.cpython-38.pyc
--- a/pycache/myconfig.cpython-38.pyc
+++ b/pycache/myconfig.cpython-38.pyc
--- a/pycache/myexception.cpython-38.pyc
+++ b/pycache/myexception.cpython-38.pyc
--- a/pycache/mylogger.cpython-38.pyc
+++ b/pycache/mylogger.cpython-38.pyc
--- a/pycache/mypanel.cpython-38.pyc
+++ b/pycache/mypanel.cpython-38.pyc
--- a/pycache/mypath.cpython-38.pyc
+++ b/pycache/mypath.cpython-38.pyc
--- a/pycache/mythread.cpython-38.pyc
+++ b/pycache/mythread.cpython-38.pyc
--- a/pycache/readcal.cpython-38.pyc
+++ b/pycache/readcal.cpython-38.pyc
--- a/pycache/uart.cpython-38.pyc
+++ b/pycache/uart.cpython-38.pyc
--- a/pycache/viper.cpython-38.pyc
+++ b/pycache/viper.cpython-38.pyc
--- a/pycache/yiwinframe.cpython-38.pyc
+++ b/pycache/yiwinframe.cpython-38.pyc
--- a/myconfig.py
+++ b/myconfig.py
@ -12,8 +12,8 @@
 import yaml
 from enum import Enum
 from pathlib import Path
-VERSION     = "3.5.0"
-LASTDATE    = "2023-03-7"
+VERSION     = "3.6.0"
+LASTDATE    = "2023-04-11"
 COMPANY     = u"奕枫仪器"

 CURRENT_DIR         = Path()
--- a/uiconfig/pycache/ui_com_setting.cpython-38.pyc
+++ b/uiconfig/pycache/ui_com_setting.cpython-38.pyc
--- a/uiconfig/pycache/ui_filepath_setting.cpython-38.pyc
+++ b/uiconfig/pycache/ui_filepath_setting.cpython-38.pyc
--- a/uiconfig/pycache/ui_log_setting.cpython-38.pyc
+++ b/uiconfig/pycache/ui_log_setting.cpython-38.pyc
--- a/uiconfig/pycache/ui_pathsn_setting.cpython-38.pyc
+++ b/uiconfig/pycache/ui_pathsn_setting.cpython-38.pyc
--- a/uiconfig/pycache/ui_plot_setting.cpython-38.pyc
+++ b/uiconfig/pycache/ui_plot_setting.cpython-38.pyc
--- a/uiconfig/pycache/uiabout.cpython-38.pyc
+++ b/uiconfig/pycache/uiabout.cpython-38.pyc
--- a/uiconfig/pycache/uihelp.cpython-38.pyc
+++ b/uiconfig/pycache/uihelp.cpython-38.pyc