diff --git a/python_gui/可执行文件_main/.idea/inspectionProfiles/profiles_settings.xml b/python_gui/可执行文件_main/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/python_gui/可执行文件_main/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/.idea/misc.xml b/python_gui/可执行文件_main/.idea/misc.xml deleted file mode 100644 index a2e120d..0000000 --- a/python_gui/可执行文件_main/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/.idea/modules.xml b/python_gui/可执行文件_main/.idea/modules.xml deleted file mode 100644 index 9a6f1f9..0000000 --- a/python_gui/可执行文件_main/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/.idea/vcs.xml b/python_gui/可执行文件_main/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/python_gui/可执行文件_main/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/.idea/workspace.xml b/python_gui/可执行文件_main/.idea/workspace.xml deleted file mode 100644 index 8141142..0000000 --- a/python_gui/可执行文件_main/.idea/workspace.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 1646222955974 - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/.idea/可执行文件_main.iml b/python_gui/可执行文件_main/.idea/可执行文件_main.iml deleted file mode 100644 index d0876a7..0000000 --- a/python_gui/可执行文件_main/.idea/可执行文件_main.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/python_gui/可执行文件_main/MSVCP140.dll b/python_gui/可执行文件_main/MSVCP140.dll index 21794fc..654233d 100644 Binary files a/python_gui/可执行文件_main/MSVCP140.dll and b/python_gui/可执行文件_main/MSVCP140.dll differ diff --git a/python_gui/可执行文件_main/PyQt5/QtCore.pyd b/python_gui/可执行文件_main/PyQt5/QtCore.pyd index 749c50d..9385e15 100644 Binary files a/python_gui/可执行文件_main/PyQt5/QtCore.pyd and b/python_gui/可执行文件_main/PyQt5/QtCore.pyd differ diff --git a/python_gui/可执行文件_main/PyQt5/QtGui.pyd b/python_gui/可执行文件_main/PyQt5/QtGui.pyd index 70dc5f4..269785c 100644 Binary files a/python_gui/可执行文件_main/PyQt5/QtGui.pyd and b/python_gui/可执行文件_main/PyQt5/QtGui.pyd differ diff --git a/python_gui/可执行文件_main/PyQt5/QtSvg.pyd b/python_gui/可执行文件_main/PyQt5/QtSvg.pyd index 7e88162..9e4d4b3 100644 Binary files a/python_gui/可执行文件_main/PyQt5/QtSvg.pyd and b/python_gui/可执行文件_main/PyQt5/QtSvg.pyd differ diff --git a/python_gui/可执行文件_main/PyQt5/QtTest.pyd b/python_gui/可执行文件_main/PyQt5/QtTest.pyd index 81f53cd..257ef22 100644 Binary files a/python_gui/可执行文件_main/PyQt5/QtTest.pyd and b/python_gui/可执行文件_main/PyQt5/QtTest.pyd differ diff --git a/python_gui/可执行文件_main/PyQt5/QtWidgets.pyd b/python_gui/可执行文件_main/PyQt5/QtWidgets.pyd index 44bde27..e8da75e 100644 Binary files a/python_gui/可执行文件_main/PyQt5/QtWidgets.pyd and b/python_gui/可执行文件_main/PyQt5/QtWidgets.pyd differ diff --git a/python_gui/可执行文件_main/PyQt5/sip.cp37-win_amd64.pyd b/python_gui/可执行文件_main/PyQt5/sip.cp37-win_amd64.pyd index 64c5938..8bb3f59 100644 Binary files a/python_gui/可执行文件_main/PyQt5/sip.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/PyQt5/sip.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/VCRUNTIME140_1.dll b/python_gui/可执行文件_main/VCRUNTIME140_1.dll index f12cb6f..e548262 100644 Binary files a/python_gui/可执行文件_main/VCRUNTIME140_1.dll and b/python_gui/可执行文件_main/VCRUNTIME140_1.dll differ diff --git a/python_gui/可执行文件_main/base_library.zip b/python_gui/可执行文件_main/base_library.zip index 98c7eed..07ead0e 100644 Binary files a/python_gui/可执行文件_main/base_library.zip and b/python_gui/可执行文件_main/base_library.zip differ diff --git a/python_gui/可执行文件_main/libopenblas.XWYDX2IKJW2NMTWSFYNGFUWKQU3LYTCZ.gfortran-win_amd64.dll b/python_gui/可执行文件_main/libopenblas.XWYDX2IKJW2NMTWSFYNGFUWKQU3LYTCZ.gfortran-win_amd64.dll index d6c9715..9201fc4 100644 Binary files a/python_gui/可执行文件_main/libopenblas.XWYDX2IKJW2NMTWSFYNGFUWKQU3LYTCZ.gfortran-win_amd64.dll and b/python_gui/可执行文件_main/libopenblas.XWYDX2IKJW2NMTWSFYNGFUWKQU3LYTCZ.gfortran-win_amd64.dll differ diff --git a/python_gui/可执行文件_main/main.exe b/python_gui/可执行文件_main/main.exe index 0c33218..29bbab7 100644 Binary files a/python_gui/可执行文件_main/main.exe and b/python_gui/可执行文件_main/main.exe differ diff --git a/python_gui/可执行文件_main/numpy/core/_multiarray_tests.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/core/_multiarray_tests.cp37-win_amd64.pyd index 3458097..fc9392b 100644 Binary files a/python_gui/可执行文件_main/numpy/core/_multiarray_tests.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/core/_multiarray_tests.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/core/_multiarray_umath.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/core/_multiarray_umath.cp37-win_amd64.pyd index 601f4e8..1c5d802 100644 Binary files a/python_gui/可执行文件_main/numpy/core/_multiarray_umath.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/core/_multiarray_umath.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/fft/_pocketfft_internal.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/fft/_pocketfft_internal.cp37-win_amd64.pyd index ce11c4a..ebf5d49 100644 Binary files a/python_gui/可执行文件_main/numpy/fft/_pocketfft_internal.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/fft/_pocketfft_internal.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/linalg/_umath_linalg.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/linalg/_umath_linalg.cp37-win_amd64.pyd index b6b6ce0..94108d5 100644 Binary files a/python_gui/可执行文件_main/numpy/linalg/_umath_linalg.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/linalg/_umath_linalg.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/linalg/lapack_lite.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/linalg/lapack_lite.cp37-win_amd64.pyd index 9cf35f7..9ca89ca 100644 Binary files a/python_gui/可执行文件_main/numpy/linalg/lapack_lite.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/linalg/lapack_lite.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_bounded_integers.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_bounded_integers.cp37-win_amd64.pyd index c306c82..ab7e15d 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_bounded_integers.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_bounded_integers.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_common.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_common.cp37-win_amd64.pyd index 6a989aa..711b32a 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_common.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_common.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_generator.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_generator.cp37-win_amd64.pyd index de8f057..385ad4b 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_generator.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_generator.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_mt19937.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_mt19937.cp37-win_amd64.pyd index dce3ffd..e45ab5c 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_mt19937.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_mt19937.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_pcg64.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_pcg64.cp37-win_amd64.pyd index 863579d..26efb54 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_pcg64.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_pcg64.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_philox.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_philox.cp37-win_amd64.pyd index 3a70200..084e882 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_philox.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_philox.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/_sfc64.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/_sfc64.cp37-win_amd64.pyd index 8b583ff..4848684 100644 Binary files a/python_gui/可执行文件_main/numpy/random/_sfc64.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/_sfc64.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/bit_generator.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/bit_generator.cp37-win_amd64.pyd index 1a81335..3fe2a5d 100644 Binary files a/python_gui/可执行文件_main/numpy/random/bit_generator.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/bit_generator.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/numpy/random/mtrand.cp37-win_amd64.pyd b/python_gui/可执行文件_main/numpy/random/mtrand.cp37-win_amd64.pyd index bac4d5c..06a44cc 100644 Binary files a/python_gui/可执行文件_main/numpy/random/mtrand.cp37-win_amd64.pyd and b/python_gui/可执行文件_main/numpy/random/mtrand.cp37-win_amd64.pyd differ diff --git a/python_gui/可执行文件_main/pip-20.1.1.dist-info/RECORD b/python_gui/可执行文件_main/pip-20.1.1.dist-info/RECORD index b049b03..e601d9a 100644 --- a/python_gui/可执行文件_main/pip-20.1.1.dist-info/RECORD +++ b/python_gui/可执行文件_main/pip-20.1.1.dist-info/RECORD @@ -1,6 +1,6 @@ -../../Scripts/pip.exe,sha256=vp3p4TBez0JYw_N4ePfsFLvdZ0P-YVYyCTqYchYhI74,106374 -../../Scripts/pip3.7.exe,sha256=vp3p4TBez0JYw_N4ePfsFLvdZ0P-YVYyCTqYchYhI74,106374 -../../Scripts/pip3.exe,sha256=vp3p4TBez0JYw_N4ePfsFLvdZ0P-YVYyCTqYchYhI74,106374 +../../Scripts/pip.exe,sha256=6onY8CNGNVvEyh3_Kam1K41EPQq2YStUBMfwWjyqZRE,106374 +../../Scripts/pip3.7.exe,sha256=6onY8CNGNVvEyh3_Kam1K41EPQq2YStUBMfwWjyqZRE,106374 +../../Scripts/pip3.exe,sha256=6onY8CNGNVvEyh3_Kam1K41EPQq2YStUBMfwWjyqZRE,106374 pip-20.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 pip-20.1.1.dist-info/LICENSE.txt,sha256=W6Ifuwlk-TatfRU2LR7W1JMcyMj5_y1NkRkOEJvnRDE,1090 pip-20.1.1.dist-info/METADATA,sha256=dwRFheMvgIBpyZllM4tVlf5TfjoXc1ZxlsJf0ze61_M,3634 diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/COPYING.txt b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/COPYING.txt similarity index 100% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/COPYING.txt rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/COPYING.txt diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/INSTALLER b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/INSTALLER similarity index 100% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/INSTALLER rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/INSTALLER diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/METADATA b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/METADATA similarity index 96% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/METADATA rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/METADATA index d6f0fee..729ca0b 100644 --- a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/METADATA +++ b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyinstaller -Version: 4.7 +Version: 4.10 Summary: PyInstaller bundles a Python application and all its dependencies into a single package. Home-page: http://www.pyinstaller.org/ Author: Hartmut Goebel, Giovanni Bajo, David Vierra, David Cortesi, Martin Zibricky @@ -40,6 +40,7 @@ Classifier: Topic :: System :: Software Distribution Classifier: Topic :: Utilities Requires-Python: <3.11,>=3.6 Description-Content-Type: text/x-rst +License-File: COPYING.txt Requires-Dist: setuptools Requires-Dist: altgraph Requires-Dist: pyinstaller-hooks-contrib (>=2020.6) @@ -61,7 +62,7 @@ PyInstaller bundles a Python application and all its dependencies into a single package. The user can run the packaged app without installing a Python interpreter or any modules. -:Documentation: https://pyinstaller.readthedocs.io/ +:Documentation: https://pyinstaller.readthedocs.io/en/v4.10 :Website: http://www.pyinstaller.org/ :Code: https://github.com/pyinstaller/pyinstaller @@ -120,7 +121,7 @@ Requirements and Tested Platforms - Support for Python installed from the Windows store without using virtual environments requires PyInstaller 4.4 or later. - + - GNU/Linux (32bit/64bit) - ldd: Console application to print the shared libraries required @@ -175,14 +176,14 @@ enhancements on these are welcome. Before using any contributed platform, you need to build the PyInstaller bootloader, as we do not ship binary packages. Download PyInstaller source, and build the bootloader:: - + cd bootloader python ./waf all Then install PyInstaller:: python setup.py install - + or simply use it directly from the source (pyinstaller.py). @@ -201,7 +202,7 @@ in the `Changelog`_ section of the manual. .. _tinyaes: https://github.com/naufraghi/tinyaes-py -.. _`manual`: https://pyinstaller.readthedocs.io/en/v4.7/ -.. _`Changelog`: https://pyinstaller.readthedocs.io/en/v4.7/CHANGES.html +.. _`manual`: https://pyinstaller.readthedocs.io/en/v4.10/ +.. _`Changelog`: https://pyinstaller.readthedocs.io/en/v4.10/CHANGES.html diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/RECORD b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/RECORD similarity index 89% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/RECORD rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/RECORD index 1f38db8..a565b9f 100644 --- a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/RECORD +++ b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/RECORD @@ -1,10 +1,10 @@ -../Scripts/pyi-archive_viewer.exe,sha256=jS16fPmuNIOJpz_Z0Tteau-gY9xdlYmgEfehtT5uinU,106391 -../Scripts/pyi-bindepend.exe,sha256=d3WfPrp28N_EAjelnAKkDCfG5EtD-OCozv31-vi72V8,106386 -../Scripts/pyi-grab_version.exe,sha256=cXB7rb_-kLkTIQb5GClzS3BbQxe_C-ERg74FwALioA0,106389 -../Scripts/pyi-makespec.exe,sha256=bf1oJXrwq9ClP6G9nsFU0RnVlWAX-kIVfrOpbQNftpc,106385 -../Scripts/pyi-set_version.exe,sha256=Dng5e3NbxdZZgXqQjtvsKT_UqLShpiSLjqBkurqRIes,106388 -../Scripts/pyinstaller.exe,sha256=nI3ZdhQILAfzWf_Ve2i8ByZfLKKK-CgKJjfVE7n8k60,106370 -PyInstaller/__init__.py,sha256=06e1GnGNJKgI_DNQJUnM4L3Ibey6PBj3qUzgevsYc4E,2995 +../../Scripts/pyi-archive_viewer.exe,sha256=GDjb7-WUon-pebhvyl_xCWNqYvfMmxNKpujEz0HgV6U,106391 +../../Scripts/pyi-bindepend.exe,sha256=h4Dli_6lZIH7mXxeIz_xE7At4E1PqAe2gL6Un3-Dm6E,106386 +../../Scripts/pyi-grab_version.exe,sha256=eZOld7N2mfE7QRcWSwIDPM8cNi5RfNqg_guVIYhJTSQ,106389 +../../Scripts/pyi-makespec.exe,sha256=e50peIeYroSJVsyjPjkZMkyB9q76gBSwWdbzfT-g-RA,106385 +../../Scripts/pyi-set_version.exe,sha256=zpc510s2sGjVIJNg3jAfG33ZmKAQH6BG-L5wixKkSQQ,106388 +../../Scripts/pyinstaller.exe,sha256=AFkBlKct3WvyubA5zkgTBWxmeZjjwtZddcCSy97jaYg,106370 +PyInstaller/__init__.py,sha256=Df31EZBz3rczQNV-0spwbwtcaxQy2ZyizIC4SPN5dbs,2996 PyInstaller/__main__.py,sha256=z5FJKeUWmlAhAukF--sDK-etA_qtJtoG0HEqVsU03PY,4458 PyInstaller/__pycache__/__init__.cpython-37.pyc,, PyInstaller/__pycache__/__main__.cpython-37.pyc,, @@ -15,9 +15,8 @@ PyInstaller/__pycache__/config.cpython-37.pyc,, PyInstaller/__pycache__/configure.cpython-37.pyc,, PyInstaller/__pycache__/exceptions.cpython-37.pyc,, PyInstaller/__pycache__/log.cpython-37.pyc,, -PyInstaller/__pycache__/old__main__.cpython-37.pyc,, PyInstaller/_recursion_to_deep_message.py,sha256=lpHaIOb1Eaus0lUUbl_l-r9M6GHoPm4TeJvotCm7qnU,1821 -PyInstaller/_shared_with_waf.py,sha256=oRTRfFCFB3ueSLkBhmInuDsCUIC3DPO3DcbgdSiPry4,3681 +PyInstaller/_shared_with_waf.py,sha256=DEZ0Y_ScwrF9hU-fHbrZyyNxdacEMuz0pSD_BXYl6H4,3955 PyInstaller/archive/__init__.py,sha256=fNGhsx0m5s9iq4yMvH6J1tI0vzUKWd62lIQNSnKTGCE,22 PyInstaller/archive/__pycache__/__init__.cpython-37.pyc,, PyInstaller/archive/__pycache__/pyz_crypto.cpython-37.pyc,, @@ -26,10 +25,10 @@ PyInstaller/archive/__pycache__/writers.cpython-37.pyc,, PyInstaller/archive/pyz_crypto.py,sha256=uGRgilWcIhxDfFcbHUrgTmaWrWtrP1pNqjBKFiZGn4c,1311 PyInstaller/archive/readers.py,sha256=HVUooABiG4Mceq6ahh9hVPFVDukD94805XGg9TDHRks,8191 PyInstaller/archive/writers.py,sha256=ffk9lp7pdGVjXiSscDGk9_2lMAOsCvMuD5J3FPfwpJc,23688 -PyInstaller/bootloader/Windows-64bit/run.exe,sha256=ZMjGCjXZnNGX0-lO42Pru1yx1pgyf_tSN5dJuZJnSYk,250880 -PyInstaller/bootloader/Windows-64bit/run_d.exe,sha256=IkAVBX3BS0LVOeyrbAw_EYi3oR5xtnRmjNFhpbBNiaE,255488 -PyInstaller/bootloader/Windows-64bit/runw.exe,sha256=TIbdsmZaeAXh4pC-C1SaHVhf3LSbU5EYhWkBpO7gZF0,251392 -PyInstaller/bootloader/Windows-64bit/runw_d.exe,sha256=nLnn_XhMHUFJIHizX9zYpD_IGoKaVQqnsbKxs2LyOw8,256512 +PyInstaller/bootloader/Windows-64bit/run.exe,sha256=gFkWvGodn4K8vuCuXIUDcwXlyEJDrwUrhtmmbOtjnVw,230912 +PyInstaller/bootloader/Windows-64bit/run_d.exe,sha256=Zlk5LnSVdacWOmaWwsU4LSho7fybIiLZPmvDk4XvxV4,235520 +PyInstaller/bootloader/Windows-64bit/runw.exe,sha256=uLOuYdzDiRyR0BVC9omrOw4ZHAvS02WT28Z3tDFuQg0,231424 +PyInstaller/bootloader/Windows-64bit/runw_d.exe,sha256=FhzgEC0FAh7Ma0iQhba3PNEZ1HY5WZFGoaK1uLyclHs,237056 PyInstaller/bootloader/images/github_logo.png,sha256=imO7TMwvLWqjXQOv6VYGyQ5AIMOoGN4HG_uXPrKR5fo,266950 PyInstaller/bootloader/images/icon-console.icns,sha256=TrztrfQbL3yp6yZbQm1p-IV8XXZSOjTtl8sH-cXybpI,106001 PyInstaller/bootloader/images/icon-console.ico,sha256=aALW1IOexhlTRN7sYcLc9gIWH52Xsk9ic3kEaehHets,59521 @@ -49,17 +48,17 @@ PyInstaller/building/__pycache__/splash_templates.cpython-37.pyc,, PyInstaller/building/__pycache__/templates.cpython-37.pyc,, PyInstaller/building/__pycache__/toc_conversion.cpython-37.pyc,, PyInstaller/building/__pycache__/utils.cpython-37.pyc,, -PyInstaller/building/api.py,sha256=p3jJazIlqmqsWjFv3B6FJtOAXeXRWZp8ZVQgePamGUA,46078 -PyInstaller/building/build_main.py,sha256=_Cf3L6WVKQGc0KeVOVNqd0B6L5-9s2VF0V08KlAXF24,34577 +PyInstaller/building/api.py,sha256=MyqgtfBLPtXRU_HlofZiXoRNWEDbilPPDy1qXaE_F9c,47928 +PyInstaller/building/build_main.py,sha256=6IjC7i20QzvFp43B8O0Zd1cdA1mCQHqQJGQ3FDCMGW0,35217 PyInstaller/building/datastruct.py,sha256=T6jHSR9Vz7_s8pLTH6fgAPQx6SYSsziJnTIFGG650zc,10269 -PyInstaller/building/makespec.py,sha256=uLmfCMhD_CYCP-tjvXMoorlljYj3M_hqnWEQLxwBjNg,31210 -PyInstaller/building/osx.py,sha256=lJV_Tjk-Kc7dn_uF0TcP7_17gFNeLYQxBvDe3iiuFyU,11847 +PyInstaller/building/makespec.py,sha256=y0RQlljceu4btDr3PKcuvRJsl_tmMehbkAGj5UkAJ9o,31181 +PyInstaller/building/osx.py,sha256=75gAbcUMEI3pBcXrJf26jbNvUiLEgC9lSwqHA3DDMEM,11913 PyInstaller/building/splash.py,sha256=okn42J_-9gGhi8xlO0Pq2QxOi1ST7DJMeQuL3Qbm9-E,21124 PyInstaller/building/splash_templates.py,sha256=7RYU_qP8pmaVQXYbkk4zV1iT-e7Z_C80c6e4uuBOdcA,6311 PyInstaller/building/templates.py,sha256=iymTORu_p1TFlW_R2y23QTyuUAvlEGHEmT9qBa4jVVQ,4103 PyInstaller/building/toc_conversion.py,sha256=EimXJD5JXsEVhYXYDraM5T-cU6ai_3kRdxpvRjB9plc,6962 -PyInstaller/building/utils.py,sha256=6gs2STcU03Scipa-jfdMAp5LnKkIznKQFHKyqdcXb4w,29973 -PyInstaller/compat.py,sha256=TZQiN8pu_OIfAH_iJD671FLCxbbdpZpJuRttGqEMiI4,30466 +PyInstaller/building/utils.py,sha256=KQ5LF41I88jYpH-sbBIfs131HulB7PVVmDoV5fdRMws,31478 +PyInstaller/compat.py,sha256=wL3OdhsJ0hqPgd0I_Ky36erC10Aj83DyRS83j4YEEXQ,31822 PyInstaller/config.py,sha256=EdN0LH5ku9uEF9NUSZCxe3rUeoqKe1NDoAfxfqQWAOE,1727 PyInstaller/configure.py,sha256=Rfu9-oNUxZvTtvLjWrSu0DOi79iyfgB1Y9wnfR5yN38,3346 PyInstaller/depend/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2 @@ -72,9 +71,9 @@ PyInstaller/depend/__pycache__/imphook.cpython-37.pyc,, PyInstaller/depend/__pycache__/imphookapi.cpython-37.pyc,, PyInstaller/depend/__pycache__/utils.cpython-37.pyc,, PyInstaller/depend/analysis.py,sha256=GHpAfEEvl_C2EXQqPDtYUm3XYHjyFgl5j8Wn6SQk_Jk,40218 -PyInstaller/depend/bindepend.py,sha256=A0zZ00_6Cezbp1YIEHh7Qpw17OmUTaE4DDyGkwCfHy8,38394 +PyInstaller/depend/bindepend.py,sha256=nzxJbwf8peXlK4J7OhYByzET-vmwDhuDnq8NqcIk-DY,38651 PyInstaller/depend/bytecode.py,sha256=yf2CM2sU2ZIJNi5NoqwaT4ysWnQjbZH21U4IaHxXbe0,8901 -PyInstaller/depend/dylib.py,sha256=L5Bsl6lrVfiK4p3WGTLRoYDG9sEVAXwiL82oyQ3j9mg,12269 +PyInstaller/depend/dylib.py,sha256=TaFpMgCErLgqYWpyK_zI5Tdm4Z2zb-ZvY7yDbiPsbcw,13528 PyInstaller/depend/imphook.py,sha256=g9cFy_HmmTVZS-7gzR40zftNm19wRfn0ra8hUFKmxgo,26486 PyInstaller/depend/imphookapi.py,sha256=1LJAByvjU_Mabq3W0HccdN6c9afG7N2ipNWuCrN6yeg,19293 PyInstaller/depend/utils.py,sha256=8_RekkqrqU3FExc8UzVrs_vnSLkxVsu0takUH_AGa70,17469 @@ -95,6 +94,7 @@ PyInstaller/hooks/__pycache__/hook-PyQt5.QtGui.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtHelp.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtLocation.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtMultimedia.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PyQt5.QtMultimediaWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtNetwork.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtOpenGL.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt5.QtPositioning.cpython-37.pyc,, @@ -118,6 +118,8 @@ PyInstaller/hooks/__pycache__/hook-PyQt5.uic.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtCore.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtGui.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtHelp.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PyQt6.QtMultimedia.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PyQt6.QtMultimediaWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtNetwork.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtOpenGL.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtOpenGLWidgets.cpython-37.pyc,, @@ -128,6 +130,7 @@ PyInstaller/hooks/__pycache__/hook-PyQt6.QtQuickWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtSql.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtSvg.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtTest.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PyQt6.QtWebEngineWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.QtXml.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PyQt6.cpython-37.pyc,, @@ -137,6 +140,7 @@ PyInstaller/hooks/__pycache__/hook-PySide2.QtGui.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtHelp.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtLocation.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtMultimedia.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PySide2.QtMultimediaWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtNetwork.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtOpenGL.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide2.QtPositioning.cpython-37.pyc,, @@ -161,6 +165,8 @@ PyInstaller/hooks/__pycache__/hook-PySide2.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtCore.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtGui.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtHelp.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PySide6.QtMultimedia.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PySide6.QtMultimediaWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtNetwork.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtOpenGL.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtOpenGLWidgets.cpython-37.pyc,, @@ -172,6 +178,7 @@ PyInstaller/hooks/__pycache__/hook-PySide6.QtSql.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtSvg.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtTest.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtUiTools.cpython-37.pyc,, +PyInstaller/hooks/__pycache__/hook-PySide6.QtWebEngineWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtWidgets.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.QtXml.cpython-37.pyc,, PyInstaller/hooks/__pycache__/hook-PySide6.cpython-37.pyc,, @@ -267,13 +274,14 @@ PyInstaller/hooks/__pycache__/hook-zope.interface.cpython-37.pyc,, PyInstaller/hooks/hook-PIL.Image.py,sha256=DJpsZDXKIwM4xIcKMou3Khlm2EcEPTmeupS472m00Dk,845 PyInstaller/hooks/hook-PIL.ImageFilter.py,sha256=2QksTYzvBXENvZyr94EJP8MO4jFc1-2cYj1GEBzK1Qw,589 PyInstaller/hooks/hook-PIL.SpiderImagePlugin.py,sha256=MLdwD4XE9goIij012AoH6utYnsFJ-fIBX_40k37AyP4,773 -PyInstaller/hooks/hook-PIL.py,sha256=8LJoLfySOop5y2Aydm9VuKFKn6fKiaDcAKJ3MXWM9ZI,922 +PyInstaller/hooks/hook-PIL.py,sha256=PTrUTNLEhUsog8ddaVBLIEMtyUymEESoxPYMyVgVpys,1100 PyInstaller/hooks/hook-PyQt5.Qt.py,sha256=Y8SM5gNxWTOSasOjvJXlL3YChccSEmbGGcjRS0t6FYc,1274 PyInstaller/hooks/hook-PyQt5.QtCore.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtGui.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtHelp.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtLocation.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtMultimedia.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 +PyInstaller/hooks/hook-PyQt5.QtMultimediaWidgets.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtNetwork.py,sha256=FJanmXeglBbTjPuv2mHo_QkAT6EjZKMK3prizukoPNU,742 PyInstaller/hooks/hook-PyQt5.QtOpenGL.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PyQt5.QtPositioning.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 @@ -297,6 +305,8 @@ PyInstaller/hooks/hook-PyQt5.uic.py,sha256=eEOLacW29kPu3tyFDCSxd6Vu3Zyvl3DrhtSn_ PyInstaller/hooks/hook-PyQt6.QtCore.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtGui.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtHelp.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 +PyInstaller/hooks/hook-PyQt6.QtMultimedia.py,sha256=nwWBlCS3TCeaom2w_XkSg917qRu8xHvS5ZBPjS2BJrA,633 +PyInstaller/hooks/hook-PyQt6.QtMultimediaWidgets.py,sha256=nwWBlCS3TCeaom2w_XkSg917qRu8xHvS5ZBPjS2BJrA,633 PyInstaller/hooks/hook-PyQt6.QtNetwork.py,sha256=6VDbx2bvyr403K1LrHHDSTw-gbIYqQAUyFZWUCHixwI,737 PyInstaller/hooks/hook-PyQt6.QtOpenGL.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtOpenGLWidgets.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 @@ -307,6 +317,7 @@ PyInstaller/hooks/hook-PyQt6.QtQuickWidgets.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9n PyInstaller/hooks/hook-PyQt6.QtSql.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtSvg.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtTest.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 +PyInstaller/hooks/hook-PyQt6.QtWebEngineWidgets.py,sha256=KbIHaomXW2sBBZXOQmabdWJXwPj5Qtt3Rq6SrzPlYec,1407 PyInstaller/hooks/hook-PyQt6.QtWidgets.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.QtXml.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PyQt6.py,sha256=KYW9v8r-gJ18YymUOb8b9OQxSARqgNpje-3Dt-M_gJ8,889 @@ -315,7 +326,8 @@ PyInstaller/hooks/hook-PySide2.QtCore.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed PyInstaller/hooks/hook-PySide2.QtGui.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PySide2.QtHelp.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PySide2.QtLocation.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 -PyInstaller/hooks/hook-PySide2.QtMultimedia.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 +PyInstaller/hooks/hook-PySide2.QtMultimedia.py,sha256=VnVVJJnmHPw_zMyxObX_tbGbWzl5igFQdXztj5EiRAY,979 +PyInstaller/hooks/hook-PySide2.QtMultimediaWidgets.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PySide2.QtNetwork.py,sha256=HBQnSNEHuE2QQIjXcHb7Q85VTtPbNDpDSKZ-dUuGDBQ,746 PyInstaller/hooks/hook-PySide2.QtOpenGL.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 PyInstaller/hooks/hook-PySide2.QtPositioning.py,sha256=Ao_UCFL_0soshLvqHQ4GpoxMM8-2N8ed7kw3Wc49jPc,633 @@ -340,6 +352,8 @@ PyInstaller/hooks/hook-PySide2.py,sha256=0MZ4Pf2tnSU27fzjWdRSNbX-W-lJERFjJybYeWB PyInstaller/hooks/hook-PySide6.QtCore.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtGui.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtHelp.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 +PyInstaller/hooks/hook-PySide6.QtMultimedia.py,sha256=A9ehoUSMg3O-EelkQysuqHJj2eD3BvEx68mVPR_Fqp4,981 +PyInstaller/hooks/hook-PySide6.QtMultimediaWidgets.py,sha256=nwWBlCS3TCeaom2w_XkSg917qRu8xHvS5ZBPjS2BJrA,633 PyInstaller/hooks/hook-PySide6.QtNetwork.py,sha256=4C1fXy9jEIRqjiogdhxNuMuEmT4_nvyhqAnqGY1pITY,741 PyInstaller/hooks/hook-PySide6.QtOpenGL.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtOpenGLWidgets.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 @@ -351,6 +365,7 @@ PyInstaller/hooks/hook-PySide6.QtSql.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXN PyInstaller/hooks/hook-PySide6.QtSvg.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtTest.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtUiTools.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 +PyInstaller/hooks/hook-PySide6.QtWebEngineWidgets.py,sha256=J3vZdfWqRCo1WFMwhXFx-yx1GdU_SPKp_r9DaMH_14E,1417 PyInstaller/hooks/hook-PySide6.QtWidgets.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.QtXml.py,sha256=GLVPwOhw7r--8Hg-6hB6MlGY9nFBZzdXNBeINhoKcIM,628 PyInstaller/hooks/hook-PySide6.py,sha256=1FtHtj02tsrBay4V1XxgElt2udyBtF6c4EKDGGmF1DI,899 @@ -409,13 +424,13 @@ PyInstaller/hooks/hook-matplotlib.numerix.py,sha256=5Z_m_voOymHQ3PiAvKoIeId_a5ci PyInstaller/hooks/hook-matplotlib.py,sha256=LrULWoM3-rM-MJvmoJz9uiN6UILbD4tTcKP05nb28L4,774 PyInstaller/hooks/hook-multiprocessing.util.py,sha256=g0JrveuNWNmHCR1NPHX4AtCpf6qz6Qo0cQ_Yo6kLc18,791 PyInstaller/hooks/hook-numpy._pytesttester.py,sha256=cud1BLr7DfRpgeAiwWc2hzrsXxi6yC-6gjU8H90wboM,798 -PyInstaller/hooks/hook-numpy.py,sha256=z-lXspOX0dZt2b62j7NH9k54I2_MrYJB7IxMcKIUUuQ,2068 +PyInstaller/hooks/hook-numpy.py,sha256=zEGt50kqjZdPGMy149J0X7xmeb_XSv5zCN1fLG6ZWr8,2335 PyInstaller/hooks/hook-packaging.py,sha256=f7Y21Os6G6FcKMcDpKDpdaknMpVuXZxGY_TZ3C1j_Xg,577 PyInstaller/hooks/hook-pandas.io.formats.style.py,sha256=nhk9Yb_U1dzaU_Ge1d82VJ9hoy_3M7YRGhynxUFUfqs,746 PyInstaller/hooks/hook-pandas.plotting.py,sha256=k6H-jpOwYo4Au-1qk4J5hr_rAEMI8spnsjSV7xUbb9g,939 PyInstaller/hooks/hook-pandas.py,sha256=x6geZ6EGKcVMaG9hofh1jqGA40iUcrytoaIv76C2r9M,959 PyInstaller/hooks/hook-pickle.py,sha256=Vb6udoUdC6zE7bHI5qHneBHKHQUn5T3LdBRonS5XG9g,810 -PyInstaller/hooks/hook-pkg_resources.py,sha256=NATAKdUMCa6ioslRrIlbZGq1nwZjXMOC10ntLFtHdSs,1389 +PyInstaller/hooks/hook-pkg_resources.py,sha256=kIU3PO4jsH0RRjWTgIAxsjqyAuewTHLs5wC7yKnyF70,2607 PyInstaller/hooks/hook-pygments.py,sha256=_XLTuohQNt-l3XiytnsN3nZaAivyaRr1r70pBoWQEfM,1184 PyInstaller/hooks/hook-pytz.py,sha256=78P4DqSn4kpDorroP8ioXO2wbfPO1pszI-gLNNi1RbE,734 PyInstaller/hooks/hook-pytzdata.py,sha256=Zlm73U3KA97DUkvAEoTxMdubm4gU66wFQDdKbifzVQw,603 @@ -513,7 +528,7 @@ PyInstaller/hooks/pre_safe_import_module/hook-gi.repository.xlib.py,sha256=0bcEr PyInstaller/hooks/pre_safe_import_module/hook-setuptools.extern.six.moves.py,sha256=m2biQEt9iO1lHuYiUPAbP5kTu1MUCg8ZaI1xvBk02Mc,1693 PyInstaller/hooks/pre_safe_import_module/hook-six.moves.py,sha256=09qirxAxolmu6ViMKqHlh_tw7W90_w_AuOItXNDcK_E,3821 PyInstaller/hooks/pre_safe_import_module/hook-urllib3.packages.six.moves.py,sha256=nVclrjVFdAcwDkNjRmgUy_iBFtR_nUvluv3sm_WxdzY,1455 -PyInstaller/hooks/rthooks.dat,sha256=iXDwVgfCx6o-wVljpLr0-dLaMg4zRYmiP1LN3Q5tDZ0,1132 +PyInstaller/hooks/rthooks.dat,sha256=ysCyZ3QhEwBF8_miAo6gCIn6jezV_8KM086F51AP9sc,1307 PyInstaller/hooks/rthooks/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2 PyInstaller/hooks/rthooks/__pycache__/__init__.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth__tkinter.cpython-37.pyc,, @@ -533,9 +548,12 @@ PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pkgutil.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyqt5.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyqt5webengine.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyqt6.cpython-37.pyc,, +PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyqt6webengine.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyside2.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyside2webengine.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyside6.cpython-37.pyc,, +PyInstaller/hooks/rthooks/__pycache__/pyi_rth_pyside6webengine.cpython-37.pyc,, +PyInstaller/hooks/rthooks/__pycache__/pyi_rth_subprocess.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_win32api.cpython-37.pyc,, PyInstaller/hooks/rthooks/__pycache__/pyi_rth_win32comgenpy.cpython-37.pyc,, PyInstaller/hooks/rthooks/pyi_rth__tkinter.py,sha256=4AvH4rsn9gW8IYN9Wnb_cSEUE4txmuik6ypGBe978cE,1136 @@ -551,13 +569,16 @@ PyInstaller/hooks/rthooks/pyi_rth_kivy.py,sha256=MCXvflBa2ziDeOArYGyN5e1XbhsB3p5 PyInstaller/hooks/rthooks/pyi_rth_mplconfig.py,sha256=M3t08BCLqy9NApRe3pQLObLOU2rA9Q4zzy98grgJImU,1486 PyInstaller/hooks/rthooks/pyi_rth_multiprocessing.py,sha256=LcqbaQDGXn1AhiH8T0RlWuRuX3Nm2q9bAkA7TO62Egw,3764 PyInstaller/hooks/rthooks/pyi_rth_pkgres.py,sha256=74GGP0i7O2I50SLp39w0wc33m40-tw0bL1gduH80adk,8514 -PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py,sha256=hkFyyp4JHoEG2EzChFNbqLgvPffDnwuBTnWHNFhVrZk,3610 +PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py,sha256=wKk-rSGMrQDWGQHZGm2by7QRyTzve7FRj-hXiW5pL2s,4273 PyInstaller/hooks/rthooks/pyi_rth_pyqt5.py,sha256=0mYM7H9IsoeH6SAlo3cNPAECL33gplKQQAGdyIU_FpA,1238 -PyInstaller/hooks/rthooks/pyi_rth_pyqt5webengine.py,sha256=TBPY6Xm5TgVkZM3G9B0hwQAf6pmZJFEPqLsUh3QaICg,1079 +PyInstaller/hooks/rthooks/pyi_rth_pyqt5webengine.py,sha256=mr4F3ke7m6hNeVXBoIulnFXk3vWh3ubLoTvLg36Ku4I,1380 PyInstaller/hooks/rthooks/pyi_rth_pyqt6.py,sha256=Spj5uLUxM6LRkGeKYu1DX8a3pie1M9ltYM-xxkjoK1M,1312 +PyInstaller/hooks/rthooks/pyi_rth_pyqt6webengine.py,sha256=PITEW19esT68STTTYTbAC8Mr39EsrapL0HQXfkQPSow,1308 PyInstaller/hooks/rthooks/pyi_rth_pyside2.py,sha256=LGCRIqH0m0kv4PBVHnMKoEtzpjPO7wAV8V7fdvRWqu0,1293 -PyInstaller/hooks/rthooks/pyi_rth_pyside2webengine.py,sha256=DcYuTMS5k_dejdQxY2HK0aJcLTdL8zHbvLSrUjlBUJA,793 +PyInstaller/hooks/rthooks/pyi_rth_pyside2webengine.py,sha256=jVAaql98U6P-3Uds5hMFg4EqIq85WsJOf1VEtuxpvMQ,1093 PyInstaller/hooks/rthooks/pyi_rth_pyside6.py,sha256=Rv-g147_AJH6Li8pIy4YVSbpc30YMm1yn4GRCu39nJU,1288 +PyInstaller/hooks/rthooks/pyi_rth_pyside6webengine.py,sha256=KIsgaiAeNjl7OIeODvDolD-HjWU9gpHy2rtC98aUrvU,1093 +PyInstaller/hooks/rthooks/pyi_rth_subprocess.py,sha256=nzMMCx38TzsFkAcccpnj_2d6aD7fDoF0TVU7oUYzcsQ,1055 PyInstaller/hooks/rthooks/pyi_rth_win32api.py,sha256=-PReMg6zVsTkS5dG_njeKEMNvfI17xudSEv6II39y1o,933 PyInstaller/hooks/rthooks/pyi_rth_win32comgenpy.py,sha256=a3eYkdq-7QOi9ZMAYRmouTD17E-5525HloRr29FfLmg,2204 PyInstaller/lib/README.rst,sha256=VdkvnJUKg6D2bv3nfb-bJoWQ00jTf-pLbvv7KbsSaTA,1333 @@ -587,10 +608,9 @@ PyInstaller/loader/__pycache__/pyimod04_ctypes.cpython-37.pyc,, PyInstaller/loader/pyiboot01_bootstrap.py,sha256=TisOv9VqEqHGRGzyzpBthB7RT7ci-cclAc6OJjhTdMc,4328 PyInstaller/loader/pyimod01_os_path.py,sha256=LCkSuAfLXZAkMChVSOTLS_PHFLJuTUW0536K2EgxaFg,3042 PyInstaller/loader/pyimod02_archive.py,sha256=sPTMtIMHQbsgMuLKIeiHBe6LP_QCMrzte4MTi_EO6Fo,10568 -PyInstaller/loader/pyimod03_importers.py,sha256=oPuEj1QJ0NuWGSUa3AmmwYidME4lPLPrkDSd8HM14Cg,28662 +PyInstaller/loader/pyimod03_importers.py,sha256=StL4E7x5TzgmdmB5lV5am5bvFBiPDOZUbw-7hcqX9cs,29556 PyInstaller/loader/pyimod04_ctypes.py,sha256=uELkj5zY1Dhyhi3Tp-93bB86PSEKwzr3_n8eNMz5MQI,3928 PyInstaller/log.py,sha256=eTaeXfV1SiOhOl6Qm6VX0icGDbDXlz36p1ak4p4PgvE,1549 -PyInstaller/old__main__.py,sha256=FvBAvKuxFZqN1wMG8p5IOAGu_KmZH3S2Dznz2AEECx0,4459 PyInstaller/utils/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2 PyInstaller/utils/__pycache__/__init__.cpython-37.pyc,, PyInstaller/utils/__pycache__/_gitrevision.cpython-37.pyc,, @@ -614,7 +634,7 @@ PyInstaller/utils/cliutils/bindepend.py,sha256=4QltRWo24dVefLfeaJmzAv1HNY9nz5wxE PyInstaller/utils/cliutils/grab_version.py,sha256=XO5VwEtl7RAZzemzq5gt6VCHy_t02_rzEvn8FqQoXLc,1700 PyInstaller/utils/cliutils/makespec.py,sha256=Hn-Qv0N_ae184BVQPG9mr3lRy36xmc8lMi5jQU1wf50,1502 PyInstaller/utils/cliutils/set_version.py,sha256=ZFtuSWce5A2FgNWiq1Ibo9m4TnzvZmzVpq71-jKCyBI,1289 -PyInstaller/utils/conftest.py,sha256=Lm4mcj7ZHZepmh8UdhevktG58iauUnmiA6Ipc-nlzxg,22463 +PyInstaller/utils/conftest.py,sha256=6U4iySroa_tRVPQ2zkGqy-55IkqomysF2a6jUq0_Iow,23204 PyInstaller/utils/git.py,sha256=QVV3S3sP72r4HWD9tBOjE2KEPM1Ey3GqBWpMb2DGia8,2014 PyInstaller/utils/hooks/__init__.py,sha256=8uYj2Dgj-mkbdGZanu-RWB4cHTGfE92j0KkESWV-3b0,45205 PyInstaller/utils/hooks/__pycache__/__init__.cpython-37.pyc,, @@ -627,15 +647,15 @@ PyInstaller/utils/hooks/__pycache__/win32.cpython-37.pyc,, PyInstaller/utils/hooks/conda.py,sha256=uXCjSqvBMhzrvS41YrhV-RDhcAnpLbfpCuul-VxOghI,14278 PyInstaller/utils/hooks/django.py,sha256=stn9gRnvjfXAVozyXO0IbhdyU7tGI-W9mvCSYQAeCPA,3091 PyInstaller/utils/hooks/gi.py,sha256=b_-2tUxiTuBt0NFdnekRp_nU4E9ys6PDLmQcr2MGJYg,9453 -PyInstaller/utils/hooks/qt.py,sha256=2pp8IVaOrDUSgWnWz-Ys5tVdWZsGsn9Erx2hRTuZJcM,43015 +PyInstaller/utils/hooks/qt.py,sha256=gU6lYwcQvui9a-V5ykB5-YrgYBsbhxxWjjC2cRIPlLk,44808 PyInstaller/utils/hooks/subproc/__init__.py,sha256=fNGhsx0m5s9iq4yMvH6J1tI0vzUKWd62lIQNSnKTGCE,22 PyInstaller/utils/hooks/subproc/__pycache__/__init__.cpython-37.pyc,, PyInstaller/utils/hooks/subproc/__pycache__/django_import_finder.cpython-37.pyc,, PyInstaller/utils/hooks/subproc/django_import_finder.py,sha256=S3vbeambC3llUwM7ym069LrawF7SnXHDiCIBenBrvvE,3426 PyInstaller/utils/hooks/tcl_tk.py,sha256=hh4i-EalXZoIXZDXKh4mxFHSKPoe-iUsQaAr42DXKB4,9904 PyInstaller/utils/hooks/win32.py,sha256=iodL5aKooi_-G5HX47sVRCQdQdWexegXijmHFS4JvCk,1706 -PyInstaller/utils/misc.py,sha256=g1qFZaeI4Xgmj03MCxU_KRiB8Eu9BGn8UKubXFRy5Hc,11712 -PyInstaller/utils/osx.py,sha256=r75mseYH2aEXQyZc5PlK_aXkzp0eP_1LZzQTc8Ty0FA,14265 +PyInstaller/utils/misc.py,sha256=hMqa_qOIbedPKLQ6frwXvf1d3nWyJhnazUdy4217VFo,11774 +PyInstaller/utils/osx.py,sha256=S5uajt87DYzZvl89KlWYM5kZOzRL1SPLIeGbiSpQqtg,14989 PyInstaller/utils/release.py,sha256=HVfiPqEG3jXs7WSHmqBoBrddrlKk4Lstg6mxNmGDrxg,1704 PyInstaller/utils/run_tests.py,sha256=IgFdiNsIFMScCYR1zJUyxz7O05QvLzNFVQ1Cfp9TkH4,2887 PyInstaller/utils/tests.py,sha256=niq3bKwwI4-SRG74zzzzHxF7tkkkhpssW3W3DBsNmWQ,5766 @@ -647,14 +667,14 @@ PyInstaller/utils/win32/__pycache__/winmanifest.cpython-37.pyc,, PyInstaller/utils/win32/__pycache__/winresource.cpython-37.pyc,, PyInstaller/utils/win32/__pycache__/winutils.cpython-37.pyc,, PyInstaller/utils/win32/icon.py,sha256=6y6JcSYdt_kTTQxc__O5UtN42YDKtBM7ptglvMkgazM,9853 -PyInstaller/utils/win32/versioninfo.py,sha256=V6YTMK2yI_dHwVEHPWutFKJbGZvRdbPZUdYfmp-6l0Q,22849 -PyInstaller/utils/win32/winmanifest.py,sha256=q_fJ9s4c5PM5PIsu6AIjV1gw0iID3Bv-ExlO3E2l5es,44067 +PyInstaller/utils/win32/versioninfo.py,sha256=2TRSO_Kx7ntxfzQ4EdpeSVkvO0DRoG_ppjXCP0ngwmI,19855 +PyInstaller/utils/win32/winmanifest.py,sha256=1ghSTxnRoyavuZ6RvWsPP7HBD4Q_iChXBjOpfFxeGvQ,44245 PyInstaller/utils/win32/winresource.py,sha256=pPthBFqCg0ux_PAph0e5MPWO2iLrqePNIu71fYM7zMk,9629 -PyInstaller/utils/win32/winutils.py,sha256=58RymTd4ckcttw2oot1kHkWynWKYiXw6a2d7cdKKpPs,5582 -pyinstaller-4.7.dist-info/COPYING.txt,sha256=9yTxr7pAqMw3TLs-IElb_hQrmYuX2PFvQg-jB9Kk1AI,30633 -pyinstaller-4.7.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -pyinstaller-4.7.dist-info/METADATA,sha256=ovxsHLCbLDQFWXe0UdSsAT2mBg-LwMWCdRO3yxY-Toc,7085 -pyinstaller-4.7.dist-info/RECORD,, -pyinstaller-4.7.dist-info/WHEEL,sha256=WoE84lFhzpl5kFoOWeOKUr67l1o9c9Tie8ccxFQmzBU,98 -pyinstaller-4.7.dist-info/entry_points.txt,sha256=HvUkY2YCPxcJQjENngRlDEtmYlf_qWegG1_wv_J99GM,361 -pyinstaller-4.7.dist-info/top_level.txt,sha256=GuRmvWXGTRJNYmK5iWGOglNv4L3by7YKaEiKycNZ4XQ,12 +PyInstaller/utils/win32/winutils.py,sha256=4_HYdi2UNVooAuSu3XlsiBhseobezGJlfJ9Zryk2Q3o,6335 +pyinstaller-4.10.dist-info/COPYING.txt,sha256=9yTxr7pAqMw3TLs-IElb_hQrmYuX2PFvQg-jB9Kk1AI,30633 +pyinstaller-4.10.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +pyinstaller-4.10.dist-info/METADATA,sha256=jGfu-dtGg2vZlDcNVJa5faojAaER-e2FoNj0LFxrXfc,7139 +pyinstaller-4.10.dist-info/RECORD,, +pyinstaller-4.10.dist-info/WHEEL,sha256=i9qQj8KaD8_YEW0Vc2oS56fKju23RkQ-FVz-QmzVakQ,98 +pyinstaller-4.10.dist-info/entry_points.txt,sha256=HvUkY2YCPxcJQjENngRlDEtmYlf_qWegG1_wv_J99GM,361 +pyinstaller-4.10.dist-info/top_level.txt,sha256=GuRmvWXGTRJNYmK5iWGOglNv4L3by7YKaEiKycNZ4XQ,12 diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/WHEEL b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/WHEEL similarity index 67% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/WHEEL rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/WHEEL index 9d9c39a..9605f56 100644 --- a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/WHEEL +++ b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/WHEEL @@ -1,5 +1,5 @@ Wheel-Version: 1.0 -Generator: bdist_wheel (0.37.0) +Generator: bdist_wheel (0.37.1) Root-Is-Purelib: true Tag: py3-none-win_amd64 diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/entry_points.txt b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/entry_points.txt similarity index 100% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/entry_points.txt rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/entry_points.txt diff --git a/python_gui/可执行文件_main/pyinstaller-4.7.dist-info/top_level.txt b/python_gui/可执行文件_main/pyinstaller-4.10.dist-info/top_level.txt similarity index 100% rename from python_gui/可执行文件_main/pyinstaller-4.7.dist-info/top_level.txt rename to python_gui/可执行文件_main/pyinstaller-4.10.dist-info/top_level.txt diff --git a/python_gui/可执行文件_main/setuptools-47.1.0.dist-info/RECORD b/python_gui/可执行文件_main/setuptools-47.1.0.dist-info/RECORD index 029bb22..1a2218a 100644 --- a/python_gui/可执行文件_main/setuptools-47.1.0.dist-info/RECORD +++ b/python_gui/可执行文件_main/setuptools-47.1.0.dist-info/RECORD @@ -1,5 +1,5 @@ -../../Scripts/easy_install-3.7.exe,sha256=HpCmAh5F620eMh25p5837daUGguCKZegpk5mFLzWXd0,106383 -../../Scripts/easy_install.exe,sha256=HpCmAh5F620eMh25p5837daUGguCKZegpk5mFLzWXd0,106383 +../../Scripts/easy_install-3.7.exe,sha256=icKNO4vHUISfAEL3FFU_dlNdWWILEyshw1RS0iG_9Is,106383 +../../Scripts/easy_install.exe,sha256=icKNO4vHUISfAEL3FFU_dlNdWWILEyshw1RS0iG_9Is,106383 __pycache__/easy_install.cpython-37.pyc,, easy_install.py,sha256=MDC9vt5AxDsXX5qcKlBz2TnW6Tpuv_AobnfhCJ9X3PM,126 pkg_resources/__init__.py,sha256=AiHtsqVRO1T4Sfv_JH2WzHa_EywN1-MaIxEPIe0ky0g,108570 diff --git a/v2/main/RGB.h b/v2/main/RGB.h index 7229e09..b75aed8 100644 --- a/v2/main/RGB.h +++ b/v2/main/RGB.h @@ -54,34 +54,34 @@ void colorWipe_delay(uint32_t c, uint8_t wait) { } } void strip1() { - pixelInterval = 100; - for(int i = 0; i < pixelNumber; i++) { - if(pixelCycle == i) - strip.setPixelColor(i, strip.Color( 0,191,255)); // Set pixel's color (in RAM) - else if((pixelNumber-pixelCycle+7)%pixelNumber == i) - strip.setPixelColor(i, strip.Color(255,165,0)); - else if((pixelCycle+14)%pixelNumber == i) - strip.setPixelColor(i, strip.Color(255,0,255)); - else - strip.setPixelColor(i, strip.Color(0, 0, 0)); - } - strip.show(); // Update strip to match - pixelCycle++; - if(pixelCycle>=pixelNumber) - pixelCycle = 0; -} -void strip2() { + pixelInterval = 100; int i = 0; - pixelInterval = 100; strip.fill(strip.Color(0, 0, 0)); for(i;i<5;i++) { - int j =i%7*(150/5)+1; - strip.setPixelColor((i+pixelCycle)%pixelNumber, strip.Color(0,0,j)); - strip.setPixelColor((i+pixelCycle+7)%pixelNumber, strip.Color(j,0,0)); - strip.setPixelColor((i+pixelCycle+14)%pixelNumber, strip.Color(0,j,0)); + strip.setPixelColor((i+pixelNumber-pixelCycle)%pixelNumber, Wheel((i*10 + pixelQueue) & 255)); + strip.setPixelColor((i+pixelNumber-pixelCycle+11)%pixelNumber, Wheel((i*10 + pixelQueue+128) & 255)); } + strip.show(); + pixelCycle++; + if(pixelCycle>=pixelNumber) + pixelCycle = 0; + pixelQueue++; // Advance current cycle + if(pixelQueue >= 256) + pixelQueue = 0; // Loop the cycle back to the begining + +} +void strip2() { + int i = 0; + strip.fill(strip.Color(0, 0, 0)); + for(i;i<5;i++) + { + + int j =(4-i)%7*(150/5)+1; + strip.setPixelColor((i+pixelNumber-pixelCycle)%pixelNumber, strip.Color(j,j,j)); + strip.setPixelColor((i+pixelNumber-pixelCycle+11)%pixelNumber, strip.Color(j,j,j)); + } strip.show(); pixelCycle++; if(pixelCycle>=pixelNumber) @@ -89,7 +89,6 @@ void strip2() { } void strip3() { int i = 0; - pixelInterval = 100; strip.fill(strip.Color(0, 0, 0)); for(i;i<5;i++) { diff --git a/v2/main/main.ino b/v2/main/main.ino index 7503bd7..46acb45 100644 --- a/v2/main/main.ino +++ b/v2/main/main.ino @@ -364,21 +364,35 @@ void loop() { rgb_off(); break; case 1 : - strip1(); + if(motor.shaft_velocity>0) + { + pixelInterval = 150 - motor.shaft_velocity; + strip2(); + } + else + { + pixelInterval = 150 + motor.shaft_velocity; + strip3(); + } break; case 2 : + pixelInterval = 100; strip2(); break; case 3 : + pixelInterval = 100; strip3(); break; case 4 : - rainbow1(); + strip1(); break; case 5 : - rainbow2(); + rainbow1(); break; case 6 : + rainbow2(); + break; + case 7 : pulse_rainbow1(); break; } @@ -415,7 +429,7 @@ if(test_flag == 0)//正常控制 { if (abs(pendulum_angle) < swing_up_angle) // if angle small enough stabilize 0.5~30°,1.5~90° { - target_velocity = controllerLQR(pendulum_angle, gyroZrate, motor.shaftVelocity()); + target_velocity = controllerLQR(pendulum_angle, gyroZrate, motor.shaft_velocity); if (abs(target_velocity) > 120) target_velocity = _sign(target_velocity) * 120; diff --git a/v2/main/tourch.h b/v2/main/tourch.h index e0ef89e..5f00eaf 100644 --- a/v2/main/tourch.h +++ b/v2/main/tourch.h @@ -8,7 +8,7 @@ int touch_touched[3] = {0,0,0}; //单击,长按判断 单击值为1，长按 bool touch_STATE[3] = {1, 1, 1}; // 定义按键触发对象状态变量初始值为true默认开启 T2 T3 T4 int rgb_flag = 1; -int rgb_modle = 7;//有几种RGB效果就写几 +int rgb_modle = 8;//有几种RGB效果就写几 //触摸感应处理 void touchAttach(int touchID, uint8_t touchPin) { int touchread = touchRead(touchPin);