From 65ebfada837de0d01766421e13b751ed0715539c Mon Sep 17 00:00:00 2001 From: VLLindqvist Date: Tue, 13 Jun 2023 17:20:33 +0200 Subject: [PATCH] Update frontend hash and most logs to debug instead of info --- data/assets/util/webgui.asset | 2 +- .../softwareintegration/network/messagehandler.cpp | 12 ++++++------ .../network/softwareconnection.cpp | 4 ++-- .../rendering/renderablepointscloud.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 562f07555e..7dab6599be 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -13,7 +13,7 @@ local frontend = asset.syncedResource({ -- Url = "http://data.openspaceproject.com/files/webgui/frontend/" .. frontendHash .. "/frontend.zip" -- TODO: Remove. This was added in order to use the new GUI for saving sessions. -- in the Software Integration Module - Url = "openspacegui.vlq.se/e2b459d60bc7d2fc0ad8e4a89789b26febe60e57/frontend.zip" + Url = "openspacegui.vlq.se/309e67690d3de3b7ed1800d702d1457a9f0bcb05/frontend.zip" }) diff --git a/modules/softwareintegration/network/messagehandler.cpp b/modules/softwareintegration/network/messagehandler.cpp index 6381725dd2..1f410aac0b 100644 --- a/modules/softwareintegration/network/messagehandler.cpp +++ b/modules/softwareintegration/network/messagehandler.cpp @@ -37,7 +37,7 @@ namespace { -constexpr const char* _loggerCat = "MessageHandler"; +constexpr const char* _loggerCat = "SoftwareIntegration MessageHandler: "; } // namespace @@ -585,7 +585,7 @@ void handleDataMessage(const std::vector& message, std::shared_ptrid())); + LINFO(fmt::format("Data message recieved on connection {}.", connectionPtr->id())); handleDataMessage(message, connectionPtr); break; } case simp::MessageType::RemoveSceneGraphNode: { - LDEBUG(fmt::format("Message recieved on connection {}... Remove SGN", connectionPtr->id())); + LINFO(fmt::format("Remove Scene Graph Node message recieved on connection {}.", connectionPtr->id())); handleRemoveSGNMessage(message, connectionPtr); break; } @@ -907,7 +907,7 @@ void postSyncCallbacks() { auto& [identifier, callbackList] = *callbackMapIt; try { - LINFO(fmt::format("Callbacks for {}:", identifier)); + LDEBUG(fmt::format("Callbacks for {}:", identifier)); const SceneGraphNode* sgn = global::renderEngine->scene()->sceneGraphNode(identifier); if (!sgn) throw std::exception{}; @@ -933,7 +933,7 @@ void postSyncCallbacks() { callback(); callbacksIt = callbackList.erase(callbacksIt); - LINFO(fmt::format("Callback '{}' executed", description)); + LDEBUG(fmt::format("Callback '{}' executed", description)); } catch (std::exception&) { ++callbacksIt; diff --git a/modules/softwareintegration/network/softwareconnection.cpp b/modules/softwareintegration/network/softwareconnection.cpp index 2830b2541a..fd11001388 100644 --- a/modules/softwareintegration/network/softwareconnection.cpp +++ b/modules/softwareintegration/network/softwareconnection.cpp @@ -130,7 +130,7 @@ bool SoftwareConnection::hasPropertySubscription( // Get renderable auto r = renderable(identifier); if (!r) { - LWARNING(fmt::format( + LDEBUG(fmt::format( "Couldn't check for property subscriptions, renderable {} doesn't exist", identifier )); @@ -259,7 +259,7 @@ void SoftwareConnection::setShouldNotSendData(const std::string& identifier, con void SoftwareConnection::disconnect() { _socket->disconnect(); - LINFO(fmt::format("OpenSpace has disconnected with external software through socket")); + LINFO(fmt::format("OpenSpace has disconnected with external software")); } bool SoftwareConnection::isConnected() const { diff --git a/modules/softwareintegration/rendering/renderablepointscloud.cpp b/modules/softwareintegration/rendering/renderablepointscloud.cpp index 0780b29b03..8a894cb391 100644 --- a/modules/softwareintegration/rendering/renderablepointscloud.cpp +++ b/modules/softwareintegration/rendering/renderablepointscloud.cpp @@ -697,7 +697,7 @@ void RenderablePointsCloud::loadPointData(SoftwareIntegrationModule* softwareInt softwareIntegrationModule->setDataLoaded(_identifier.value(), storage::Key::DataPoints); LINFO(fmt::format( "New point data ({} points) has loaded. {} values are NaN values. " - "Point's with at least one NaN value are hidden.", + "Points with at least one NaN value are hidden.", (pointData.size() / 3), nNans )); } @@ -847,7 +847,7 @@ void RenderablePointsCloud::loadColormapAttributeData(SoftwareIntegrationModule* void RenderablePointsCloud::loadLinearSizeAttributeData(SoftwareIntegrationModule* softwareIntegrationModule) { // Fetch linear size attribute data from module's centralized storage std::vector linearSizeAttributeData; - if (softwareIntegrationModule->fetchData(_identifier.value(), storage::Key::LinearSizeAttrData, linearSizeAttributeData)) { + if (!softwareIntegrationModule->fetchData(_identifier.value(), storage::Key::LinearSizeAttrData, linearSizeAttributeData)) { LWARNING("There was an issue trying to fetch the linear size attribute data from the centralized storage."); return; }