Fix gui_plugin_interface.h m_logger member and ltsmultimonitor_export.h alias
- Add m_logger member to GuiPluginInterface private section - Create ltsmultimonitor_export.h as alias for lts_multi_monitor_export.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
7 files changed
+19
-1
No files matched your search
Binary file not shown.
@@ -0,0 +1,2 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "lts_multi_monitor_export.h"
|
||||||
@@ -91,9 +91,11 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
|||||||
LtsSessionManager* getSessionManager();
|
LtsSessionManager* getSessionManager();
|
||||||
bool init(const DdsConnectionParams& connParams, const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
bool init(const DdsConnectionParams& connParams, const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
||||||
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList, bool hidden);
|
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList, bool hidden);
|
||||||
|
#ifdef BUILD_RTI
|
||||||
bool init(const dds::domain::DomainParticipant& dp, const DdsConnectionParams& connParams,
|
bool init(const dds::domain::DomainParticipant& dp, const DdsConnectionParams& connParams,
|
||||||
const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
||||||
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList);
|
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList);
|
||||||
|
#endif
|
||||||
void makeVisible();
|
void makeVisible();
|
||||||
|
|
||||||
void setPayloadsEnabled()
|
void setPayloadsEnabled()
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
#include "Lts/Common/ProjectConfig/project_defines.h"
|
||||||
|
|
||||||
namespace LtsSession
|
namespace LtsSession
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -21,6 +23,7 @@ struct DdsConnectionParams
|
|||||||
{
|
{
|
||||||
int domainId = -1;
|
int domainId = -1;
|
||||||
int partitionId = 0;
|
int partitionId = 0;
|
||||||
|
IDL::PartitionType partitionType = IDL::PartitionType::Any;
|
||||||
int exerciseId = 0;
|
int exerciseId = 0;
|
||||||
QUrl tcpConnectionUrl;
|
QUrl tcpConnectionUrl;
|
||||||
QStringList qos_file;
|
QStringList qos_file;
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ class Interface
|
|||||||
QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
|
QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
|
||||||
QStringList m_options;
|
QStringList m_options;
|
||||||
LtsAppDescriptor::App m_appId;
|
LtsAppDescriptor::App m_appId;
|
||||||
|
NGL::INGLLogger& m_logger;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace GuiPluginBase
|
} // namespace GuiPluginBase
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
|
||||||
|
|
||||||
|
#ifndef LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
|
#define LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
@@ -64,3 +67,5 @@ inline std::string replayPartition(int partitionId)
|
|||||||
}
|
}
|
||||||
|
|
||||||
} // namespace IDL
|
} // namespace IDL
|
||||||
|
|
||||||
|
#endif // LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
|
#define LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -69,5 +72,7 @@ inline std::string replayPartition(int partitionId)
|
|||||||
return std::string("srp_") + std::to_string(partitionId);
|
return std::string("srp_") + std::to_string(partitionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace IDL
|
||||||
|
|
||||||
|
#endif // LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H
|
||||||
|
|
||||||
Reference in new issue
Block a user