NanjingForestryUniversity/supermachine-wood
3
0
Fork 0
mirror of https://github.com/NanjingForestryUniversity/supermachine-wood.git synced 2025-11-08 18:23:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

添加了数据库内容(未测试)

Browse Source
This commit is contained in:
FEIJINTI 2022-10-20 15:07:57 +08:00
parent 9d805b7093
commit bf45d9360a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database.py
View File

@ -57,7 +57,7 @@ class Database(object):
if __name__ == '__main__': if __name__ == '__main__':
test_addr = "mysql+pymysql://root:@localhost:3306/color" test_addr = "mysql+pymysql://root:@localhost:3306/color"
database = Database(test_addr) database = Database(test_addr)
database.init_db() # database.init_db()
t1 = time.time() t1 = time.time()
for i in range(100): for i in range(100):
database.add_data('middle') database.add_data('middle')

16
socket_detector.py
View File

@ -9,13 +9,14 @@ from classifer import WoodClass
import time import time
import os import os
from database import Database
from root_dir import ROOT_DIR from root_dir import ROOT_DIR
from utils import PreSocket, receive_sock, parse_protocol, ack_sock, done_sock, DualSock, simple_sock from utils import PreSocket, receive_sock, parse_protocol, ack_sock, done_sock, DualSock, simple_sock
import logging import logging
from config import Config from config import Config
def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: WoodClass, settings: Config) -> bool: def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: WoodClass, settings: Config) -> tuple:
""" """
处理指令 处理指令
@ -25,9 +26,10 @@ def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: Wo
:param detector: 模型 :param detector: 模型
:return: 是否处理成功 :return: 是否处理成功
""" """
result = ''
if cmd == 'IM': if cmd == 'IM':
wood_color = detector.predict(data) wood_color = detector.predict(data)
result = {0: 'dark', 1: 'middle', 2: 'light'}[wood_color]
response = simple_sock(connected_sock, cmd_type=cmd, result=wood_color) response = simple_sock(connected_sock, cmd_type=cmd, result=wood_color)
elif cmd == 'TR': elif cmd == 'TR':
detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False) detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False)
@ -41,7 +43,7 @@ def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: Wo
else: else:
logging.error(f'错误指令，指令为{cmd}') logging.error(f'错误指令，指令为{cmd}')
response = False response = False
return response return response, result
def main(is_debug=False): def main(is_debug=False):
@ -54,6 +56,9 @@ def main(is_debug=False):
handlers=[file_handler, console_handler], level=logging.DEBUG) handlers=[file_handler, console_handler], level=logging.DEBUG)
dual_sock = DualSock(connect_ip='127.0.0.1') dual_sock = DualSock(connect_ip='127.0.0.1')
database = Database(settings.database_addr)
while not dual_sock.status: while not dual_sock.status:
dual_sock.reconnect() dual_sock.reconnect()
detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False) detector = WoodClass(w=4096, h=1200, n=3000, debug_mode=False)
@ -68,7 +73,10 @@ def main(is_debug=False):
cmd, data = parse_protocol(pack) cmd, data = parse_protocol(pack)
# ack_sock(received_sock, cmd_type=cmd) # ack_sock(received_sock, cmd_type=cmd)
process_cmd(cmd=cmd, data=data, connected_sock=dual_sock, detector=detector, settings=settings) response, result = process_cmd(cmd=cmd, data=data, connected_sock=dual_sock, detector=detector, settings=settings)
if result != "":
database.add_data(result)