diff --git a/COM/COM_Robot.py b/COM/COM_Robot.py index 9056c0f..51fc269 100644 --- a/COM/COM_Robot.py +++ b/COM/COM_Robot.py @@ -1,9 +1,7 @@ import logging from enum import Enum from turtle import Turtle - -from numpy.array_api import trunc - +# from numpy.array_api import trunc import Constant from COM.COM_TCP import TCPClient import queue diff --git a/COM/__pycache__/COM_Robot.cpython-39.pyc b/COM/__pycache__/COM_Robot.cpython-39.pyc index d3ffa32..832d773 100644 Binary files a/COM/__pycache__/COM_Robot.cpython-39.pyc and b/COM/__pycache__/COM_Robot.cpython-39.pyc differ diff --git a/COM/__pycache__/COM_TCP.cpython-39.pyc b/COM/__pycache__/COM_TCP.cpython-39.pyc index 2013968..10d2e88 100644 Binary files a/COM/__pycache__/COM_TCP.cpython-39.pyc and b/COM/__pycache__/COM_TCP.cpython-39.pyc differ diff --git a/CU/__pycache__/Catch.cpython-39.pyc b/CU/__pycache__/Catch.cpython-39.pyc index 130e31a..1053da3 100644 Binary files a/CU/__pycache__/Catch.cpython-39.pyc and b/CU/__pycache__/Catch.cpython-39.pyc differ diff --git a/CU/__pycache__/Command.cpython-39.pyc b/CU/__pycache__/Command.cpython-39.pyc index 8b0459f..dfd4570 100644 Binary files a/CU/__pycache__/Command.cpython-39.pyc and b/CU/__pycache__/Command.cpython-39.pyc differ diff --git a/CU/__pycache__/Detect.cpython-39.pyc b/CU/__pycache__/Detect.cpython-39.pyc index e527e39..f5aa744 100644 Binary files a/CU/__pycache__/Detect.cpython-39.pyc and b/CU/__pycache__/Detect.cpython-39.pyc differ diff --git a/CU/__pycache__/EMV.cpython-39.pyc b/CU/__pycache__/EMV.cpython-39.pyc index a9a3883..2215df0 100644 Binary files a/CU/__pycache__/EMV.cpython-39.pyc and b/CU/__pycache__/EMV.cpython-39.pyc differ diff --git a/CU/__pycache__/Feeding.cpython-39.pyc b/CU/__pycache__/Feeding.cpython-39.pyc index a03492a..242680e 100644 Binary files a/CU/__pycache__/Feeding.cpython-39.pyc and b/CU/__pycache__/Feeding.cpython-39.pyc differ diff --git a/CU/__pycache__/drop.cpython-39.pyc b/CU/__pycache__/drop.cpython-39.pyc index 434d3c8..516f334 100644 Binary files a/CU/__pycache__/drop.cpython-39.pyc and b/CU/__pycache__/drop.cpython-39.pyc differ diff --git a/Config/FeedLine.ini b/Config/FeedLine.ini index 67414f9..db871dc 100644 --- a/Config/FeedLine.ini +++ b/Config/FeedLine.ini @@ -1,10 +1,10 @@ [FeedLine1] id = 1 -name = 反应釜1 +name = 1号线 [FeedLine2] id = 2 -name = 反应釜2 +name = 2号线 [Position3] x = -44.431778 @@ -17,13 +17,13 @@ id = 3 order = 0 lineid = 2 status = 3 -linetype = 0 +linetype = 4 [Position1] -x = -263.075714 -y = -1305.59082 -z = -824.99884 -u = -149.785645 +x = -550.23053 +y = -1411.78418 +z = -825.0 +u = -149.776047 v = 0.0 w = -0.0 id = 1 @@ -33,10 +33,10 @@ status = 3 linetype = 0 [Position12] -x = -263.082245 -y = -1305.589478 +x = -550.23053 +y = -1411.78418 z = -825.0 -u = -149.786407 +u = -149.776047 v = 0.0 w = -0.0 id = 12 @@ -59,10 +59,10 @@ status = 3 linetype = 4 [Position13] -x = 19.228468 -y = -1531.263916 -z = -189.010803 -u = -73.546654 +x = 19.275372 +y = -1531.274658 +z = -59.998802 +u = -73.544907 v = 0.0 w = -0.0 id = 13 @@ -72,10 +72,10 @@ status = 3 linetype = 0 [Position14] -x = -263.082245 -y = -1305.589478 +x = -550.23053 +y = -1411.78418 z = -825.0 -u = -149.786407 +u = -149.776047 v = 0.0 w = -0.0 id = 14 @@ -85,10 +85,10 @@ status = 3 linetype = 0 [Position5] -x = -569.509094 -y = -1299.994385 -z = -1269.932495 -u = -150.0 +x = -550.23053 +y = -1411.78418 +z = -1220.955688 +u = -149.776047 v = 0.0 w = -0.0 id = 5 @@ -98,10 +98,10 @@ status = 5 linetype = 0 [Position15] -x = 19.228468 -y = -1531.263916 -z = -189.010803 -u = -73.546654 +x = 19.275372 +y = -1531.274658 +z = -59.998802 +u = -73.544907 v = 0.0 w = -0.0 id = 15 @@ -111,10 +111,10 @@ status = 2 linetype = 0 [Position2] -x = 19.228468 -y = -1531.263916 -z = -189.010803 -u = -73.546654 +x = 19.275372 +y = -1531.274658 +z = -59.998802 +u = -73.544907 v = 0.0 w = -0.0 id = 2 @@ -137,10 +137,10 @@ status = 9 linetype = 0 [Position7] -x = -263.075714 -y = -1305.59082 -z = -824.99884 -u = -149.785645 +x = -550.23053 +y = -1411.78418 +z = -825.0 +u = -149.776047 v = 0.0 w = -0.0 id = 7 @@ -196,7 +196,7 @@ u = -58.482 v = 4.0 w = 4.0 id = 11 -order = 2 +order = 4 lineid = 2 status = 3 linetype = 0 diff --git a/EMV/__pycache__/EMV.cpython-39.pyc b/EMV/__pycache__/EMV.cpython-39.pyc index 44111b0..ff07aaa 100644 Binary files a/EMV/__pycache__/EMV.cpython-39.pyc and b/EMV/__pycache__/EMV.cpython-39.pyc differ diff --git a/MainRecources_rc.py b/MainRecources_rc.py index 787ccd5..ec7c396 100644 --- a/MainRecources_rc.py +++ b/MainRecources_rc.py @@ -102112,31 +102112,31 @@ qt_resource_struct = b"\ \x00\x00\x00\x0e\x00\x02\x00\x00\x00\x0d\x00\x00\x00\x03\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\xb2\x00\x00\x00\x00\x00\x01\x00\x03/R\ -\x00\x00\x01\x996R6\xf9\ +\x00\x00\x01\x99\x8e\x16\x01I\ \x00\x00\x00\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x996R7\x02\ +\x00\x00\x01\x99\x8e\x16\x01R\ \x00\x00\x008\x00\x00\x00\x00\x00\x01\x00\x00\x05\x9a\ -\x00\x00\x01\x996R6\xff\ +\x00\x00\x01\x99\x8e\x16\x01N\ \x00\x00\x00~\x00\x00\x00\x00\x00\x01\x00\x03\x13\xe9\ -\x00\x00\x01\x996R6\xff\ +\x00\x00\x01\x99\x8e\x16\x01O\ \x00\x00\x00\xe4\x00\x00\x00\x00\x00\x01\x00\x0ff\xaf\ -\x00\x00\x01\x996R6\xf9\ +\x00\x00\x01\x99\x8e\x16\x01I\ \x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x18\xcf\xe2\ -\x00\x00\x01\x996R7\x00\ +\x00\x00\x01\x99\x8e\x16\x01O\ \x00\x00\x01\x88\x00\x00\x00\x00\x00\x01\x00\x16\xd0\xa3\ -\x00\x00\x01\x996R6\xff\ +\x00\x00\x01\x99\x8e\x16\x01N\ \x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x16\xd7X\ -\x00\x00\x01\x996R7\x02\ +\x00\x00\x01\x99\x8e\x16\x01Q\ \x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x0f\xd3\xa7\ -\x00\x00\x01\x996R6\xfd\ +\x00\x00\x01\x99\x8e\x16\x01L\ \x00\x00\x00\x92\x00\x00\x00\x00\x00\x01\x00\x03\x1eU\ -\x00\x00\x01\x996R7\x00\ +\x00\x00\x01\x99\x8e\x16\x01P\ \x00\x00\x00\xc2\x00\x00\x00\x00\x00\x01\x00\x0f\x5c\xad\ -\x00\x00\x01\x996R6\xff\ +\x00\x00\x01\x99\x8e\x16\x01O\ \x00\x00\x01\xd6\x00\x00\x00\x00\x00\x01\x00\x18\xd4\xc0\ -\x00\x00\x01\x996R7\x00\ +\x00\x00\x01\x99\x8e\x16\x01O\ \x00\x00\x01P\x00\x00\x00\x00\x00\x01\x00\x16\xbe\x07\ -\x00\x00\x01\x996R6\xff\ +\x00\x00\x01\x99\x8e\x16\x01N\ " def qInitResources(): diff --git a/Model/__pycache__/FeedModel.cpython-39.pyc b/Model/__pycache__/FeedModel.cpython-39.pyc index 29ae688..f76e240 100644 Binary files a/Model/__pycache__/FeedModel.cpython-39.pyc and b/Model/__pycache__/FeedModel.cpython-39.pyc differ diff --git a/Model/__pycache__/Position.cpython-39.pyc b/Model/__pycache__/Position.cpython-39.pyc index 0425183..baefbe0 100644 Binary files a/Model/__pycache__/Position.cpython-39.pyc and b/Model/__pycache__/Position.cpython-39.pyc differ diff --git a/Model/__pycache__/RobotModel.cpython-39.pyc b/Model/__pycache__/RobotModel.cpython-39.pyc index 496a4e0..22ac572 100644 Binary files a/Model/__pycache__/RobotModel.cpython-39.pyc and b/Model/__pycache__/RobotModel.cpython-39.pyc differ diff --git a/Trace/__pycache__/handeye_calibration.cpython-39.pyc b/Trace/__pycache__/handeye_calibration.cpython-39.pyc index a54564f..00d29c5 100644 Binary files a/Trace/__pycache__/handeye_calibration.cpython-39.pyc and b/Trace/__pycache__/handeye_calibration.cpython-39.pyc differ diff --git a/Util/__pycache__/util_ini.cpython-39.pyc b/Util/__pycache__/util_ini.cpython-39.pyc index 6c4c775..3f00984 100644 Binary files a/Util/__pycache__/util_ini.cpython-39.pyc and b/Util/__pycache__/util_ini.cpython-39.pyc differ diff --git a/Util/__pycache__/util_log.cpython-39.pyc b/Util/__pycache__/util_log.cpython-39.pyc index 77f521d..16dc201 100644 Binary files a/Util/__pycache__/util_log.cpython-39.pyc and b/Util/__pycache__/util_log.cpython-39.pyc differ diff --git a/Util/__pycache__/util_math.cpython-39.pyc b/Util/__pycache__/util_math.cpython-39.pyc index 1ce7f8e..c67aa79 100644 Binary files a/Util/__pycache__/util_math.cpython-39.pyc and b/Util/__pycache__/util_math.cpython-39.pyc differ diff --git a/Util/__pycache__/util_pic.cpython-39.pyc b/Util/__pycache__/util_pic.cpython-39.pyc index 741579f..a421dde 100644 Binary files a/Util/__pycache__/util_pic.cpython-39.pyc and b/Util/__pycache__/util_pic.cpython-39.pyc differ diff --git a/Util/__pycache__/util_time.cpython-39.pyc b/Util/__pycache__/util_time.cpython-39.pyc index eef60dc..da6d484 100644 Binary files a/Util/__pycache__/util_time.cpython-39.pyc and b/Util/__pycache__/util_time.cpython-39.pyc differ diff --git a/__pycache__/Constant.cpython-39.pyc b/__pycache__/Constant.cpython-39.pyc index 2c0fbed..ac54e65 100644 Binary files a/__pycache__/Constant.cpython-39.pyc and b/__pycache__/Constant.cpython-39.pyc differ diff --git a/__pycache__/Expection.cpython-39.pyc b/__pycache__/Expection.cpython-39.pyc index d01b8f8..8d9e7ea 100644 Binary files a/__pycache__/Expection.cpython-39.pyc and b/__pycache__/Expection.cpython-39.pyc differ diff --git a/__pycache__/MainRecources_rc.cpython-39.pyc b/__pycache__/MainRecources_rc.cpython-39.pyc index 397dac9..f51d7fd 100644 Binary files a/__pycache__/MainRecources_rc.cpython-39.pyc and b/__pycache__/MainRecources_rc.cpython-39.pyc differ diff --git a/__pycache__/toggleswitch.cpython-39.pyc b/__pycache__/toggleswitch.cpython-39.pyc index c490fbb..cb5ae41 100644 Binary files a/__pycache__/toggleswitch.cpython-39.pyc and b/__pycache__/toggleswitch.cpython-39.pyc differ diff --git a/__pycache__/ui_MainWin.cpython-39.pyc b/__pycache__/ui_MainWin.cpython-39.pyc index 6e6a402..235a4ca 100644 Binary files a/__pycache__/ui_MainWin.cpython-39.pyc and b/__pycache__/ui_MainWin.cpython-39.pyc differ diff --git a/log/log.log b/log/log.log index 8a88ec2..6d4e00b 100644 --- a/log/log.log +++ b/log/log.log @@ -17225,3 +17225,5 @@ 2025-09-24 21:47:44 - INFO - 发送命令{"dsID":"www.hc-system.com.RemoteMonitor","reqType":"command","cmdData":["actionStop","1"]} 2025-09-24 21:47:44 - INFO - 按下急停 2025-09-24 21:48:05 - INFO - 退出系统 +2025-09-28 10:57:07 - INFO - 进入系统 +2025-09-28 10:57:30 - INFO - 退出系统 diff --git a/resources_rc.py b/resources_rc.py index b9b6439..4eb583e 100644 --- a/resources_rc.py +++ b/resources_rc.py @@ -4260,7 +4260,7 @@ qt_resource_struct = b"\ \x00\x00\x00\x0a\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x996R7\x00\ +\x00\x00\x01\x99\x8e\x16\x01P\ " def qInitResources(): diff --git a/view/__pycache__/ResetView.cpython-39.pyc b/view/__pycache__/ResetView.cpython-39.pyc index 30c2f08..f6eab99 100644 Binary files a/view/__pycache__/ResetView.cpython-39.pyc and b/view/__pycache__/ResetView.cpython-39.pyc differ diff --git a/view/__pycache__/ui_Dialog_Reset.cpython-39.pyc b/view/__pycache__/ui_Dialog_Reset.cpython-39.pyc index 66db62d..f26ba73 100644 Binary files a/view/__pycache__/ui_Dialog_Reset.cpython-39.pyc and b/view/__pycache__/ui_Dialog_Reset.cpython-39.pyc differ