Loading src/main/resources/templates/js/app.js +2 −2 Original line number Diff line number Diff line Loading @@ -57,7 +57,6 @@ function displayLoading() { function hideLoading() { loader.classList.remove("display"); } async function startWorkflow(){ const startButton = document.getElementById("process"); startButton.style.display = "none"; Loading @@ -73,4 +72,5 @@ async function startWorkflow() { } catch (error) { console.error(error); } await fetchImageAndObjects(); } src/main/resources/templates/js/pointCloud.js +0 −4 Original line number Diff line number Diff line async function drawPointCloud(object) { <<<<<<< HEAD:src/main/resources/templates/js/pointCloud.js var button = document.getElementById("drawPC"); button.style.display = 'none'; await fetch('http://127.0.0.1:5555/getJSON') ======= await fetch('http://127.0.0.1:5000/getJSON') >>>>>>> b0120ce (clean gui):pointCloud.js .then(response => response.json()) .then(responseText => { let pointCloudData = parseJSONToPointCloud(responseText, object); Loading Loading
src/main/resources/templates/js/app.js +2 −2 Original line number Diff line number Diff line Loading @@ -57,7 +57,6 @@ function displayLoading() { function hideLoading() { loader.classList.remove("display"); } async function startWorkflow(){ const startButton = document.getElementById("process"); startButton.style.display = "none"; Loading @@ -73,4 +72,5 @@ async function startWorkflow() { } catch (error) { console.error(error); } await fetchImageAndObjects(); }
src/main/resources/templates/js/pointCloud.js +0 −4 Original line number Diff line number Diff line async function drawPointCloud(object) { <<<<<<< HEAD:src/main/resources/templates/js/pointCloud.js var button = document.getElementById("drawPC"); button.style.display = 'none'; await fetch('http://127.0.0.1:5555/getJSON') ======= await fetch('http://127.0.0.1:5000/getJSON') >>>>>>> b0120ce (clean gui):pointCloud.js .then(response => response.json()) .then(responseText => { let pointCloudData = parseJSONToPointCloud(responseText, object); Loading