From 465b377515da3779a8f9db59be67f6a1d5c792f5 Mon Sep 17 00:00:00 2001 From: aniisaaden Date: Tue, 15 Sep 2020 11:15:48 +0200 Subject: [PATCH] =?UTF-8?q?Went=20back=20to=20previous=20working=20version?= =?UTF-8?q?=20-=20commented=20out=20new=20changes=20for=20bug=20fixing=20?= =?UTF-8?q?=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softwareintegrationmodule.cpp | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/softwareintegration/softwareintegrationmodule.cpp b/modules/softwareintegration/softwareintegrationmodule.cpp index 263c0755bf..03f39f542b 100644 --- a/modules/softwareintegration/softwareintegrationmodule.cpp +++ b/modules/softwareintegration/softwareintegrationmodule.cpp @@ -103,15 +103,6 @@ namespace openspace { return _socket.get(); } - //Connection - bool SoftwareConnection::sendMessage(std::string message) { - if (!_socket->put(message.data(), message.size())) { - return false; - } - - return true; - } - // Connection SoftwareConnection::Message SoftwareConnection::receiveMessage() { // Header consists of version (1 char), message type (4 char) & message size (4 char) @@ -142,10 +133,9 @@ namespace openspace { throw SoftwareConnectionLostError(); } - //sendMessage(messageBuffer); - std::string header = "O"; - sendMessage(header); - LERROR(fmt::format("Meddelandet som skickas {}", header)); + //std::string header = "O"; + //sendMessage(header); + //LERROR(fmt::format("Meddelandet som skickas {}", header)); // Read message typ: byte 1-4 std::string type; @@ -186,6 +176,15 @@ namespace openspace { } } + //Connection + bool SoftwareConnection::sendMessage(std::string message) { + if (!_socket->put(message.data(), message.size())) { + return false; + } + + return true; + } + // Server void SoftwareIntegrationModule::start(int port) { @@ -351,7 +350,7 @@ namespace openspace { float opacity = readFloatValue(message); // Update opacity of renderable - const Renderable* myrenderable = renderable(identifier); + const Renderable* myrenderable = renderable("RenderablePointsCloud"); properties::Property* opacityProperty = myrenderable->property("Opacity"); opacityProperty->set(opacity); break; @@ -360,8 +359,8 @@ namespace openspace { std::string identifier = readIdentifier(message); float size = readFloatValue(message); - // Update color of renderable - const Renderable * myrenderable = renderable(identifier); + // Update size of renderable + const Renderable * myrenderable = renderable("RenderablePointsCloud"); properties::Property* sizeProperty = myrenderable->property("Size"); sizeProperty->set(size); break;