From 765500ebce792dbacfbc57014811f9a0128d08bd Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 10 Feb 2017 10:09:03 -0800 Subject: [PATCH] remove debug and fix bug in test script --- libraries/networking/src/MessagesClient.cpp | 23 --------------------- libraries/script-engine/src/TypedArrays.cpp | 2 -- scripts/developer/tests/messagesTests.js | 7 ++----- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/libraries/networking/src/MessagesClient.cpp b/libraries/networking/src/MessagesClient.cpp index 09d2e94380..d7b2dc5e97 100644 --- a/libraries/networking/src/MessagesClient.cpp +++ b/libraries/networking/src/MessagesClient.cpp @@ -114,18 +114,6 @@ void MessagesClient::handleMessagesPacket(QSharedPointer receiv if (isText) { emit messageReceived(channel, message, senderID, false); } else { - - // FIXME -- this is some super janky temporary debugging code, just to prove the data is going over the wire correctly - QString debugData; - for (int i = 0; i < data.size(); i++) { - auto byte = data[i]; - if (i > 0) { - debugData += ", "; - } - debugData += QString::number(byte); - } - qDebug() << __FUNCTION__ << "data:" << debugData; - emit dataReceived(channel, data, senderID, false); } } @@ -147,17 +135,6 @@ void MessagesClient::sendMessage(QString channel, QString message, bool localOnl } void MessagesClient::sendData(QString channel, QByteArray data, bool localOnly) { - // FIXME -- this is some super janky temporary debugging code, just to prove the data is going over the wire correctly - QString debugData; - for(int i = 0; i < data.size(); i++) { - auto byte = data[i]; - if (i > 0) { - debugData += ", "; - } - debugData += QString::number(byte); - } - qDebug() << __FUNCTION__ << "data:" << debugData; - auto nodeList = DependencyManager::get(); if (localOnly) { QUuid senderID = nodeList->getSessionUUID(); diff --git a/libraries/script-engine/src/TypedArrays.cpp b/libraries/script-engine/src/TypedArrays.cpp index 661f978426..4d5181ff33 100644 --- a/libraries/script-engine/src/TypedArrays.cpp +++ b/libraries/script-engine/src/TypedArrays.cpp @@ -62,8 +62,6 @@ QScriptValue TypedArray::newInstance(QScriptValue array) { } QScriptValue TypedArray::newInstance(QScriptValue buffer, quint32 byteOffset, quint32 length) { - qDebug() << __FUNCTION__ << "buffer:" << buffer.toVariant() << "byteOffset:" << byteOffset << "length:" << length; - QScriptValue data = engine()->newObject(); data.setProperty(_bufferName, buffer); data.setProperty(_byteOffsetName, byteOffset); diff --git a/scripts/developer/tests/messagesTests.js b/scripts/developer/tests/messagesTests.js index 7b390f5caf..18beafa4cc 100644 --- a/scripts/developer/tests/messagesTests.js +++ b/scripts/developer/tests/messagesTests.js @@ -10,7 +10,7 @@ Messages.messageReceived.connect(function(channel, message, sender, local) { Messages.dataReceived.connect(function(channel, data, sender, local) { var int8data = new Int8Array(data); - var dataAsString; + var dataAsString = ""; for (var i = 0; i < int8data.length; i++) { if (i > 0) { dataAsString += ", "; @@ -26,10 +26,7 @@ Script.update.connect(function(){ if (counter == 100) { Messages.sendMessage(channelName, "foo"); } else if (counter == 200) { - var data = new Int8Array(2); - //[0,1,10,2,20,3,30]); - data[0]=1; - data[1]=10; + var data = new Int8Array([0,1,10,2,20,3,30]); print("about to call sendData() data.length:", data.length); Messages.sendData(channelName, data.buffer); counter = 0;