From 261cc444d6bb901de3d38d82ef1b71c9e57b657c Mon Sep 17 00:00:00 2001 From: jinchao <383321154@qq.com> Date: Wed, 25 Jun 2025 16:41:27 +0800 Subject: [PATCH] =?UTF-8?q?V0.36.1.250625=5Falpha:=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 23 ++------- Release/XNSetEngine.sh | 2 +- Release/database/XNSim.db | Bin 1224704 -> 1224704 bytes Release/template/CMakeLists.txt.tmp | 52 -------------------- Release/template/Template.cpp.tmp | 47 ------------------ Release/template/Template.h.tmp | 26 ---------- Release/template/Template.mcfg.tmp | 14 ------ Release/template/Template.sce.tmp | 36 -------------- Release/template/Template.scfg.tmp | 11 ----- Release/template/Template_global.h.tmp | 12 ----- Release/template/Template_p.h.tmp | 17 ------- {Release/resource => resource}/XNEngine.png | Bin 12 files changed, 6 insertions(+), 234 deletions(-) delete mode 100755 Release/template/CMakeLists.txt.tmp delete mode 100755 Release/template/Template.cpp.tmp delete mode 100755 Release/template/Template.h.tmp delete mode 100755 Release/template/Template.mcfg.tmp delete mode 100755 Release/template/Template.sce.tmp delete mode 100755 Release/template/Template.scfg.tmp delete mode 100755 Release/template/Template_global.h.tmp delete mode 100755 Release/template/Template_p.h.tmp rename {Release/resource => resource}/XNEngine.png (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 126b2d5..3078d85 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,25 +8,12 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# 如果有全局的依赖，可以在这里查找 -# find_package(SomeGlobalDependency REQUIRED) # 添加子目录 add_subdirectory(XNCore) add_subdirectory(XNEngine) -add_subdirectory(XNMonitor) -add_subdirectory(XNEditor) -add_subdirectory(XNIDLGen) -add_subdirectory(XNSysMonitor) -add_subdirectory(XNWrapper) -add_subdirectory(XNRunner) -add_subdirectory(XNPortal) - -# 如果需要，可以在这里设置全局的目标属性或自定义命令 -# 例如，设置全局的编译选项或定义 -# add_compile_options(-Wall -Wextra) - -# 如果需要在顶层进行一些全局的链接或设置，可以在这里进行 -# 例如，链接全局的库 -# target_link_libraries(MyGlobalTarget PRIVATE SomeGlobalLibrary) - +add_subdirectory(Login) +add_subdirectory(XNInterfaceGenServer) +add_subdirectory(XNModelGenServer) +add_subdirectory(XNServiceGenServer) +add_subdirectory(XNMonitorServer) diff --git a/Release/XNSetEngine.sh b/Release/XNSetEngine.sh index 4167466..3b71cd5 100755 --- a/Release/XNSetEngine.sh +++ b/Release/XNSetEngine.sh @@ -1,5 +1,5 @@ #!/bin/bash CURRENT_PATH=$(pwd) -gio set -t string $CURRENT_PATH/XNEngine "metadata::custom-icon" "file://$CURRENT_PATH/resource/XNEngine.png" +gio set -t string $CURRENT_PATH/XNEngine "metadata::custom-icon" "file://$CURRENT_PATH/../resource/XNEngine.png" sudo setcap cap_sys_nice+ep $CURRENT_PATH/XNEngine diff --git a/Release/database/XNSim.db b/Release/database/XNSim.db index 4d78ac8718f7ab68b9c0983c899876307f1851fb..478379f7b035cdfc1fbf5bfa473a2b04872dd92b 100644 GIT binary patch delta 227 zcmZp8;MMTJYl1YR{6raNM)}5stqF`v`~}#!wleVT;ZxvM;r_zS%C&W~puj?|0KaGs zNkws4Lql-`J!3OHLn8wtQ(XfyT_e-PoPvx*Lo+KALn{O0XS26Fo3iuy>~&A~PJO<6 z^0Rp@m?DWOxtV$GtkI0yS)-Z$PhpPcQJl{HfoVPykK*=aADAk+r|bM-;$$+6ZU@pp t%nZaVK+FonY(UHo#2i4(3B+7L%nigmK+Frod_c?(!~)xO{s>;#3;>qTTND5Q delta 136 zcmZp8;MMTJYl1YR+(a2?M!Cj>tqF`v{P|e9SsD2D@G0=BaDU-u-7F~ZnX8>OnsGa8 zG}Hen%uzf#)7d{T&ELM_15+jU!~ouQoj*)K%nZaVK+FonY(UHo#2i4(3B+7L%nigm UKnzmP2gLk9EU;bYkKmQf0EvS$o&W#< diff --git a/Release/template/CMakeLists.txt.tmp b/Release/template/CMakeLists.txt.tmp deleted file mode 100755 index 2a8f6d0..0000000 --- a/Release/template/CMakeLists.txt.tmp +++ /dev/null @@ -1,52 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -project(Template LANGUAGES CXX) - -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# 获取环境变量 -if(DEFINED ENV{XNCore}) - set(XNCore_PATH $ENV{XNCore}) -else() - message(FATAL_ERROR "Environment variable XNCore is not set.") -endif() - -# 添加 XNCore_PATH 下的 include 目录为包含目录 -include_directories(${XNCore_PATH}/include) - -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) - -add_library(Template SHARED - Template_global.h - Template.cpp - Template.h - Template_p.h -) - -target_link_libraries(Template PRIVATE - Qt${QT_VERSION_MAJOR}::Core - ${XNCore_PATH}/lib/libXNCore.so) - -target_compile_definitions(Template PRIVATE TEMPLATE_LIBRARY) - -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${XNCore_PATH}/Models" CACHE PATH "Install path prefix" FORCE) -endif() - -include(GNUInstallDirs) -install(TARGETS Template - BUNDLE DESTINATION . - LIBRARY DESTINATION . - RUNTIME DESTINATION . -) - -# 添加自定义命令和目标以拷贝配置文件 -file(GLOB CONFIG_FILE "*.mcfg") - -# 使用 install 命令在安装时拷贝配置文件 -install(FILES ${CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}) \ No newline at end of file diff --git a/Release/template/Template.cpp.tmp b/Release/template/Template.cpp.tmp deleted file mode 100755 index 4a22975..0000000 --- a/Release/template/Template.cpp.tmp +++ /dev/null @@ -1,47 +0,0 @@ -#include "Template.h" -#include "Template_p.h" -#include -#include - -XN_REGISTER_PARTICIPANT_BEGIN(Template) -XN_REGISTER_PARTICIPANT_END(Template) - -Template::Template(QObject *parent) : XNModelObject(*new TemplatePrivate(this), parent) -{ -} - -Template::~Template() -{ -} - -Template::Template(TemplatePrivate &dd, QObject *parent) : XNModelObject(dd, parent) -{ -} - -void Template::OnInitialize() -{ - Q_D(Template); - XNModelObject::OnInitialize(); - if (d->_dynamicLib) { - d->_fun = reinterpret_cast(d->_dynamicLib->resolve("EntryPoint")); - } - //add other initial code here -} - -void Template::OnPrepareForExecute() -{ - Q_D(Template); - XNModelObject::OnPrepareForExecute(); - //add your initial data code here -} - -void Template::StepUpdate() -{ - Q_D(Template); - XNModelObject::StepUpdate(); - if (d->_fun) { - //add your input code here - d->_fun(&d->_data); - //add your output code here - } -} diff --git a/Release/template/Template.h.tmp b/Release/template/Template.h.tmp deleted file mode 100755 index 4bdac13..0000000 --- a/Release/template/Template.h.tmp +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include "Template_global.h" -#include - -class TemplatePrivate; - -class TEMPLATE_EXPORT Template : public XNModelObject -{ - Q_OBJECT - Q_DISABLE_COPY(Template) - Q_DECLARE_PRIVATE(Template) - XN_DECLARE_DDS() -public: - explicit Template(QObject *parent = nullptr); - virtual ~Template(); - -protected: - Template(TemplatePrivate &dd, QObject *parent = nullptr); - -public slots: - virtual void OnInitialize() override; - virtual void OnPrepareForExecute() override; - -public: - virtual void StepUpdate() override; -}; diff --git a/Release/template/Template.mcfg.tmp b/Release/template/Template.mcfg.tmp deleted file mode 100755 index f23ab65..0000000 --- a/Release/template/Template.mcfg.tmp +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Release/template/Template.sce.tmp b/Release/template/Template.sce.tmp deleted file mode 100755 index cf385c4..0000000 --- a/Release/template/Template.sce.tmp +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Release/template/Template.scfg.tmp b/Release/template/Template.scfg.tmp deleted file mode 100755 index 196fa7d..0000000 --- a/Release/template/Template.scfg.tmp +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Release/template/Template_global.h.tmp b/Release/template/Template_global.h.tmp deleted file mode 100755 index 0a97bb0..0000000 --- a/Release/template/Template_global.h.tmp +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef TEMPLATE_GLOBAL_H -#define TEMPLATE_GLOBAL_H - -#include - -#if defined(TEMPLATE_LIBRARY) -#define TEMPLATE_EXPORT Q_DECL_EXPORT -#else -#define TEMPLATE_EXPORT Q_DECL_IMPORT -#endif - -#endif // TEMPLATE_GLOBAL_H diff --git a/Release/template/Template_p.h.tmp b/Release/template/Template_p.h.tmp deleted file mode 100755 index 2ff863e..0000000 --- a/Release/template/Template_p.h.tmp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once -#include -#include "MathHeaderPath" - -typedef void (*FunctionType)(MathEntryParam *); - -class TemplatePrivate : public XNModelObjectPrivate -{ -public: - Q_DECLARE_PUBLIC(Template) - - TemplatePrivate(Template *q) : XNModelObjectPrivate(q) {} - - FunctionType _fun; - - MathEntryParam _data; -}; diff --git a/Release/resource/XNEngine.png b/resource/XNEngine.png similarity index 100% rename from Release/resource/XNEngine.png rename to resource/XNEngine.png