From 1b701d7a56428d177b1a2270e6d586734595c428 Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Tue, 19 Jul 2022 14:27:34 +0200
Subject: [PATCH] fixed SIMOX_USE_SOQT macro
---
VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp | 3 ++-
VirtualRobot/VirtualRobot.cpp | 1 +
.../CoinVisualization/CoinVisualizationFactory.cpp | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp b/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp
index 93bbdebb7..ccd0ba98a 100644
--- a/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp
+++ b/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp
@@ -278,10 +278,11 @@ namespace VirtualRobot
int GraspEditorWindow::main()
{
+ // initialize QCoreApp
QCoreApplication::setOrganizationName("H2T");
QCoreApplication::setOrganizationDomain("h2t.anthropomatik.kit.edu");
- QCoreApplication::setApplicationName("GraspEditor");
QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+ QCoreApplication::setApplicationName("GraspEditor");
QSettings settings;
SoQt::show(this);
diff --git a/VirtualRobot/VirtualRobot.cpp b/VirtualRobot/VirtualRobot.cpp
index b6d660846..af533ce88 100644
--- a/VirtualRobot/VirtualRobot.cpp
+++ b/VirtualRobot/VirtualRobot.cpp
@@ -21,6 +21,7 @@ namespace VirtualRobot
void init(int &argc, char* argv[], const std::string &appName)
{
globalAppName = appName;
+
std::shared_ptr<VisualizationFactory> v = VisualizationFactory::first(NULL);
if (v)
{
diff --git a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
index 70bdc2ca4..0fda27838 100644
--- a/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
+++ b/VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp
@@ -77,7 +77,7 @@
#endif
#include <GL/gl.h>
-#ifdef SIMOX_USE_SOQT
+#ifdef SIMOX_USE_SoQt
#include <Inventor/Qt/SoQt.h>
#endif
@@ -113,7 +113,7 @@ namespace VirtualRobot
{
SoDB::init();
}
-#ifdef SIMOX_USE_SOQT
+#ifdef SIMOX_USE_SoQt
SoQt::init(argc, argv, appName.c_str());
#endif
// enable Coin3D extension: transparent settings without color
--
GitLab