From f9237ef08e157fcf2ce4b1d5b376a1403032bd64 Mon Sep 17 00:00:00 2001
From: phesch <ulila@student.kit.edu>
Date: Wed, 17 Nov 2021 16:42:17 +0100
Subject: [PATCH] Pretty-print Aron JSON data in clipboard
Also fix a code style issue.
---
.../libraries/armem_gui/instance/InstanceView.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
index 74dc84486..b1f347c46 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
@@ -325,10 +325,11 @@ namespace armarx::armem::gui::instance
}
}
}
-
- if (const std::optional<aron::Path> path = getElementPath(item))
+
+ const std::optional<aron::Path> elementPath = getElementPath(item);
+ if (elementPath)
{
- menu.addAction(makeActionCopyDataToClipboard(path.value()));
+ menu.addAction(makeActionCopyDataToClipboard(elementPath.value()));
}
if (menu.actions().size() > 0)
@@ -431,7 +432,7 @@ namespace armarx::armem::gui::instance
nlohmann::json json =
aron::converter::AronNlohmannJSONConverter::ConvertToNlohmannJSON(element);
QClipboard* clipboard = QApplication::clipboard();
- clipboard->setText(QString::fromStdString(json.dump()));
+ clipboard->setText(QString::fromStdString(json.dump(2)));
QApplication::processEvents();
}
catch (const aron::error::AronException& e)
--
GitLab