KJ135
/
LAMPCAE
mirror of http://172.16.0.12:5000/LAMPSARToolSoftware/LAMPCAE.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. 环境工程移植

LAMPCAE-dev-merge^2
陈增辉 2025-01-11 10:58:48 +08:00
parent 4497e1d260
commit f18d29fbbf
8 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/QtSettings.xml
View File

@ -7,16 +7,16 @@
<entry key="Debug"> <entry key="Debug">
<value> <value>
<PerProfileState> <PerProfileState>
<option name="myQmlPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/qml" /> <option name="myQmlPath" value="$PROJECT_DIR$/../../../../vcpkg/installed/x64-windows/qml" />
<option name="myQtBinPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/tools/qt5/bin" /> <option name="myQtBinPath" value="$PROJECT_DIR$/../../../../vcpkg/installed/x64-windows/tools/qt5/bin" />
</PerProfileState> </PerProfileState>
</value> </value>
</entry> </entry>
<entry key="Release"> <entry key="Release">
<value> <value>
<PerProfileState> <PerProfileState>
<option name="myQmlPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/qml" /> <option name="myQmlPath" value="$PROJECT_DIR$/../../../../vcpkg/installed/x64-windows/qml" />
<option name="myQtBinPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/tools/qt5/bin" /> <option name="myQtBinPath" value="$PROJECT_DIR$/../../../../vcpkg/installed/x64-windows/tools/qt5/bin" />
</PerProfileState> </PerProfileState>
</value> </value>
</entry> </entry>

12
cmake/CMakePack.cmake
View File

@ -1,7 +1,7 @@
# 声明包的名称 # 声明包的名称
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
# 声明包的供应商 # 声明包的供应商
set(CPACK_PACKAGE_VENDOR "中科卫星应用德清研究院") set(CPACK_PACKAGE_VENDOR "青岛数智船海科技有限公司")
# 打包的源代码将包括一个描述文件。这是带有安装说明的纯文本文件 # 打包的源代码将包括一个描述文件。这是带有安装说明的纯文本文件
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
# 添加包的描述 # 添加包的描述
@ -73,15 +73,15 @@ if(WIN32 OR MINGW)
#set(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_SOURCE_DIR}/src/qrc/QUI/HEADERIMAGE.bmp") #set(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_SOURCE_DIR}/src/qrc/QUI/HEADERIMAGE.bmp")
set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_MODIFY_PATH ON)
set(CPACK_NSIS_MUI_FINISHPAGE_RUN ON) set(CPACK_NSIS_MUI_FINISHPAGE_RUN ON)
set(CPACK_NSIS_HELP_LINK "") set(CPACK_NSIS_HELP_LINK "http://www.LAMPCAE.com/index.php?mod=document")
set(CPACK_NSIS_URL_INFO_ABOUT "") set(CPACK_NSIS_URL_INFO_ABOUT "http://www.LAMPCAE.com/index.php?mod=product")
set(CPACK_NSIS_MENU_LINKS "" "CAE网站") set(CPACK_NSIS_MENU_LINKS "http://www.LAMPCAE.com/" "LAMPCAE网站")
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
elseif(WIX_EXECUTABLE) elseif(WIX_EXECUTABLE)
list(APPEND CPACK_GENERATOR "WIX") list(APPEND CPACK_GENERATOR "WIX")
set(CPACK_WIX_PROPERTY_ARPCOMMENTS ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) set(CPACK_WIX_PROPERTY_ARPCOMMENTS ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "") set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "http://www.LAMPCAE.com/index.php?mod=product")
set(CPACK_WIX_PROPERTY_ARPHELPLINK "") set(CPACK_WIX_PROPERTY_ARPHELPLINK "http://www.LAMPCAE.com/")
endif () endif ()
endif() endif()

2
cmake/FindOpenCASCADE.cmake
View File

@ -35,7 +35,7 @@ if(LAMPCAE_OpenCASCADE_ALREADY_INCLUDED)
endif() endif()
set(LAMPCAE_OpenCASCADE_ALREADY_INCLUDED 1) set(LAMPCAE_OpenCASCADE_ALREADY_INCLUDED 1)
set(OpenCASCADE_DIRS "C:/OCCT") set(OpenCASCADE_DIRS ${CMAKE_SOURCE_DIR}/extlib/OCCT)
set(OpenCASCADE_VERSION_MAJOR 7) set(OpenCASCADE_VERSION_MAJOR 7)
set(OpenCASCADE_VERSION_MINOR 6) set(OpenCASCADE_VERSION_MINOR 6)

2
cmake/FindVTK.cmake
View File

@ -36,7 +36,7 @@ endif()
set(LAMPCAE_VTK_ALREADY_INCLUDED 1) set(LAMPCAE_VTK_ALREADY_INCLUDED 1)
#set(VTK_DIRS "${CMAKE_SOURCE_DIR}/extlib/VTK") #set(VTK_DIRS "${CMAKE_SOURCE_DIR}/extlib/VTK")
set(VTK_DIRS "C:/VTK") set(VTK_DIRS ${CMAKE_SOURCE_DIR}/extlib/VTK)
set(VTK_VERSION_MAJOR 9) set(VTK_VERSION_MAJOR 9)
set(VTK_VERSION_MINOR 3) set(VTK_VERSION_MINOR 3)

1
src/MainWidgets/ControlPanel.cpp
View File

@ -49,6 +49,7 @@ namespace MainWidget
MainWidgetPy::init(mainwindow, this, _geometryWidget, _meshWidget, _physicsWidget); MainWidgetPy::init(mainwindow, this, _geometryWidget, _meshWidget, _physicsWidget);
connect(_meshWidget,SIGNAL(ToOCCTItemSIGNAL(MeshData::MeshKernal *)),this,SIGNAL(MeshToGeometrySig(MeshData::MeshKernal *))); connect(_meshWidget,SIGNAL(ToOCCTItemSIGNAL(MeshData::MeshKernal *)),this,SIGNAL(MeshToGeometrySig(MeshData::MeshKernal *)));
} }
ControlPanel::~ControlPanel() ControlPanel::~ControlPanel()

5
src/MainWidgets/ControlPanel.h
View File

@ -30,7 +30,6 @@ namespace DataProperty
namespace PostPlot namespace PostPlot
{ {
class PlotTreeWidget; class PlotTreeWidget;
} }
namespace Post namespace Post
@ -130,8 +129,10 @@ namespace MainWidget
Post::PostInfoWidget *_postInfoWidget{}; Post::PostInfoWidget *_postInfoWidget{};
PostPlot::PlotTreeWidget *_plotTreewidget{}; PostPlot::PlotTreeWidget *_plotTreewidget{};
};
};
} }
#endif #endif

1
src/MainWindow/MainWindow.h
View File

@ -311,7 +311,6 @@ namespace GUI {
// 更新二维曲线模型树 // 更新二维曲线模型树
void updatePlotTreeSig(); void updatePlotTreeSig();
//
// 打开二维曲线绘制信号 // 打开二维曲线绘制信号
void openPlot(); void openPlot();

8
src/MainWindow/SubWindowManager.h
View File

@ -1,6 +1,12 @@
#ifndef _SUBWINDOWMANAGER_H_ /**
* 原始版本来自 FastCAE, 于2024.01.02修改
* 主要管理窗体界面的三维展示窗口等关系
* */
#ifndef _SUBWINDOWMANAGER_H_
#define _SUBWINDOWMANAGER_H_ #define _SUBWINDOWMANAGER_H_
#include "MainWindowAPI.h" #include "MainWindowAPI.h"
#include <QHash> #include <QHash>