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

修改了很多的bug

Browse Source
This commit is contained in:
FEIJINTI 2023-04-14 16:10:15 +08:00
parent 27ec577e23
commit 37b514de23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
QT_test.py
View File

@ -93,10 +93,10 @@ def main():
while True:
cmd = input().strip().upper()
if cmd == 'IM':
img = cv2.imread(r"/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/data/data20220919/dark/rgb60.png")
# img = cv2.imread(r"C:\Users\FEIJINTI\PycharmProjects\wood_color\data\data20220919\dark\rgb60.png")
# img = cv2.imread(r"/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/data/data20220919/dark/rgb60.png")
img = cv2.imread(r"C:\Users\FEIJINTI\OneDrive\PycharmProjects\wood_color\data\316\dark\rgb60.png")
img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
img = np.asarray(img, dtype=np.float32)
img = np.asarray(img, dtype=np.uint8)
width = img.shape[0]
height = img.shape[1]
img_bytes = img.tobytes()
@ -118,8 +118,8 @@ def main():
# else:
# print('指令执行失败')
elif cmd == 'TR':
model = "/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/data/data20220919"
# model = "C:/Users/FEIJINTI/PycharmProjects/wood_color/data/data20220919"
# model = "/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/data/data20220919"
model = r"C:\Users\FEIJINTI\OneDrive\PycharmProjects\wood_color\data\316"
model = model.encode('ascii')
length = len(model) + 4
length = length.to_bytes(4, byteorder='big')
@ -137,8 +137,8 @@ def main():
# else:
# print('指令执行失败')
elif cmd == 'MD':
model = "/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p"
# model = "C:/Users/FEIJINTI/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p"
# model = "/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p"
model = r"C:\Users\FEIJINTI\OneDrive\PycharmProjects\wood_color\models\model_2023-03-27_16-32.p"
model = model.encode('ascii')
length = len(model) + 4
length = length.to_bytes(4, byteorder='big')
@ -156,7 +156,7 @@ def main():
# else:
# print('指令执行失败')
elif cmd == 'KM':
model = "E:/wood_color/data/2023318"
model = r"C:\Users\FEIJINTI\OneDrive\PycharmProjects\wood_color\data\316"
# model = "C:/Users/FEIJINTI/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p"
model = model.encode('ascii')
length = len(model) + 4

2
classifer.py
View File

@ -238,7 +238,7 @@ class WoodClass(object):
"""
if file_name is None:
file_name = "model_" + time.strftime("%Y-%m-%d_%H-%M") + ".p"
file_name = os.path.join(ROOT_DIR, "models", file_name)
file_name = os.path.join(ROOT_DIR, "models", file_name)
model_dic = {"n": self.n, "k": self.k, "p1": self.p1, "pur": self.pur, "model": self.model,
"ww": self.ww, "hh": self.hh, "width": self.width, "w": self.w, "h": self.h,
"mode": self._single_pick, "isCorrect": self.isCorrect, "left_correct": self.left_correct}

8
socket_detector.py
View File

@ -35,16 +35,16 @@ def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: Wo
elif cmd == 'TR':
detector = WoodClass(w=4096, h=1200, n=8000, p1=0.8, debug_mode=False)
model_name = None
if ":" in data:
data, model_name = data.split(":", 1)
if "$" in data:
data, model_name = data.split("$", 1)
model_name = model_name + ".p"
settings.data_path = data
settings.model_path = ROOT_DIR / 'models' / detector.fit_pictures(data_path=settings.data_path, file_name=model_name)
response = simple_sock(connected_sock, cmd_type=cmd)
response = simple_sock(connected_sock, cmd_type=cmd, result=result)
elif cmd == 'MD':
settings.model_path = data
detector.load(path=settings.model_path)
response = simple_sock(connected_sock, cmd_type=cmd)
response = simple_sock(connected_sock, cmd_type=cmd, result=result)
elif cmd == 'KM':
x_data, y_data, labels, img_names = detector.get_kmeans_data(data, plot_2d=False)
result = detector.data_adjustments(x_data, y_data, labels, img_names)

2
utils.py
View File

@ -280,7 +280,7 @@ def ack_sock(send_sock: socket.socket, cmd_type: str) -> bool:
return True
def done_sock(send_sock: socket.socket, cmd_type: str, result) -> bool:
def done_sock(send_sock: socket.socket, cmd_type: str, result = '') -> bool:
'''
发送任务完成指令
:param cmd_type:指令类型