mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 03:00:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update frontend hash and most logs to debug instead of info

Browse Source
This commit is contained in:
VLLindqvist
2023-06-13 17:20:33 +02:00
parent d2299f4042
commit 65ebfada83
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/assets/util/webgui.asset
View File

@@ -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"
})

12
modules/softwareintegration/network/messagehandler.cpp
View File

@@ -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<std::byte>& message, std::shared_ptr<So
LERROR(fmt::format("Error when reading data message: {}", err.message));
return;
}
LINFO(fmt::format(
LDEBUG(fmt::format(
"Handling '{}':",
simp::getStringFromDataKey(dataKey)
));
@@ -880,12 +880,12 @@ void handleMessage(IncomingMessage& incomingMessage) {
break;
}
case simp::MessageType::Data: {
LDEBUG(fmt::format("Message recieved on connection {}... New Data", connectionPtr->id()));
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;

4
modules/softwareintegration/network/softwareconnection.cpp
View File

@@ -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 {

4
modules/softwareintegration/rendering/renderablepointscloud.cpp
View File

@@ -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<float> 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;
}