增加了仿真参数界面
parent
aad2ac790d
commit
f49a4fb697
|
|
@ -13,4 +13,9 @@
|
|||
/extlib/Python37
|
||||
/extlib/WindowsKits
|
||||
/extlib/Python
|
||||
/extlib
|
||||
/extlib
|
||||
/.idea/editor.xml
|
||||
/src/PluginMeshDataExchange/.idea/.gitignore
|
||||
/src/PluginMeshDataExchange/.idea/modules.xml
|
||||
/src/PluginMeshDataExchange/.idea/PluginMeshDataExchange.iml
|
||||
/src/PluginMeshDataExchange/.idea/vcs.xml
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<entry key="Debug">
|
||||
<value>
|
||||
<PerProfileState>
|
||||
<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="myQmlPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/qml" />
|
||||
<option name="myQtBinPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/tools/qt5/bin" />
|
||||
</PerProfileState>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="Release">
|
||||
<value>
|
||||
<PerProfileState>
|
||||
<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="myQmlPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/qml" />
|
||||
<option name="myQtBinPath" value="$PROJECT_DIR$/../../../vcpkg/installed/x64-windows/tools/qt5/bin" />
|
||||
</PerProfileState>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
|
|||
|
|
@ -308,9 +308,9 @@ find_package(OpenCV REQUIRED) # 找到opencv库
|
|||
include_directories(D:/vcpkg/installed/x64-windows/include)
|
||||
|
||||
# pcl
|
||||
include_directories(SYSTEM C:/PCL/3rdParty/FLANN/include)
|
||||
include_directories(SYSTEM C:/PCL/3rdParty/VTK/include/vtk-9.3)
|
||||
include_directories(SYSTEM C:/PCL/include/pcl-1.14)
|
||||
#include_directories(SYSTEM C:/PCL/3rdParty/FLANN/include)
|
||||
#include_directories(SYSTEM C:/PCL/3rdParty/VTK/include/vtk-9.3)
|
||||
#include_directories(SYSTEM C:/PCL/include/pcl-1.14)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
find_package(Qt5 REQUIRED COMPONENTS Test Core Quick Sql Core Xml Opengl Gui Svg Xmlpatterns Uitools Widgets Qml Printsupport Sensors Quickwidgets Quick Concurrent Openglextensions Charts Datavisualization Network)
|
||||
|
|
|
|||
|
|
@ -31,14 +31,19 @@ add_library(ALLBUILD
|
|||
${_source}
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# 添加接口声明宏
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
list(APPEND _depend_library
|
||||
# LAMPCAE
|
||||
PluginCustomizer PluginMotorBike
|
||||
PluginAddTree PluginMeshDataExchange PluginWBFZExchangePlugin PluginRasterTool
|
||||
PluginLAMPScatterProcess
|
||||
PluginCustomizer PluginMeshDataExchange PluginWBFZExchangePlugin PluginMotorBike
|
||||
PluginAddTree PluginCustomizer PluginMeshDataExchange PluginWBFZExchangePlugin PluginMotorBike PluginRasterTool PluginLAMPScatterProcess
|
||||
# PluginRasterTool
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@
|
|||
#include "PluginWBFZExchangePlugin/DialogPCLStatisticalRemoveFilter.h"
|
||||
#include "IO/vtkDataRelated.h"
|
||||
|
||||
#include <QProcess>
|
||||
|
||||
// logger
|
||||
#include "Common/DebugLogger.h"
|
||||
#include "PluginWBFZExchangePlugin/OCCTBase.h"
|
||||
|
|
@ -250,7 +252,7 @@ namespace GUI {
|
|||
SLOT(importMeshDataset(vtkDataSet*)));
|
||||
connect(this, SIGNAL(printMessageSig(Common::Message, QString)), this,
|
||||
SLOT(printMessage(Common::Message, QString)));
|
||||
|
||||
//connect(_ui->actionLine2Face,SIGNAL(triggered()),this,SIGNAL(on_actionLine2FaceSIGNAL()));
|
||||
// 文件
|
||||
connect(_ui->actionNew, SIGNAL(triggered()), this, SLOT(on_actionNew()));
|
||||
connect(_ui->actionOpen, SIGNAL(triggered()), this, SLOT(on_actionOpen()));
|
||||
|
|
@ -502,8 +504,8 @@ namespace GUI {
|
|||
|
||||
connect(_ui->action_soilSurfaceScane, SIGNAL(triggered()), this,SLOT(on_action_soilSurfaceScane()));
|
||||
|
||||
// 绑定散射实验数据加载
|
||||
connect(_ui->action_LoadLaboratoryScatterResult,SIGNAL(triggered()), this,SLOT(on_actionLoadLaboratoryScatterResult_triggereds()));
|
||||
|
||||
connect(_ui->actionRFPCSimulationProcess,SIGNAL(triggered()), this,SLOT(on_action_simulation()));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -665,6 +667,18 @@ namespace GUI {
|
|||
_signalHandler->on_actionNew();
|
||||
// emit updateActionStatesSig();
|
||||
}
|
||||
|
||||
void MainWindow::on_action_simulation(){
|
||||
QString exepath="D:\\WBFZCPP\\RasterProcessTool\\x64\\Release\\LAMPDataProcessEXE.exe";
|
||||
QProcess program;
|
||||
QString cmd = exepath;
|
||||
program.start(cmd);
|
||||
program.waitForFinished();
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
void MainWindow::on_actionOpen()
|
||||
{
|
||||
/* emit sig_action_open();*/
|
||||
|
|
@ -1849,12 +1863,6 @@ namespace GUI {
|
|||
DebugInfo("MainWindow::on_clipMesh\n");
|
||||
emit this->on_clipMeshSIGNAL(this);
|
||||
}
|
||||
|
||||
void MainWindow::on_actionLoadLaboratoryScatterResult_triggereds() {
|
||||
DebugInfo("on_actionLoadLaboratoryScatterResult_triggered\n");
|
||||
emit this->on_action_LoadLaboratoryScatterResultSIGN(this);
|
||||
}
|
||||
|
||||
void MainWindow::on_saveMeshEdit()
|
||||
{
|
||||
DebugInfo("MainWindow::on_saveMeshEdit\n");
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ namespace GUI {
|
|||
|
||||
signals:
|
||||
|
||||
void on_actionLine2FaceSIGNAL();
|
||||
|
||||
|
||||
// 网格操作
|
||||
|
|
@ -311,6 +312,7 @@ namespace GUI {
|
|||
// 更新二维曲线模型树
|
||||
void updatePlotTreeSig();
|
||||
|
||||
//
|
||||
// 打开二维曲线绘制信号
|
||||
void openPlot();
|
||||
|
||||
|
|
@ -365,7 +367,7 @@ namespace GUI {
|
|||
|
||||
void on_actionAddTreeClickedSIG(GUI::MainWindow* m);
|
||||
|
||||
void on_action_LoadLaboratoryScatterResultSIGN(GUI::MainWindow* m);
|
||||
|
||||
|
||||
public slots:
|
||||
|
||||
|
|
@ -452,8 +454,6 @@ namespace GUI {
|
|||
void on_copyMesh();
|
||||
void on_clipMesh();
|
||||
|
||||
void on_actionLoadLaboratoryScatterResult_triggereds();
|
||||
|
||||
void on_saveMeshEdit();
|
||||
void on_actionMeshTriangleSurface();
|
||||
|
||||
|
|
@ -549,6 +549,10 @@ namespace GUI {
|
|||
|
||||
void on_action_ForestSance();
|
||||
void on_action_soilSurfaceScane();
|
||||
|
||||
void on_action_simulation();
|
||||
|
||||
|
||||
private:
|
||||
/*初始化Menu*/
|
||||
// void initMenu();
|
||||
|
|
@ -557,7 +561,7 @@ namespace GUI {
|
|||
void connectSignals();
|
||||
/*注册模块 */
|
||||
void registerMoudel();
|
||||
// 初始化工具栏
|
||||
/// 初始化工具栏
|
||||
void initToolBar();
|
||||
/*重写QWidget虚函数 关闭主窗口事件 */
|
||||
void closeEvent(QCloseEvent* event) override;
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1321</width>
|
||||
<height>22</height>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuFile">
|
||||
|
|
@ -1444,7 +1444,6 @@
|
|||
<addaction name="WBCL_MenuWaterBodyScene"/>
|
||||
<addaction name="WBCL_MenuVegetationScene"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="action_LoadLaboratoryScatterResult"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuTargetWBFZ">
|
||||
<property name="title">
|
||||
|
|
@ -1608,6 +1607,7 @@
|
|||
<addaction name="WBFZ_MenuWaterBodyScene"/>
|
||||
<addaction name="WBFZ_MenuVegetationScene"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionRFPCSimulationProcess"/>
|
||||
</widget>
|
||||
<addaction name="menuFile"/>
|
||||
<addaction name="menuView"/>
|
||||
|
|
@ -3325,9 +3325,9 @@
|
|||
<string>土壤表面扫描仪</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_LoadLaboratoryScatterResult">
|
||||
<action name="actionRFPCSimulationProcess">
|
||||
<property name="text">
|
||||
<string>全极化散射测量数据工具</string>
|
||||
<string>大场景仿真</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ namespace LAMPToolBox {
|
|||
this->menuBar = _mainwindows->menuBar();
|
||||
}
|
||||
// 添加 命令
|
||||
_toolboxMenu=new QMenu("RasterToolBox");
|
||||
_toolboxMenu=new QMenu(u8"其他工具");
|
||||
// 增加菜单
|
||||
QAction* action_RasterProjectMenu=_toolboxMenu->addAction("Raster_ProjectSystem");
|
||||
QAction* action_DEM2PointCloud=_toolboxMenu->addAction("DEM->PointCloud");
|
||||
QAction* action_DEM2Mesh=_toolboxMenu->addAction("DEM->Mesh");
|
||||
QAction* action_RasterProjectMenu=_toolboxMenu->addAction(u8"栅格投影");
|
||||
QAction* action_DEM2PointCloud=_toolboxMenu->addAction(u8"根据DEM构建点云");
|
||||
QAction* action_DEM2Mesh=_toolboxMenu->addAction(u8"DEM构建网格");
|
||||
|
||||
// 事件绑定
|
||||
connect(action_RasterProjectMenu, SIGNAL(triggered()),this, SLOT(on_RasterProject_trigged()));
|
||||
|
|
|
|||
|
|
@ -104,6 +104,8 @@ add_library(PluginWBFZExchangePlugin
|
|||
../PluginMeshDataExchange/dialogimportmodeldataset.cpp
|
||||
../PluginMeshDataExchange/dialogimportmodeldataset.h
|
||||
../PluginMeshDataExchange/dialogimportmodeldataset.ui
|
||||
OCCTLine2Face.cpp
|
||||
OCCTLine2Face.h
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ LAMPDataShowClass::LAMPDataShowClass(QWidget *parent)
|
|||
// QMenu* ComplexFileOpenMenu = this->ui->menuFile->addMenu(u8"打开复数数据");
|
||||
// QAction* action_openfile_tiff_complex = ComplexFileOpenMenu->addAction(u8"tiff文件"); // 添加菜单项
|
||||
// QObject::connect(action_openfile_tiff_complex, SIGNAL(triggered()), this, SLOT(on_action_openfile_tiff_complex_triggered()));
|
||||
QAction* action_openfile_envi_complex = FileOpenMenu->addAction(u8"打开复数envi文件"); // 添加菜单项
|
||||
QAction* action_openfile_envi_complex = FileOpenMenu->addAction(u8"打开复数文件"); // 添加菜单项
|
||||
QObject::connect(action_openfile_envi_complex, SIGNAL(triggered()), this, SLOT(on_action_openfile_envi_complex_triggered()));
|
||||
|
||||
this->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
|
|
@ -84,7 +84,7 @@ void LAMPDataShowClass::on_action_openfile_envi_complex_triggered()
|
|||
{
|
||||
ComplexDataShowNode* node = new ComplexDataShowNode();
|
||||
node->bangdindWindows(this);
|
||||
node->TaskXmlPath = getOpenFilePath(nullptr, u8"打开复数数据", u8"envi文件(*.dat ) ");
|
||||
node->TaskXmlPath = getOpenFilePath(nullptr, u8"打开复数数据", u8"tiff Files (*.tiff);;tif Files (*.tif);;dat Files (*.dat);;bin Files (*.bin);;All Files (*)");
|
||||
if (!isExists(node->TaskXmlPath)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
//
|
||||
// Created by chenzh on 25-3-14.
|
||||
//
|
||||
|
||||
#include "OCCTLine2Face.h"
|
||||
#include "MainWindow/MainWindow.h"
|
||||
#include "MainWidgets/preWindow.h"
|
||||
#include "MainWindow/SubWindowManager.h"
|
||||
#include "Geometry/GeoCommon.h"
|
||||
#include "Geometry/geometrySet.h"
|
||||
|
||||
void MergeSelectLine2Face(GUI::MainWindow *_mainwindows) {
|
||||
if(nullptr!=_mainwindows->getSubWindowManager()){
|
||||
MainWidget::PreWindow* _prewindow=_mainwindows->getSubWindowManager()->getPreWindow();
|
||||
Geometry::GeometrySet* selectSet= _prewindow->getSelectedGeoSet();
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
//
|
||||
// Created by chenzh on 25-3-14.
|
||||
//
|
||||
|
||||
#ifndef LAMPCAE_OCCTLINE2FACE_H
|
||||
#define LAMPCAE_OCCTLINE2FACE_H
|
||||
|
||||
#include "MainWindow/MainWindow.h"
|
||||
#include "MainWindow/SubWindowManager.h"
|
||||
class OCCTLine2Face {
|
||||
|
||||
};
|
||||
|
||||
|
||||
void MergeSelectLine2Face(GUI::MainWindow* _mainwindows);
|
||||
|
||||
|
||||
#endif //LAMPCAE_OCCTLINE2FACE_H
|
||||
|
|
@ -20,6 +20,9 @@
|
|||
#include "EchoTableEditWindow.h"
|
||||
#include "SqliteDBMainWindow.h"
|
||||
#include "LAMPImageCreateClass.h"
|
||||
#include "OCCTLine2Face.h"
|
||||
|
||||
|
||||
//#include "dialogechodatashow.h"
|
||||
namespace WBFZ {
|
||||
GUI::MainWindow* WBFZ::WBFZExchangePlugin::_mainwindow = nullptr;
|
||||
|
|
@ -63,6 +66,7 @@ namespace WBFZ {
|
|||
|
||||
connect(_mainwindow,SIGNAL(actionGenerateImportModelScript(int ,GUI::MainWindow* ,QStringList,QStringList ,QString )),this,SLOT(actionGenerateImportModelScript(int ,GUI::MainWindow* ,QStringList,QStringList ,QString )));
|
||||
|
||||
connect(_mainwindow,SIGNAL(on_actionLine2FaceSIGNAL()),this,SLOT(actionLine2FaceSLOT()));
|
||||
DebugInfo("WBFZExchangePlugin::WBFZExchangePlugin has init \n");
|
||||
}
|
||||
|
||||
|
|
@ -215,6 +219,15 @@ namespace WBFZ {
|
|||
|
||||
}
|
||||
|
||||
WBFZExchangePlugin::WBFZExchangePlugin() {}
|
||||
|
||||
void WBFZExchangePlugin::actionLine2FaceSLOT() {
|
||||
|
||||
MergeSelectLine2Face(WBFZExchangePlugin::getMWpt());
|
||||
|
||||
|
||||
}
|
||||
|
||||
} // namespace WBFZ
|
||||
|
||||
void Register(GUI::MainWindow* m, QList<Plugins::PluginBase*>* ps)
|
||||
|
|
|
|||
|
|
@ -56,8 +56,11 @@ namespace WBFZ
|
|||
void actionactionRCShowTool(GUI::MainWindow* m);
|
||||
// 生成导入模型的 脚本代码
|
||||
void actionGenerateImportModelScript(int TaskID,GUI::MainWindow* m,QStringList stlPath,QStringList geoList,QString scriptPath);
|
||||
// 模型线转面
|
||||
void actionLine2FaceSLOT();
|
||||
|
||||
};
|
||||
WBFZExchangePlugin();
|
||||
};
|
||||
}
|
||||
|
||||
extern "C"
|
||||
|
|
|
|||
Loading…
Reference in New Issue