Merge remote-tracking branch 'origin/dual_sock' into dual_sock

This commit is contained in:
FEIJINTI 2022-10-05 13:21:18 +08:00
commit e8af097ec7
2 changed files with 8 additions and 8 deletions

View File

@ -93,8 +93,8 @@ 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\PycharmProjects\wood_color\data\data20220919\dark\rgb60.png")
img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
img = np.asarray(img, dtype=np.float32)
width = img.shape[0]
@ -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 = "C:/Users/FEIJINTI/PycharmProjects/wood_color/data/data20220919"
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 = "C:/Users/FEIJINTI/PycharmProjects/wood_color/models/model_2020-11-08_20-49.p"
model = model.encode('ascii')
length = len(model) + 4
length = length.to_bytes(4, byteorder='big')

View File

@ -7,5 +7,5 @@ Created on Nov 3 21:18:26 2020
"""
import os
ROOT_DIR = r"C:\Users\FEIJINTI\PycharmProjects\wood_color"
# ROOT_DIR = r"/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color"
# ROOT_DIR = r"C:\Users\FEIJINTI\PycharmProjects\wood_color"
ROOT_DIR = r"/Users/zhouchao/Library/CloudStorage/OneDrive-macrosolid/PycharmProjects/wood_color"