完全移除了Qt的依赖

This commit is contained in:
jinchao 2025-05-20 15:45:00 +08:00
parent f2970327fa
commit 59d75346ad
8 changed files with 13 additions and 32 deletions

View File

@ -149,12 +149,6 @@ public:
*/ */
void PrepareForExecute(); void PrepareForExecute();
/**
* @brief XML
* @param scenarioXml XML
*/
void AnalyzeScenarioXml(const std::string &scenarioXml);
/** /**
* @brief 仿 * @brief 仿
* @param objectId ID * @param objectId ID
@ -165,7 +159,7 @@ public:
/** /**
* @brief * @brief
*/ */
void Initialize(); void Initialize(uint32_t initialType);
/** /**
* @brief 仿 * @brief 仿

View File

@ -71,6 +71,9 @@ public:
/** /**
* @brief * @brief
* @param XmlPath: std::string类型 * @param XmlPath: std::string类型
* @param initialType: uint32_t类型
* @return true:
* @return false:
*/ */
virtual bool AnalysisScenarioXml(const std::string &XmlPath); virtual bool AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType);
}; };

View File

@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.16)
project(XNCore LANGUAGES CXX) project(XNCore LANGUAGES CXX)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -18,8 +15,6 @@ endif()
file(GLOB DDS_XNIDL_SOURCES_CXX "XNIDL/*.cxx") file(GLOB DDS_XNIDL_SOURCES_CXX "XNIDL/*.cxx")
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Xml Network)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Xml Network)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
@ -71,9 +66,6 @@ add_library(XNCore SHARED
target_link_libraries(XNCore PRIVATE target_link_libraries(XNCore PRIVATE
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Xml
Qt${QT_VERSION_MAJOR}::Network
fastcdr fastcdr
fastdds fastdds
pthread pthread

View File

@ -86,7 +86,7 @@ void XNFramework::SetCpuAffinity(uint32_t cpuAffinity)
d->uCpuAffinity = cpuAffinity; d->uCpuAffinity = cpuAffinity;
} }
void XNFramework::Initialize() void XNFramework::Initialize(uint32_t initialType)
{ {
T_D(); T_D();
LOG_INFO("XNFramework Initialize ..."); LOG_INFO("XNFramework Initialize ...");
@ -127,7 +127,7 @@ void XNFramework::Initialize()
} }
LOG_INFO("XNFramework Initialize Success!"); LOG_INFO("XNFramework Initialize Success!");
LOG_INFO("XNFramework Analyze Scenario Xml ..."); LOG_INFO("XNFramework Analyze Scenario Xml ...");
ret = d->scenarioManager->AnalysisScenarioXml(d->scenarioXml); ret = d->scenarioManager->AnalysisScenarioXml(d->scenarioXml, initialType);
if (!ret) { if (!ret) {
LOG_ERROR("XNFramework Analyze Scenario Xml Failed!"); LOG_ERROR("XNFramework Analyze Scenario Xml Failed!");
return; return;

View File

@ -149,12 +149,6 @@ public:
*/ */
void PrepareForExecute(); void PrepareForExecute();
/**
* @brief XML
* @param scenarioXml XML
*/
void AnalyzeScenarioXml(const std::string &scenarioXml);
/** /**
* @brief 仿 * @brief 仿
* @param objectId ID * @param objectId ID
@ -165,7 +159,7 @@ public:
/** /**
* @brief * @brief
*/ */
void Initialize(); void Initialize(uint32_t initialType);
/** /**
* @brief 仿 * @brief 仿

View File

@ -94,7 +94,7 @@ std::string getFileNameWithoutExt(const std::string &path)
} }
// 运行环境配置文件解析 // 运行环境配置文件解析
bool XNScenarioManager::AnalysisScenarioXml(const std::string &XmlPath) bool XNScenarioManager::AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType)
{ {
T_D(); T_D();
std::ifstream file(XmlPath); std::ifstream file(XmlPath);

View File

@ -71,6 +71,9 @@ public:
/** /**
* @brief * @brief
* @param XmlPath: std::string类型 * @param XmlPath: std::string类型
* @param initialType: uint32_t类型
* @return true:
* @return false:
*/ */
virtual bool AnalysisScenarioXml(const std::string &XmlPath); virtual bool AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType);
}; };

View File

@ -1,11 +1,6 @@
#include "XNServiceManager.h" #include "XNServiceManager.h"
#include "XNServiceManager_p.h" #include "XNServiceManager_p.h"
#include "XNServiceObject.h" #include "XNServiceObject.h"
#include <QLibrary>
#include <QMetaType>
#include <QObject>
#include <dlfcn.h>
#include <filesystem>
XNServiceManager::XNServiceManager() : XNBaseFrameObject(new XNServiceManagerPrivate()) XNServiceManager::XNServiceManager() : XNBaseFrameObject(new XNServiceManagerPrivate())
{ {