x/PointCloudWeb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scan finish

Browse Source
This commit is contained in:
Lukas Droste
2021-08-17 20:55:26 +02:00
parent e5f6231981
commit 6b6207bc0e
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PointCloudWeb.Scanner/server.py
View File

@@ -7,6 +7,7 @@ import websockets
import threading import threading
import collections import collections
import requests import requests
import uuid
# f = open("PointCloudWeb.Scanner\datafile.txt","wt") # f = open("PointCloudWeb.Scanner\datafile.txt","wt")
# f.write("y, x, z\n") # f.write("y, x, z\n")
@@ -23,11 +24,13 @@ scan_progress = 0
scan_running = False scan_running = False
stop_scan = False stop_scan = False
ws_message_queue = collections.deque(maxlen=100) ws_message_queue = collections.deque(maxlen=100)
scan_id = "32a3acd0-4d67-4281-bf9c-3eefc093eca4" scan_id = ""
async def init(): async def init():
global arduino, ws_message_queue, arduino_status, lidar, lidar_status global arduino, ws_message_queue, arduino_status, lidar, lidar_status
try: try:
if arduino != None:
arduino.close()
arduino = serial.Serial(port=arduino_port, baudrate=arduino_baud) arduino = serial.Serial(port=arduino_port, baudrate=arduino_baud)
ws_message_queue.appendleft("arduino connected " + arduino_port) ws_message_queue.appendleft("arduino connected " + arduino_port)
arduino_status = True arduino_status = True
@@ -62,7 +65,8 @@ def filterY(data):
return temp + data[data.find("><"):data.find(">", data.find("><")+2)+1] return temp + data[data.find("><"):data.find(">", data.find("><")+2)+1]
def senddata(data,posy): def senddata(data,posy):
temp ="{\"Id\": "+scan_id+",\"ScanPoints\":[" global scan_id
temp ="{\"Id\": \""+scan_id+"\",\"ScanPoints\":["
for x,y in data.items(): for x,y in data.items():
temp += ("{\"RAY\":" + str(posy) + ",\"RAX\":" + str(x) + ",\"DistanceMM\":" + str(y) + "},") temp += ("{\"RAY\":" + str(posy) + ",\"RAX\":" + str(x) + ",\"DistanceMM\":" + str(y) + "},")
# f.write("{\"RAY\":" + str(posy) + ",\"RAX\":" + str(x) + ",\"DistanceMM\":" + str(y) + "},") # f.write("{\"RAY\":" + str(posy) + ",\"RAX\":" + str(x) + ",\"DistanceMM\":" + str(y) + "},")
@@ -76,11 +80,13 @@ def startScaner(mode):
global scan_progress, lidar, stop_scan, scan_id global scan_progress, lidar, stop_scan, scan_id
if lidar_status == True: if lidar_status == True:
ws_message_queue.appendleft(str(lidar.GetDeviceInfo())) ws_message_queue.appendleft(str(lidar.GetDeviceInfo()))
scan_id = str(uuid.uuid4())
ws_message_queue.appendleft("Scan ID: " + scan_id)
gen = lidar.StartScanning() gen = lidar.StartScanning()
if mode == "0": if mode == "0":
print("Mode 0") print("Mode 0")
ws_message_queue.appendleft("<scan>running") ws_message_queue.appendleft("<scan>running")
for y in range(19): for y in range(1):
if(stop_scan == True): if(stop_scan == True):
break break
print("send data") print("send data")
@@ -90,7 +96,7 @@ def startScaner(mode):
time.sleep(2) time.sleep(2)
scan_progress = round(y/18*100) scan_progress = round(y/18*100)
ws_message_queue.appendleft("<progress>" + str(scan_progress)) ws_message_queue.appendleft("<progress>" + str(scan_progress))
requests.put(url='http://localhost:35588/scandata', data='finished/'+scan_id, headers={'content-type': 'application/json'}) r = requests.put(url='http://localhost:35588/scandata/finished/'+scan_id)
setY(0) setY(0)
lidar.StopScanning() lidar.StopScanning()
elif mode == "1": elif mode == "1":
@@ -104,7 +110,7 @@ def startScaner(mode):
time.sleep(1) time.sleep(1)
scan_progress = round(y/90*100) scan_progress = round(y/90*100)
ws_message_queue.appendleft("<progress>" + str(scan_progress)) ws_message_queue.appendleft("<progress>" + str(scan_progress))
requests.put(url='http://localhost:35588/scandata', data='finished/'+scan_id, headers={'content-type': 'application/json'}) r = requests.put(url='http://localhost:35588/scandata/finished/'+scan_id)
setY(0) setY(0)
lidar.StopScanning() lidar.StopScanning()
elif mode == "2": elif mode == "2":
@@ -118,7 +124,7 @@ def startScaner(mode):
time.sleep(1) time.sleep(1)
scan_progress = round(y/360*100) scan_progress = round(y/360*100)
ws_message_queue.appendleft("<progress>" + str(scan_progress)) ws_message_queue.appendleft("<progress>" + str(scan_progress))
requests.put(url='http://localhost:35588/scandata', data='finished/'+scan_id, headers={'content-type': 'application/json'}) r = requests.put(url='http://localhost:35588/scandata/finished/'+scan_id)
setY(0) setY(0)
lidar.StopScanning() lidar.StopScanning()
else: else:
@@ -202,6 +208,7 @@ finally:
print("set stop_scan") print("set stop_scan")
try: try:
setY(0) setY(0)
arduino.close()
print("reset stepper") print("reset stepper")
except: except:
print("can´t reset stepper") print("can´t reset stepper")