diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml index ba715ef..ba30479 100644 --- a/.idea/QtSettings.xml +++ b/.idea/QtSettings.xml @@ -7,16 +7,16 @@ - - diff --git a/.idea/editor.xml b/.idea/editor.xml index f7bb51e..7b63cd0 100644 --- a/.idea/editor.xml +++ b/.idea/editor.xml @@ -1,6 +1,111 @@ + \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a24efcd..cde7876 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,7 +93,7 @@ install( LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT lib ) -list(APPEND _plugins PluginAddTree PluginCustomizer PluginMeshDataExchange PluginWBFZExchangePlugin PluginMotorBike PluginRasterTool ) +list(APPEND _plugins PluginAddTree PluginLAMPScatterProcess PluginCustomizer PluginMeshDataExchange PluginWBFZExchangePlugin PluginMotorBike PluginRasterTool ) foreach(_plugin ${_plugins}) list(APPEND LAMPCAE_Runtimes_Libraries ${LAMPCAE_${_plugin}_Runtimes_Libraries}) diff --git a/src/GeometryWidgets/SketchPointWidget.cpp b/src/GeometryWidgets/SketchPointWidget.cpp index b02da5b..98afc25 100644 --- a/src/GeometryWidgets/SketchPointWidget.cpp +++ b/src/GeometryWidgets/SketchPointWidget.cpp @@ -1,16 +1,16 @@ /** * @file SketchPointWidget.cpp * @brief 草绘模式点输入对话框类的源文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 15:13 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/SketchPointWidget.h b/src/GeometryWidgets/SketchPointWidget.h index a0c07af..9308ed7 100644 --- a/src/GeometryWidgets/SketchPointWidget.h +++ b/src/GeometryWidgets/SketchPointWidget.h @@ -1,16 +1,16 @@ /** * @file SketchPointWidget.h * @brief 草绘模式点输入对话框类的头文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 15:12 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/dialogBoolOperation.cpp b/src/GeometryWidgets/dialogBoolOperation.cpp index 834e89b..fea8d05 100644 --- a/src/GeometryWidgets/dialogBoolOperation.cpp +++ b/src/GeometryWidgets/dialogBoolOperation.cpp @@ -1,16 +1,16 @@ /** * @file dialogBoolOperation.cpp * @brief 布尔操作对话框源文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-28 18:38 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/dialogBoolOperation.h b/src/GeometryWidgets/dialogBoolOperation.h index 934d59a..9d41f71 100644 --- a/src/GeometryWidgets/dialogBoolOperation.h +++ b/src/GeometryWidgets/dialogBoolOperation.h @@ -1,16 +1,16 @@ /** * @file dialogBoolOperation.h * @brief 布尔操作对话框头文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-28 18:38 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/dialogCreateLine.cpp b/src/GeometryWidgets/dialogCreateLine.cpp index d0478ce..7e7bc3e 100644 --- a/src/GeometryWidgets/dialogCreateLine.cpp +++ b/src/GeometryWidgets/dialogCreateLine.cpp @@ -50,7 +50,7 @@ namespace GeometryWidget on_radioButtonUser(); this->translateButtonBox(_ui->buttonBox); - _startPoint = new GeoPointWidget(_mainWindow, _preWindow); + _startPoint = new GeoPointWidget(_mainWindow, _preWindow); // 点选择界面模块 _endPoint = new GeoPointWidget(_mainWindow, _preWindow); _ui->verticalLayout->addWidget(_startPoint); _ui->ptlayout->addWidget(_endPoint); diff --git a/src/GeometryWidgets/dialogCreateLine.ui b/src/GeometryWidgets/dialogCreateLine.ui index 062c4d5..1637781 100644 --- a/src/GeometryWidgets/dialogCreateLine.ui +++ b/src/GeometryWidgets/dialogCreateLine.ui @@ -86,7 +86,7 @@ - 1 + 0 diff --git a/src/GeometryWidgets/geoDialogBase.cpp b/src/GeometryWidgets/geoDialogBase.cpp index 0f307fb..67ca692 100644 --- a/src/GeometryWidgets/geoDialogBase.cpp +++ b/src/GeometryWidgets/geoDialogBase.cpp @@ -1,16 +1,16 @@ /** * @file geoDialogBase.cpp * @brief 几何操作对话框基类源文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-28 18:17 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/geoDialogBase.h b/src/GeometryWidgets/geoDialogBase.h index 61f24c0..79f7f5d 100644 --- a/src/GeometryWidgets/geoDialogBase.h +++ b/src/GeometryWidgets/geoDialogBase.h @@ -1,16 +1,16 @@ /** * @file geoDialogBase.h * @brief 几何操作对话框基类头文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-28 18:16 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/geoPointWidget.cpp b/src/GeometryWidgets/geoPointWidget.cpp index 18e77bf..6f8b72a 100644 --- a/src/GeometryWidgets/geoPointWidget.cpp +++ b/src/GeometryWidgets/geoPointWidget.cpp @@ -1,16 +1,16 @@ /** * @file geoPointWidget.cpp * @brief 自定义三维坐标点拾取部件类源文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 14:24 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * @@ -19,6 +19,11 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. * ================================================================================== + * 中科卫星应用德清研究院 修改此文件，并调整高亮点部分 + * + * + * + * =================================================================================== */ #include "geoPointWidget.h" #include "ui_geoPointWidget.h" @@ -75,7 +80,7 @@ namespace GeometryWidget void GeoPointWidget::on_geoSelectPoint_clicked() { - emit setSelectMode(int(ModuleBase::GeometryPoint)); + emit setSelectMode(int(ModuleBase::GeometryPoint)); // 高亮 emit buttonCkicked(this); } diff --git a/src/GeometryWidgets/geoPointWidget.h b/src/GeometryWidgets/geoPointWidget.h index fae51a8..70e608c 100644 --- a/src/GeometryWidgets/geoPointWidget.h +++ b/src/GeometryWidgets/geoPointWidget.h @@ -1,16 +1,16 @@ /** * @file geoPointWidget.h * @brief 自定义三维坐标点拾取部件类头文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 14:23 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/geometryDialogFactory.cpp b/src/GeometryWidgets/geometryDialogFactory.cpp index 0dc6bd8..104a2c7 100644 --- a/src/GeometryWidgets/geometryDialogFactory.cpp +++ b/src/GeometryWidgets/geometryDialogFactory.cpp @@ -1,16 +1,16 @@ /** * @file geometryDialogFactory.cpp * @brief 几何相关对话框的工厂类源文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 14:06 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/GeometryWidgets/geometryDialogFactory.h b/src/GeometryWidgets/geometryDialogFactory.h index 3be3f4b..e74150e 100644 --- a/src/GeometryWidgets/geometryDialogFactory.h +++ b/src/GeometryWidgets/geometryDialogFactory.h @@ -1,16 +1,16 @@ /** * @file geometryDialogFactory.h * @brief 几何相关对话框的工厂类头文件 - * @author LAMPCAE研发小组(LAMPCAE@diso.cn) + * @author FastCAE研发小组(FastCAE@diso.cn) * @version 2.5.0 * @date 2022-03-29 14:05 * @copyright Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. * * ============================================================================ - * Program: LAMPCAE + * Program: FastCAE * * Copyright (c) Since 2020 青岛数智船海科技有限公司 All rights reserved. - * See License or http://www.LAMPCAE.com/ for details. + * See License or http://www.FastCAE.com/ for details. * * BSD 3-Clause License * diff --git a/src/MainWidgets/geometryViewProvider.h b/src/MainWidgets/geometryViewProvider.h index 8b6a66d..c1d740b 100644 --- a/src/MainWidgets/geometryViewProvider.h +++ b/src/MainWidgets/geometryViewProvider.h @@ -6,6 +6,11 @@ #include #include "ModuleBase/ModuleType.h" +/** + * 几何显示代理 + * */ + + class vtkActor; class vtkPolyData; diff --git a/src/MainWindow/MainWindow.cpp b/src/MainWindow/MainWindow.cpp index 5dc6843..db48218 100644 --- a/src/MainWindow/MainWindow.cpp +++ b/src/MainWindow/MainWindow.cpp @@ -508,7 +508,13 @@ namespace GUI { connect(_ui->actionRFPCSimulationProcess,SIGNAL(triggered()), this,SLOT(on_action_simulation())); // 绑定散射实验数据加载 - //connect(_ui->action_LoadLaboratoryScatterResult,SIGNAL(triggered()), this,SLOT(on_actionLoadLaboratoryScatterResult_triggereds())); + connect(_ui->action_LoadLaboratoryScatterResult,SIGNAL(triggered()), this,SLOT(on_actionLoadLaboratoryScatterResult_triggereds())); + + // 微波测量仿真分系统专用软件菜单调整 + + + + } @@ -1869,7 +1875,7 @@ namespace GUI { void MainWindow::on_actionLoadLaboratoryScatterResult_triggereds() { DebugInfo("on_actionLoadLaboratoryScatterResult_triggered\n"); - //emit this->on_action_LoadLaboratoryScatterResultSIGN(this); + emit this->on_action_LoadLaboratoryScatterResultSIGN(this); } void MainWindow::on_saveMeshEdit() diff --git a/src/MainWindow/MainWindow.h b/src/MainWindow/MainWindow.h index db47516..d45b341 100644 --- a/src/MainWindow/MainWindow.h +++ b/src/MainWindow/MainWindow.h @@ -368,10 +368,29 @@ namespace GUI { void on_actionAddTreeClickedSIG(GUI::MainWindow* m); + // 微波测量仿真分系统 + // 加载室内散射测量结果文件信号 + void on_action_LoadLaboratoryScatterResultSIGN(GUI::MainWindow* m); + // 条带成像模式 + void on_actionFEKOImageSetting_StripImage_SIGNAL(); + // 扫描成像模式 + void on_actionFEKOImageSetting_SCaneImage_SIGNAL(); + // ISAR成像模式 + void on_actionFEKOImageSetting_ISARImage_SIGNAL(); + // 圆迹成像模式 + void on_actionFEKOImageSetting_CircleImage_SIGNAL(); + // 导入室内成像测量数据 + void on_actionImportRoomMeasurementImage_SIGNAL(); + + + + + public slots: - void on_actionEditSelectDialog(); + + void on_actionEditSelectDialog(); void on_actionCreateLoadModelScript(); diff --git a/src/MainWindow/MainWindow.ui b/src/MainWindow/MainWindow.ui index 70d3554..fc2223d 100644 --- a/src/MainWindow/MainWindow.ui +++ b/src/MainWindow/MainWindow.ui @@ -9,15 +9,15 @@ 0 0 - 1321 - 900 + 1094 + 734 WBCLFZ_CAE - + :/QUI/main.ico:/QUI/main.ico @@ -272,8 +272,8 @@ 0 0 - 1321 - 23 + 1094 + 22 @@ -334,7 +334,7 @@ Language - + :/QUI/icon/language.png:/QUI/icon/language.png @@ -513,7 +513,7 @@ PCLFilter - + :/PointCloudProcess/PointCloudProcess/images/algorithm/filter.png:/PointCloudProcess/PointCloudProcess/images/algorithm/filter.png @@ -526,7 +526,7 @@ reSurfaceMesh - + :/PointCloudProcess/PointCloudProcess/images/algorithm/tree.png:/PointCloudProcess/PointCloudProcess/images/algorithm/tree.png @@ -1119,96 +1119,228 @@ 森林目标制备模块 - - - - - - - - + + + + 森林目标模拟 + + + + + + + + + + + + + + + + + 农作物目标制备模块 + + + + 农作物目标模拟 + + + + + + + + + + 草地目标制备模块 + + + + 草地目标模拟 + + + + + + + + 水体目标制备模块 + + + 水体目标模拟 + + + + + + + + + + + 土壤目标制备模块 + + + + 土壤目标模拟 + + + + + + + + 动态水体目标制备模块 + + + 动态水体目标模拟 + + + + + + + + 道路目标制备模块 + + + 道路目标模拟 + + + + + + + + + 人工目标制备模块 + + + 人工目标模拟 + + + + + + + + + + 几何校正场景制备模块 + + + + 几何校正场景模拟 + + + + + + + + + 辐射定标场景制备模块 + + + 辐射定标场景模拟 + + + + + + + + + 陆地场景制备模块 + + + + 陆地场景模拟 + + @@ -1221,19 +1353,43 @@ + + + + + + + 水体场景制备模块 + + + + 水体场景模拟 + + + + + + + + 植被场景制备模块 + + + 植被场景模拟 + + @@ -1246,12 +1402,11 @@ - - - 硬件设备 - - - + + + + + @@ -1268,7 +1423,6 @@ - @@ -1280,10 +1434,10 @@ + + - - @@ -1292,10 +1446,10 @@ + + - - @@ -1304,10 +1458,10 @@ + + - - @@ -1316,9 +1470,10 @@ + + - - + @@ -1327,10 +1482,10 @@ + + - - @@ -1339,10 +1494,10 @@ + + - - @@ -1351,10 +1506,10 @@ + + - - @@ -1363,10 +1518,10 @@ + + - - @@ -1375,10 +1530,10 @@ + + - - @@ -1387,10 +1542,10 @@ + + - - @@ -1399,10 +1554,10 @@ + + - - @@ -1411,10 +1566,10 @@ + + - - @@ -1423,10 +1578,10 @@ + + - - @@ -1444,7 +1599,6 @@ - @@ -1454,143 +1608,195 @@ 森林目标仿真分析模块 - + + + + + + - 农作物目标仿真分析模块 - + + + + + + - 草地目标仿真分析模块 - + + + + + + - 水体目标仿真分析模块 - + + + + + + - 土壤目标仿真分析模块 - + + + + + + - 动态水体目标仿真分析模块 - + + + + + + - 道路目标仿真分析模块 - + + + + + + - 人工目标仿真分析模块 - + + + + + + - 几何校正场景仿真分析模块 - + + + + + + - 辐射定标场景仿真分析模块 - + + + + + + - 陆地场景仿真分析模块 - + + + + + + - 水体场景仿真分析模块 - + + + + + + - 植被场景仿真分析模块 - + + + + + + - @@ -1608,6 +1814,7 @@ + @@ -1712,6 +1919,213 @@ 点云构树 + + + + true + + + 森林目标结构参数记录 + + + + + + true + + + 森林目标理化特性记录 + + + + + + + + true + + + 农作物目标结构参数记录 + + + + + + true + + + 农作物目标理化特性记录 + + + + + + true + + + 草地目标结构参数记录 + + + + + + true + + + 草地目标理化特性记录 + + + + + + + true + + + 水体目标盐度记录 + + + + + + + true + + + 土壤粗糙度参数记录 + + + + + + true + + + 土壤湿度参数记录 + + + + + + + true + + + 水体表面风速参数记录 + + + + + + true + + + 水体表面浪高记录 + + + + + + + + true + + + 路面粗糙度参数记录 + + + + + + true + + + 三维结构数据记录 + + + + + + + + true + + + 几何校正参数记录 + + + + + + true + + + 辐射校正参数记录 + + + + + + true + + + 陆表粗糙度参数记录 + + + + + + true + + + 陆表湿度参数记录 + + + + + + true + + + 水体表面风速记录 + + + + + + true + + + 水体表面浪高记录 + + + + + + + true + + + 森林场景结构参数记录 + + + + + + true + + + 森林场景理化特性记录 + + + + + + + + + + 加载预制农作物网格数据 @@ -1774,17 +2188,17 @@ - 微波测量仿真分系统散射仿真参数设置 + 后向散射特性计算任务参数设置 - 加载散射仿真结果 + 预处理后向散射特性计算任务结果 - 后向散射特性计算并导出 + 导出后向散射特性计算结果 @@ -1807,9 +2221,39 @@ 仿真成像结果 + + + 条带成像仿真设置 + + + + + 扫描成像仿真设置 + + + + + ISAR成像仿真设置 + + + + + 圆迹成像仿真设置 + + + + + 导入室内测量仿真成像结果 + + + + + 大场景仿真 + + - + :/QUI/icon/createNew.png:/QUI/icon/createNew.png @@ -1824,7 +2268,7 @@ - + :/QUI/icon/open.png:/QUI/icon/open.png @@ -1842,7 +2286,7 @@ false - + :/QUI/icon/save.png:/QUI/icon/save.png @@ -1854,7 +2298,7 @@ - + :/QUI/icon/stop.png:/QUI/icon/stop.png @@ -1872,7 +2316,7 @@ false - + :/QUI/icon/saveAs.png:/QUI/icon/saveAs.png @@ -1887,7 +2331,7 @@ true - + :/QUI/icon/chinese_language.png:/QUI/icon/chinese_language.png @@ -1902,7 +2346,7 @@ true - + :/QUI/icon/english_language.png:/QUI/icon/english_language.png @@ -1914,7 +2358,7 @@ - + :/QUI/icon/importMesh.png:/QUI/icon/importMesh.png @@ -1926,7 +2370,7 @@ - + :/QUI/icon/importGeometry.png:/QUI/icon/importGeometry.png @@ -1938,7 +2382,7 @@ - + :/QUI/icon/open.png:/QUI/icon/open.png @@ -1950,7 +2394,7 @@ false - + :/QUI/icon/solve.png:/QUI/icon/solve.png @@ -1962,7 +2406,7 @@ - + :/QUI/icon/setting.png:/QUI/icon/setting.png @@ -1974,7 +2418,7 @@ false - + :/QUI/icon/xPlus.png:/QUI/icon/xPlus.png @@ -1986,7 +2430,7 @@ false - + :/QUI/icon/xMinus.png:/QUI/icon/xMinus.png @@ -1998,7 +2442,7 @@ false - + :/QUI/icon/yPlus.png:/QUI/icon/yPlus.png @@ -2010,7 +2454,7 @@ false - + :/QUI/icon/yMinus.png:/QUI/icon/yMinus.png @@ -2022,7 +2466,7 @@ false - + :/QUI/icon/zPlus.png:/QUI/icon/zPlus.png @@ -2034,7 +2478,7 @@ false - + :/QUI/icon/zMinus.png:/QUI/icon/zMinus.png @@ -2046,7 +2490,7 @@ false - + :/QUI/icon/fit.png:/QUI/icon/fit.png @@ -2064,7 +2508,7 @@ false - + :/QUI/icon/selectOff.png:/QUI/icon/selectOff.png @@ -2079,7 +2523,7 @@ false - + :/QUI/icon/selectNode.png:/QUI/icon/selectNode.png @@ -2094,7 +2538,7 @@ false - + :/QUI/icon/selectElement.png:/QUI/icon/selectElement.png @@ -2103,7 +2547,7 @@ - + :/QUI/icon/solve.png:/QUI/icon/solve.png @@ -2112,7 +2556,7 @@ - + :/QUI/icon/graphOption.png:/QUI/icon/graphOption.png @@ -2124,7 +2568,7 @@ false - + :/QUI/icon/surfaceMesh.png:/QUI/icon/surfaceMesh.png @@ -2136,7 +2580,7 @@ false - + :/QUI/icon/solidMesh.png:/QUI/icon/solidMesh.png @@ -2148,11 +2592,11 @@ false - + :/QUI/icon/exportMesh.png:/QUI/icon/exportMesh.png - Export Mesh + 导出网格 Ctrl+Shift+M @@ -2166,7 +2610,7 @@ true - + :/QUI/icon/help.png:/QUI/icon/help.png @@ -2175,7 +2619,7 @@ - + :/QUI/icon/about_us.png:/QUI/icon/about_us.png @@ -2190,7 +2634,7 @@ false - + :/QUI/icon/node.png:/QUI/icon/node.png @@ -2208,7 +2652,7 @@ false - + :/QUI/icon/wireFrame.png:/QUI/icon/wireFrame.png @@ -2223,7 +2667,7 @@ false - + :/QUI/icon/face.png:/QUI/icon/face.png @@ -2235,7 +2679,7 @@ false - + :/QUI/icon/meshComponent.png:/QUI/icon/meshComponent.png @@ -2244,7 +2688,7 @@ - + :/QUI/window/2dplot.png:/QUI/window/2dplot.png @@ -2253,7 +2697,7 @@ - + :/QUI/window/3dgraph.png:/QUI/window/3dgraph.png @@ -2262,7 +2706,7 @@ - + :/QUI/icon/saveScript.png:/QUI/icon/saveScript.png @@ -2271,7 +2715,7 @@ - + :/QUI/icon/execScript.png:/QUI/icon/execScript.png @@ -2286,7 +2730,7 @@ false - + :/QUI/icon/solumationsetting.png:/QUI/icon/solumationsetting.png @@ -2295,7 +2739,7 @@ - + :/QUI/icon/saveImage.png:/QUI/icon/saveImage.png @@ -2310,7 +2754,7 @@ false - + :/QUI/icon/boxNode.png:/QUI/icon/boxNode.png @@ -2325,7 +2769,7 @@ false - + :/QUI/icon/boxCell.png:/QUI/icon/boxCell.png @@ -2334,7 +2778,7 @@ - + :/QUI/window/startpage.png:/QUI/window/startpage.png @@ -2343,7 +2787,7 @@ - + :/QUI/window/preWindow.png:/QUI/window/preWindow.png @@ -2365,7 +2809,7 @@ - + :/QUI/geometry/box.png:/QUI/geometry/box.png @@ -2374,7 +2818,7 @@ - + :/QUI/geometry/cylinder.png:/QUI/geometry/cylinder.png @@ -2383,7 +2827,7 @@ - + :/QUI/geometry/sphere.png:/QUI/geometry/sphere.png @@ -2392,7 +2836,7 @@ - + :/QUI/geometry/chamfer.png:/QUI/geometry/chamfer.png @@ -2401,7 +2845,7 @@ - + :/QUI/geometry/fillet.png:/QUI/geometry/fillet.png @@ -2410,7 +2854,7 @@ - + :/QUI/geometry/cut.png:/QUI/geometry/cut.png @@ -2419,7 +2863,7 @@ - + :/QUI/geometry/fuse.png:/QUI/geometry/fuse.png @@ -2428,7 +2872,7 @@ - + :/QUI/geometry/common.png:/QUI/geometry/common.png @@ -2437,7 +2881,7 @@ - + :/QUI/geometry/undo.png:/QUI/geometry/undo.png @@ -2449,7 +2893,7 @@ - + :/QUI/geometry/redo.png:/QUI/geometry/redo.png @@ -2461,7 +2905,7 @@ - + :/QUI/icon/exportGeometry.png:/QUI/icon/exportGeometry.png @@ -2473,7 +2917,7 @@ - + :/QUI/geometry/cone.png:/QUI/geometry/cone.png @@ -2482,7 +2926,7 @@ - + :/QUI/geometry/mirror.png:/QUI/geometry/mirror.png @@ -2491,7 +2935,7 @@ - + :/QUI/geometry/variableFillet.png:/QUI/geometry/variableFillet.png @@ -2500,7 +2944,7 @@ - + :/QUI/geometry/extrude.png:/QUI/geometry/extrude.png @@ -2509,7 +2953,7 @@ - + :/QUI/geometry/point.png:/QUI/geometry/point.png @@ -2518,7 +2962,7 @@ - + :/QUI/geometry/line.png:/QUI/geometry/line.png @@ -2527,7 +2971,7 @@ - + :/QUI/geometry/face.png:/QUI/geometry/face.png @@ -2536,7 +2980,7 @@ - + :/QUI/geometry/move.png:/QUI/geometry/move.png @@ -2545,7 +2989,7 @@ - + :/QUI/geometry/Rotate.png:/QUI/geometry/Rotate.png @@ -2554,7 +2998,7 @@ - + :/QUI/geometry/revolve.png:/QUI/geometry/revolve.png @@ -2563,7 +3007,7 @@ - + :/QUI/geometry/loft.png:/QUI/geometry/loft.png @@ -2572,7 +3016,7 @@ - + :/QUI/icon/datumPlane.png:/QUI/icon/datumPlane.png @@ -2584,7 +3028,7 @@ false - + :/QUI/icon/sketchLine.png:/QUI/icon/sketchLine.png @@ -2596,7 +3040,7 @@ false - + :/QUI/icon/sketchRectangle.png:/QUI/icon/sketchRectangle.png @@ -2608,7 +3052,7 @@ false - + :/QUI/icon/sketchCircle.png:/QUI/icon/sketchCircle.png @@ -2620,7 +3064,7 @@ true - + :/QUI/icon/createSketch.png:/QUI/icon/createSketch.png @@ -2635,7 +3079,7 @@ true - + :/QUI/icon/sketchArc.png:/QUI/icon/sketchArc.png @@ -2644,7 +3088,7 @@ - + :/QUI/icon/sketchPolyLine.png:/QUI/icon/sketchPolyLine.png @@ -2653,7 +3097,7 @@ - + :/QUI/geometry/matrix.png:/QUI/geometry/matrix.png @@ -2665,7 +3109,7 @@ - + :/QUI/geometry/sweep.png:/QUI/geometry/sweep.png @@ -2674,7 +3118,7 @@ - + :/QUI/icon/sketchSpline.png:/QUI/icon/sketchSpline.png @@ -2689,7 +3133,7 @@ false - + :/QUI/geometry/pointDisplay.png:/QUI/geometry/pointDisplay.png @@ -2704,7 +3148,7 @@ false - + :/QUI/geometry/edgeDisplay.png:/QUI/geometry/edgeDisplay.png @@ -2719,7 +3163,7 @@ true - + :/QUI/geometry/facedisplay.png:/QUI/geometry/facedisplay.png @@ -2731,7 +3175,7 @@ true - + :/QUI/geometry/selectpoint.png:/QUI/geometry/selectpoint.png @@ -2743,7 +3187,7 @@ true - + :/QUI/geometry/selectwire.png:/QUI/geometry/selectwire.png @@ -2755,7 +3199,7 @@ true - + :/QUI/geometry/selectface.png:/QUI/geometry/selectface.png @@ -2767,7 +3211,7 @@ true - + :/QUI/geometry/selectbody.png:/QUI/geometry/selectbody.png @@ -2776,7 +3220,7 @@ - + :/QUI/icon/pluginManager.png:/QUI/icon/pluginManager.png @@ -2794,7 +3238,7 @@ true - + :/QUI/icon/userguidance.png:/QUI/icon/userguidance.png @@ -2803,7 +3247,7 @@ - + :/QUI/geometry/geoMeasure.png:/QUI/geometry/geoMeasure.png @@ -2817,7 +3261,7 @@ - + :/QUI/geometry/geoSSplit.png:/QUI/geometry/geoSSplit.png @@ -2829,7 +3273,7 @@ false - + :/QUI/geometry/geoComponent.png:/QUI/geometry/geoComponent.png @@ -2841,7 +3285,7 @@ false - + :/QUI/icon/meshFluid.png:/QUI/icon/meshFluid.png @@ -2853,7 +3297,7 @@ false - + :/QUI/icon/meshFilter.png:/QUI/icon/meshFilter.png @@ -2862,7 +3306,7 @@ - + :/QUI/geometry/geoFillHole.png:/QUI/geometry/geoFillHole.png @@ -2871,7 +3315,7 @@ - + :/QUI/geometry/geoRemoveFace.png:/QUI/geometry/geoRemoveFace.png @@ -2880,7 +3324,7 @@ - + :/QUI/geometry/geoFixSurface.png:/QUI/geometry/geoFixSurface.png @@ -2895,7 +3339,7 @@ false - + :/QUI/icon/meshmodeling.png:/QUI/icon/meshmodeling.png @@ -2904,7 +3348,7 @@ - + :/QUI/icon/vector.png:/QUI/icon/vector.png @@ -2929,7 +3373,7 @@ - + :/QUI/post/open.png:/QUI/post/open.png @@ -2938,7 +3382,7 @@ - + :/QUI/post/rep_point.png:/QUI/post/rep_point.png @@ -2947,7 +3391,7 @@ - + :/QUI/post/rep_wireFrame.png:/QUI/post/rep_wireFrame.png @@ -2956,7 +3400,7 @@ - + :/QUI/post/rep_surface.png:/QUI/post/rep_surface.png @@ -2965,7 +3409,7 @@ - + :/QUI/post/rep_surfaceWithEdge.png:/QUI/post/rep_surfaceWithEdge.png @@ -2974,7 +3418,7 @@ - + :/QUI/post/vector.png:/QUI/post/vector.png @@ -2983,7 +3427,7 @@ - + :/QUI/post/clip.png:/QUI/post/clip.png @@ -2992,7 +3436,7 @@ - + :/QUI/post/slice.png:/QUI/post/slice.png @@ -3001,7 +3445,7 @@ - + :/QUI/post/streamline.png:/QUI/post/streamline.png @@ -3010,7 +3454,7 @@ - + :/QUI/post/isocurve.png:/QUI/post/isocurve.png @@ -3019,7 +3463,7 @@ - + :/QUI/post/isosurf.png:/QUI/post/isosurf.png @@ -3028,7 +3472,7 @@ - + :/QUI/post/calculator.png:/QUI/post/calculator.png @@ -3037,7 +3481,7 @@ - + :/QUI/post/Reflection.png:/QUI/post/Reflection.png @@ -3046,7 +3490,7 @@ - + :/QUI/post/saveImage.png:/QUI/post/saveImage.png @@ -3055,7 +3499,7 @@ - + :/QUI/post/video.png:/QUI/post/video.png @@ -3067,7 +3511,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/files/cloud.png:/PointCloudProcess/PointCloudProcess/images/files/cloud.png @@ -3076,7 +3520,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/files/pointCloud.png:/PointCloudProcess/PointCloudProcess/images/files/pointCloud.png @@ -3095,7 +3539,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/algorithm/Histogram.png:/PointCloudProcess/PointCloudProcess/images/algorithm/Histogram.png @@ -3104,7 +3548,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/algorithm/KMeans.png:/PointCloudProcess/PointCloudProcess/images/algorithm/KMeans.png @@ -3113,7 +3557,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/algorithm/nihe.png:/PointCloudProcess/PointCloudProcess/images/algorithm/nihe.png @@ -3122,7 +3566,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/algorithm/DBSCAN.png:/PointCloudProcess/PointCloudProcess/images/algorithm/DBSCAN.png @@ -3131,7 +3575,7 @@ - + :/PointCloudProcess/PointCloudProcess/images/grey.png:/PointCloudProcess/PointCloudProcess/images/grey.png @@ -3155,7 +3599,7 @@ - 微波测量仿真分系统散射测量装置参数设置 + 全极化散射系数 @@ -3170,7 +3614,7 @@ - 测量属性数据库管理 + 测量属性数据管理 @@ -3233,7 +3677,7 @@ true - + :/mesh/mesh/select_vertex.png:/mesh/mesh/select_vertex.png @@ -3245,7 +3689,7 @@ true - + :/mesh/mesh/select_face.png:/mesh/mesh/select_face.png @@ -3332,7 +3776,7 @@ - 全极化散射测量数据工具 + 导入测量后向散射系数数据 diff --git a/src/PluginWBFZExchangePlugin/CMakeLists.txt b/src/PluginWBFZExchangePlugin/CMakeLists.txt index 819c2ad..23069a9 100644 --- a/src/PluginWBFZExchangePlugin/CMakeLists.txt +++ b/src/PluginWBFZExchangePlugin/CMakeLists.txt @@ -101,12 +101,7 @@ add_library(PluginWBFZExchangePlugin ${_header} ${_source} ${SOURCES} - ../PluginMeshDataExchange/dialogimportmodeldataset.cpp - ../PluginMeshDataExchange/dialogimportmodeldataset.h - ../PluginMeshDataExchange/dialogimportmodeldataset.ui - OCCTLine2Face.cpp - OCCTLine2Face.h -) +) #----------------------------------------------------------------------------- @@ -119,7 +114,7 @@ link_directories("C:/VTK/lib") link_directories("C:/PCL/lib") find_package(Qt5 REQUIRED COMPONENTS Core Quick Sql Core Xml Opengl Gui Svg Xmlpatterns Uitools Widgets Qml Printsupport Sensors Quickwidgets Quick Concurrent Openglextensions Charts Datavisualization) -find_package(PCL ) +find_package(PCL) #gdal find_package(GDAL REQUIRED) diff --git a/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.cpp b/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.cpp index 8f983d0..57fcf8d 100644 --- a/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.cpp +++ b/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.cpp @@ -219,13 +219,9 @@ namespace WBFZ { } - WBFZExchangePlugin::WBFZExchangePlugin() {} - void WBFZExchangePlugin::actionLine2FaceSLOT() { - MergeSelectLine2Face(WBFZExchangePlugin::getMWpt()); - } } // namespace WBFZ diff --git a/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.h b/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.h index f6ca4da..e014144 100644 --- a/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.h +++ b/src/PluginWBFZExchangePlugin/WBFZExchangePlugin.h @@ -59,7 +59,7 @@ namespace WBFZ // 模型线转面 void actionLine2FaceSLOT(); - WBFZExchangePlugin(); + }; }