From e273b3107f8ce7b6b85578e5756e4fd63c2754c7 Mon Sep 17 00:00:00 2001 From: Pete Shadbolt Date: Thu, 3 Nov 2016 18:08:03 +0000 Subject: [PATCH] Can message abpserver from JavaScript --- abp/static/scripts/editor.js | 13 +------------ abp/static/scripts/websocket.js | 4 ++++ bin/abpserver | 3 ++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/abp/static/scripts/editor.js b/abp/static/scripts/editor.js index 173ce79..4b33f76 100644 --- a/abp/static/scripts/editor.js +++ b/abp/static/scripts/editor.js @@ -48,18 +48,7 @@ editor.addQubitAtPoint = function(point) { } point.round(); - // Check for clashes - for (var node in abj.node) { - var delta = new THREE.Vector3(); - delta.subVectors(abj.node[node].position, point); - if (delta.length()<0.1){ return; } - } - - // TODO: This SUCKS - var new_node = point.x + "." + point.y + "." + point.z; - abj.add_node(new_node, { position: point, vop:0 }); - editor.focus(new_node); - graph.update(); + websocket.edit({test:"test"}); gui.serverMessage("Created node " + new_node +"."); }; diff --git a/abp/static/scripts/websocket.js b/abp/static/scripts/websocket.js index 438c1ca..91c8825 100644 --- a/abp/static/scripts/websocket.js +++ b/abp/static/scripts/websocket.js @@ -26,3 +26,7 @@ websocket.connect = function(update) { gui.serverMessage("No connection to server. Reconnect.", true); }; }; + +websocket.edit = function (data) { + websocket.ws.send("edit:"+JSON.stringify(data)); +}; diff --git a/bin/abpserver b/bin/abpserver index e6b1f1a..48d10d0 100755 --- a/bin/abpserver +++ b/bin/abpserver @@ -18,7 +18,8 @@ from pkg_resources import resource_filename clients = [] def new_message(client, server, message): - if message.startswith("edit"): + if message.startswith("edit:"): + print message[5:] edit = json.loads(message[5:]) print "Received update from javascript." print edit