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

同步了吴夏鑫代码

pull/1/head
剑古敛锋 2024-07-03 19:52:19 +08:00
parent 3809e1ea04
commit e271b483f8
12 changed files with 27 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/MainWidgets/meshKernalViewObject.cpp
View File

@ -345,9 +345,6 @@ namespace MainWidget
void MeshKernalViewObj::init()
{
vtkSmartPointer<vtkAppendFilter> filter = vtkSmartPointer<vtkAppendFilter>::New();
filter->AddInputData(_kernal->getMeshData());
filter->Update();

5
src/MainWidgets/meshKernalViewObject.h
View File

@ -2,9 +2,7 @@
* ============================================================================
* Program: LAMPCAE
*
* Copyright (c) 青岛数智船海科技有限公司
* All rights reserved.
* See License or http://www.LAMPCAE.com/index.html for details.
* 继承开源项目：FastCAE
*
* BSD 3-Clause License
*
@ -26,6 +24,7 @@
#define EDGEACTOR 1
#define FACEACTOR 2
#include <QObject>
#include "meshViewProvider.h"

8
src/MainWidgets/meshViewProvider.cpp
View File

@ -24,14 +24,14 @@ namespace MainWidget
connect(_preWindow, SIGNAL(updateMeshActorSig()), this, SLOT(updateMeshActorSlot()));
// connect(_preWindow, SIGNAL(removeSetDataSig(int)), this, SLOT(removeSetData(int)));
// connect(_preWindow, SIGNAL(highLightActorDispalyPoint(bool)), this,
//SLOT(highLightActorDispalyPoint(bool)));
// connect(_preWindow, SIGNAL(highLightActorDispalyPoint(bool)), this,SLOT(highLightActorDispalyPoint(bool)));
connect(_preWindow, SIGNAL(clearMeshSetHighLight()), this, SLOT(clearHighLight()));
connect(_preWindow, SIGNAL(clearAllHighLight()), this, SLOT(clearHighLight()));
connect(_preWindow, SIGNAL(highLighMeshSet(MeshData::MeshSet*)), this,SLOT(highLighMeshSet(MeshData::MeshSet*)));
connect(_preWindow, SIGNAL(highLighKernel(MeshData::MeshKernal*)), this,SLOT(highLighKernel(MeshData::MeshKernal*)));
// connect(_preWindow, SIGNAL(highLighDataSet(vtkDataSet*)), this,
//SLOT(highLighDataSet(vtkDataSet*)));
// connect(_preWindow, SIGNAL(highLighDataSet(vtkDataSet*)), this,SLOT(highLighDataSet(vtkDataSet*)));
connect(_mainWindow, SIGNAL(updateMeshSetVisibleSig(MeshData::MeshSet*)), this,SLOT(updateMeshSetVisibily(MeshData::MeshSet*)));
connect(_mainWindow, SIGNAL(updateMeshSetColorSig(int)), this,SLOT(updateMeshSetColor(int)));
}

4
src/MainWidgets/meshViewProvider.h
View File

@ -2,9 +2,7 @@
* ============================================================================
* Program: LAMPCAE
*
* Copyright (c) 青岛数智船海科技有限公司
* All rights reserved.
* See License or http://www.LAMPCAE.com/index.html for details.
* 继承开源项目：FastCAE
*
* BSD 3-Clause License
*

2
src/MainWidgets/preWindow.cpp
View File

@ -132,7 +132,7 @@ namespace MainWidget
void PreWindow::setSelectModel(int mode)
{
_selectModel = (ModuleBase::SelectModel)mode;
_meshProvider->setMeshSelectMode(_selectModel);
_meshProvider->setMeshSelectMode(_selectModel); // 设置网格选择模式
}
ModuleBase::SelectModel PreWindow::getSelectModel()

17
src/ModuleBase/PreWindowInteractorStyle.cpp
View File

@ -428,7 +428,7 @@ namespace ModuleBase
int range[4];
this->getBoxRange(range);
vtkActorCollection *actors = _renderer->GetActors();
actors->InitTraversal();
actors->InitTraversal(); // 初始化指针
const int nac = actors->GetNumberOfItems();
for (int i = 0; i < nac; ++i)
{
@ -490,21 +490,6 @@ namespace ModuleBase
coordinate->SetCoordinateSystemToWorld();
/*int* va = */ coordinate->GetComputedDisplayValue(render);
// // 清理选择状态
// // point
// vtkDataArray* pselectids = dataSet->GetPointData()->GetArray("SELECT");
// const int npoint = dataSet->GetNumberOfPoints();
// for (int i = 0; i < npoint; ++i) {
// pselectids->SetTuple1(i, 0);
// }
//
// // cell
// vtkDataArray* cselectids = dataSet->GetCellData()->GetArray("SELECT");
// const int ncell = dataSet->GetNumberOfCells();
// for (int i = 0; i < ncell; ++i) {
// cselectids->SetTuple1(i, 0);
// }
if (_selectModel == BoxMeshNode)
{

4
src/ModuleBase/PreWindowInteractorStyle.h
View File

@ -123,8 +123,8 @@ namespace ModuleBase
void clickSelectGeometry(bool preSelect = false);
void clickSelectMeshNode();
void clickSelectMeshCell();
void boxSelectMeshNode();
void boxSelectMeshCell();
void boxSelectMeshNode(); // 框选 Node
void boxSelectMeshCell();// 框选 cell
// xmin xmax ymin ymax
void getBoxRange(int *);

4
src/ModuleBase/graph3DWindow.cpp
View File

@ -126,7 +126,7 @@ namespace ModuleBase
style->setRender(_render);
style->setRenderWindow(_renderWindow);
_interactor->SetInteractorStyle(style);
vtkSmartPointer<vtkAreaPicker> areaPicker = vtkSmartPointer<vtkAreaPicker>::New();
vtkSmartPointer<vtkAreaPicker> areaPicker = vtkSmartPointer<vtkAreaPicker>::New(); // 面积拾取器
_interactor->SetPicker(areaPicker);
_interactionStyle = style;
@ -136,7 +136,7 @@ namespace ModuleBase
connect(this, SIGNAL(keyEvent(int, QKeyEvent *)), style, SLOT(keyEvent(int, QKeyEvent *)));
connect(style, SIGNAL(highLight(QMultiHash<int, int> *)), this, SIGNAL(highLighSet(QMultiHash<int, int> *)));
// connect(style, SIGNAL(higtLightActorDisplayPoint(bool)), this, SIGNAL(highLightActorDispalyPoint(bool)));
// connect(style, SIGNAL(higtLightActorDisplayPoint(bool)), this, SIGNAL(highLightActorDispalyPoint(bool)));
connect(style, SIGNAL(clearAllHighLight()), this, SIGNAL(clearAllHighLight()));
connect(_mainWindow, SIGNAL(selectModelChangedSig(int)), this, SLOT(setSelectType(int)));

4
src/PluginMeshDataExchange/dialogimportmodeldataset.cpp
View File

@ -157,8 +157,8 @@ namespace WBFZ {
void DialogImportModelDataset::handleItemClicked(QListWidgetItem *current, QListWidgetItem *previous)
{
qDebug()<<"void DialogImportModelDataset::handleItemClicked(QListWidgetItem *current, QListWidgetItem *previous)";
this->importPreViewModel("D:\\WBFZCPP\\source\\FastCAE\\extlib\\model\\crop.stl");
this->importMeshModelToMainWindows("D:\\WBFZCPP\\source\\FastCAE\\extlib\\model\\crop.stl");
this->importPreViewModel("D:\\WBFZCPP\\LAMPCAETest\\modle\\crop.stl");
this->importMeshModelToMainWindows("D:\\WBFZCPP\\LAMPCAETest\\modle\\crop.stl");
}
// 导入网格

18
src/PluginMeshDataExchange/meshDataExchangePlugin.cpp
View File

@ -36,9 +36,6 @@ namespace MeshData {
QAction* action_ModelFilterImport=_toolboxMenu->addAction("ModelFilterImport");
connect(action_ModelFilterImport, SIGNAL(triggered()),this, SLOT(on_TestLoadModelImport()));
m->menuBar()->addMenu(_toolboxMenu);
}
bool MeshDataExchangePlugin::install()
@ -123,34 +120,23 @@ namespace MeshData {
MeshSurfaceSampling::DialogMeshSurfaceVtkPointSampling* w = new MeshSurfaceSampling::DialogMeshSurfaceVtkPointSampling(m);
w->show();
}
// 用户点击按钮，触达这个函数执行
void MeshDataExchangePlugin::on_TestLoadModelImport()
{
WBFZ::DialogImportModelDataset* dialog=new WBFZ::DialogImportModelDataset(_mainwindow);
dialog->importPreViewModel("D:\\WBFZCPP\\LAMPCAETest\\modle\\crop.stl");
dialog->exec();
// dialog->importMeshModelToMainWindows("D:\\WBFZCPP\\LAMPCAETest\\modle\\crop.stl");
}
void MeshDataExchangePlugin::on_LoadPreMeshFileDialog(GUI::MainWindow* _m, QString _fileType) {
WBFZ::DialogImportModelDataset* dialog=new WBFZ::DialogImportModelDataset(_mainwindow);
dialog->filterModel(_fileType);
dialog->exec();
}
}
// 模型注册
void Register(GUI::MainWindow* m, QList<Plugins::PluginBase*>* ps)
{
Plugins::PluginBase* p_meshdataExchangeplugin = new MeshData::MeshDataExchangePlugin(m);

4
src/Settings/BusAPI.cpp
View File

@ -237,5 +237,9 @@ namespace Setting
{
return _mainSetting->isShowUserGuidance();
}
QString BusAPI::getApplicationExePath()
{
return QCoreApplication::applicationDirPath();
}
}

6
src/Settings/BusAPI.h
View File

@ -59,6 +59,12 @@ namespace Setting
* @since 2.5.0
*/
void writeINI();
/**
* @brief 获取应用程序的exe文件路径
* @since 2.5.0
*/
QString getApplicationExePath();
/**
* @brief 设置工作空间
* @since 2.5.0