diff --git a/QT_test.py b/QT_test.py index d8067bd..4f748e3 100644 --- a/QT_test.py +++ b/QT_test.py @@ -156,7 +156,7 @@ def main(): # else: # print('指令执行失败') elif cmd == 'KM': - model = r"C:\Users\FEIJINTI\OneDrive\PycharmProjects\wood_color\data\316" + model = r"E:\wood_color\data\318" # model = "C:/Users/FEIJINTI/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p" model = model.encode('ascii') length = len(model) + 4 diff --git a/classifer.py b/classifer.py index 4a58b5f..b45dc6e 100644 --- a/classifer.py +++ b/classifer.py @@ -484,7 +484,9 @@ class WoodClass(object): sorted_cluster_indices = np.argsort([dark_mean[0], middle_mean[0], light_mean[0]]) labels = kmeans.labels_ for i in range(labels.shape[0]): - labels[i] = sorted_cluster_indices[labels[i]] + indices = np.where(labels[i] == sorted_cluster_indices) + labels[i] = indices[0][0] + if plot_2d: plt.figure() diff --git a/socket_detector.py b/socket_detector.py index 37126ca..6a4f8d6 100644 --- a/socket_detector.py +++ b/socket_detector.py @@ -46,7 +46,7 @@ def process_cmd(cmd: str, data: any, connected_sock: socket.socket, detector: Wo detector.load(path=settings.model_path) 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) + x_data, y_data, labels, img_names = detector.get_kmeans_data(data, plot_2d=True) result = detector.data_adjustments(x_data, y_data, labels, img_names) result = ','.join([str(x) for x in result]) response = simple_sock(connected_sock, cmd_type=cmd, result=result)