From df00ad7b5ccf7915367136ad180573fde31d2242 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Wed, 18 Nov 2026 15:14:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(Nm):=20=E6=96=B0=E5=A2=9E=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E5=88=87=E7=89=87=E6=B5=8B=E8=AF=95=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=B9=B6=E7=BB=9F=E4=B8=80=E5=88=87=E7=89=87=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增切片测试模型入口,提供分层和渐变属性,支持后台加载及取消 - 复用三维模型切换流程,支持返回计算结果 - 调整切片设置自适应布局,统一快捷按钮样式并补充悬停说明 - 将重置改为还原,明确恢复上次应用参数,完善中文注释及翻译 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 209209 -> 210056 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 40 +++++++- Include/nmNum/nmData/nmVolumeDataBuilder.h | 10 +- Include/nmNum/nmSubWxs/nmVolumeImportTask.h | 19 +++- .../nmNum/nmSubWxs/nmWxPebiResultViewWidget.h | 12 ++- .../nmSubWxs/nmWxVolumeSliceSettingsDlg.h | 11 ++- Src/nmNum/nmData/nmVolumeDataBuilder.cpp | 88 ++++++++++++++++++ Src/nmNum/nmSubWxs/nmVolumeImportTask.cpp | 17 +++- .../nmSubWxs/nmWxPebiResultViewWidget.cpp | 33 +++++-- .../nmSubWxs/nmWxVolumeSliceSettingsDlg.cpp | 67 ++++++------- 10 files changed, 230 insertions(+), 67 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index 107780619f0fad4b328600fc0e0b60acb03d83b2..53099f7bba49ce403d003cbf0bac7d5e255077c3 100644 GIT binary patch delta 14953 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 nmWxPebiResultViewWidget + + Load Slice Test Model + 加载切片测试模型 + No result data.暂无结果数据。 Color Scale色标 Scale Grid比例网格 @@ -8955,6 +8959,22 @@ Average pressure in contour: %2 MPa nmVolumeData + + Slice Test Model + 切片测试模型 + + + Test Layers + 测试分层 + + + Test Gradient + 测试渐变 + + + Not enough memory to create the slice test model. + 内存不足,无法创建切片测试模型。 + Not enough memory to import the volume mesh. 内存不足,无法导入三维网格。 @@ -9062,8 +9082,8 @@ Average pressure in contour: %2 MPa nmVolumeImportTask - An unexpected error occurred while importing the volume mesh. - 导入三维网格时发生意外错误。 + An unexpected error occurred while loading the volume mesh. + 加载三维网格时发生意外错误。 @@ -9139,8 +9159,8 @@ Average pressure in contour: %2 MPa 应用 - Reset - 重置 + Restore + 还原 Close @@ -9154,6 +9174,18 @@ Average pressure in contour: %2 MPa Drag the center or outline to move the plane; drag arrows to rotate. 拖动中心手柄或平面轮廓移动平面,拖动箭头旋转平面。 + + Move the plane origin to the model center without changing its normal. + 将切片原点移到模型中心,保持法向不变。 + + + Set the plane parallel to %1 without changing its origin. + 将切片方向设为平行于 %1 平面,保持原点不变。 + + + Restore the last applied plane parameters. + 恢复上次应用的平面参数。 + nmDfnSession diff --git a/Include/nmNum/nmData/nmVolumeDataBuilder.h b/Include/nmNum/nmData/nmVolumeDataBuilder.h index ecc5f378..58300fea 100644 --- a/Include/nmNum/nmData/nmVolumeDataBuilder.h +++ b/Include/nmNum/nmData/nmVolumeDataBuilder.h @@ -3,10 +3,18 @@ #include "nmVolumeData.h" -/** @brief 文件导入和未来三维求解器共用的发布入口,不保留输入对象的可写别名。 */ +/** @brief 文件导入、内置测试模型和未来三维求解器共用的发布入口,不保留输入对象的可写别名。 */ class NM_DATA_EXPORT nmVolumeDataBuilder { public: + /** + * @brief 在内存中生成切片测试模型,不读取文件,也不依赖分析或求解器。 + * @note 模型为三层六面体网格,附带单元分层与节点渐变两种无量纲测试属性。 + * 通过 buildFromGrid 校验并发布;失败或取消返回空指针,可在工作线程调用。 + */ + static QSharedPointer buildSliceTestModel( + QString* pError = nullptr, nmVolumeImportFeedback* pFeedback = nullptr); + /** * @brief 完整复制、校验后返回只读数据;失败或取消返回空指针。 * @note 调用期间输入网格必须由调用方独占,不能被其他线程修改。 diff --git a/Include/nmNum/nmSubWxs/nmVolumeImportTask.h b/Include/nmNum/nmSubWxs/nmVolumeImportTask.h index f3f0d235..c6f1c1f9 100644 --- a/Include/nmNum/nmSubWxs/nmVolumeImportTask.h +++ b/Include/nmNum/nmSubWxs/nmVolumeImportTask.h @@ -7,16 +7,24 @@ #include /** - * @brief 每个结果窗口独占的导入任务。 - * 工作线程只操作局部 Reader 和数据候选,不访问 QWidget、Renderer 或 Manager。 + * @brief 每个结果窗口独占的三维模型加载任务,支持文件和内置切片测试模型。 + * 工作线程只操作局部 Reader、测试网格和数据候选,不访问 QWidget、Renderer 或 Manager。 * 结果只允许在 finished 后读取;取消标志是唯一由两个线程同时访问的成员。 */ class NM_SUB_WXS_EXPORT nmVolumeImportTask : public QThread, public nmVolumeImportFeedback { Q_OBJECT public: - /** @brief 保存输入路径,线程由调用方显式 start;父对象通常为结果窗口。 */ - explicit nmVolumeImportTask(const QString& sFilePath, QObject* pParent = nullptr); + /** @brief 显式区分数据来源,避免用特殊文件路径触发内置模型。 */ + enum SourceType + { + FileSource, ///< 从指定的 VTK 文件读取体网格。 + SliceTestModelSource ///< 在内存中生成固定的切片测试模型。 + }; + + /** @brief 固定来源及输入路径(仅文件来源使用);线程由调用方显式 start。 */ + explicit nmVolumeImportTask(SourceType eSourceType, const QString& sFilePath, + QObject* pParent = nullptr); /** @brief 请求取消并等待安全退出,禁止释放仍运行的 VTK 代码资源。 */ virtual ~nmVolumeImportTask(); /** @brief 原子请求取消,可由 GUI 线程调用,不阻塞等待 Reader。 */ @@ -40,7 +48,8 @@ protected: private: Q_DISABLE_COPY(nmVolumeImportTask) - QString m_sFilePath; ///< 创建时固定的输入路径,运行期间不再改写。 + SourceType m_eSourceType; ///< 创建时固定的数据来源,工作线程据此选择加载方式。 + QString m_sFilePath; ///< 文件来源的输入路径;内置测试模型不使用此字段。 mutable QAtomicInt m_nCancelRequested; ///< GUI 写入、工作线程读取的原子取消标志。 QSharedPointer m_pResult; ///< 工作线程写入,finished 后 GUI 才读取。 QString m_sError; ///< 工作线程写入的失败原因,finished 后读取。 diff --git a/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h b/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h index 15bb1184..58e7286d 100644 --- a/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h +++ b/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h @@ -25,6 +25,7 @@ class iUnitGroup; class nmDataAnalyzeManager; class nmWxPebiResultRegionState; class nmWxPebiVolumeState; +class nmVolumeImportTask; struct nmVolumeSliceSettings; class nmPebiResultSceneController; class nmPebiResultSnapshot; @@ -210,7 +211,7 @@ public: * @return 已启动任务返回 true;忙碌或路径为空返回 false,当前画面不变。 */ bool importVolumeFile(const QString& sFilePath); - /** @brief 返回当前是否正在显示外部三维数据,而非正式计算结果。 */ + /** @brief 返回当前是否显示独立三维模型(文件导入或内置测试模型),而非正式计算结果。 */ bool isImportedVolumeMode() const; private slots: @@ -236,9 +237,11 @@ private slots: void refreshVolumeSliceView(); /** @brief 从切片菜单选择文件,再启动可取消后台导入。 */ void onImportVolumeRequested(); + /** @brief 从切片菜单启动内置测试模型加载,无需选择外部文件。 */ + void onLoadSliceTestModelRequested(); /** @brief 原子标记取消;不等待或强行终止 Reader。 */ void onCancelVolumeImport(); - /** @brief 在线程结束后准备候选场景,成功才提交外部模型画面。 */ + /** @brief 在线程结束后准备候选场景,成功才提交三维模型画面。 */ void onVolumeImportFinished(); /** @brief 返回仍有效的原结果或最新结果;绑定失败保留外部模型。 */ void onReturnToCalculationResult(); @@ -295,6 +298,11 @@ private: void disconnectDataManager(); /** @brief 汇总播放、导出、绘制和导入任务状态,判定是否允许开始导入。 */ bool canImportVolume() const; + /** + * @brief 接管未启动的加载任务,统一连接进度、取消及场景提交回调。 + * @note 调用者须先在 GUI 线程检查 canImportVolume;任务的父对象应为本窗口。 + */ + void startVolumeLoad(nmVolumeImportTask* pTask); /** @brief 同步切片菜单及外部模式下的业务动作,不触发渲染。 */ void synchronizeVolumeActions(); /** @brief 关闭参数窗口并解绑平面,不渲染;释放数据时同时解除对旧模型的引用。 */ diff --git a/Include/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.h b/Include/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.h index d281855b..a8e9d9f2 100644 --- a/Include/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.h @@ -21,7 +21,7 @@ public: explicit nmWxVolumeSliceSettingsDlg(QWidget* pParent = nullptr); /** @brief 更换当前模型及已应用参数,清除前一模型的草稿和错误。 */ void setData(const QSharedPointer& pData, const nmVolumeSliceSettings& oApplied); - /** @brief 提交成功后同步归一化参数,同时更新重置目标。 */ + /** @brief 提交成功后同步归一化参数,同时更新“还原”操作的目标。 */ void setAppliedSettings(const nmVolumeSliceSettings& oSettings); /** @brief 同步底栏已应用的着色属性,保留原点和法向的未应用草稿。 */ void setAppliedProperty(const QString& sPropertyId); @@ -53,15 +53,18 @@ private slots: void onAxisRequested(); /** @brief 将草稿原点移到模型中心,保持法向与属性。 */ void onCenterRequested(); - /** @brief 恢复最后已应用参数并同步辅助平面。 */ - void onResetRequested(); + /** @brief 撤销未应用的平面编辑,恢复最近一次成功应用的参数并同步辅助平面。 */ + void onRestoreRequested(); /** @brief 校验有效后请求宿主提交当前草稿。 */ void onApplyRequested(); /** @brief 更新已应用状态中的显示偏好,不提交原点和法向草稿。 */ void onDisplayOptionsChanged(); private: - /** @brief 按现有参数窗口样式创建分组、对齐的编辑控件及固定顺序的底部按钮。 */ + /** + * @brief 按统一参数窗口样式创建分组、编辑控件及“还原、应用、关闭”按钮。 + * @note 字体和主题决定推荐尺寸,输入列横向伸展;参数与快捷操作沿用原有预览、应用流程。 + */ void createUi(); /** @brief 阻止信号递归地把值对象写入所有控件,然后更新校验提示。 */ void writeSettings(const nmVolumeSliceSettings& oSettings); diff --git a/Src/nmNum/nmData/nmVolumeDataBuilder.cpp b/Src/nmNum/nmData/nmVolumeDataBuilder.cpp index 2aae981c..236d79d3 100644 --- a/Src/nmNum/nmData/nmVolumeDataBuilder.cpp +++ b/Src/nmNum/nmData/nmVolumeDataBuilder.cpp @@ -30,6 +30,10 @@ static const char* const s_pVolumeTranslationMarkers[] = { QT_TRANSLATE_NOOP("nmVolumeData", "The mesh contains non-finite coordinates."), QT_TRANSLATE_NOOP("nmVolumeData", "The mesh contains repeated cell vertices."), QT_TRANSLATE_NOOP("nmVolumeData", "The mesh must have a finite extent in all three directions."), + QT_TRANSLATE_NOOP("nmVolumeData", "Slice Test Model"), + QT_TRANSLATE_NOOP("nmVolumeData", "Test Layers"), + QT_TRANSLATE_NOOP("nmVolumeData", "Test Gradient"), + QT_TRANSLATE_NOOP("nmVolumeData", "Not enough memory to create the slice test model."), QT_TRANSLATE_NOOP("nmVolumeData", "Volume import canceled.") }; @@ -57,6 +61,90 @@ int expectedPointCount(int nCellType) } } +QSharedPointer nmVolumeDataBuilder::buildSliceTestModel( + QString* pError, nmVolumeImportFeedback* pFeedback) +{ + if(pError != nullptr) pError->clear(); + QString sError; + try { + do { + if(canceled(pFeedback)) break; + if(pFeedback != nullptr) pFeedback->reportProgress(0); + + // 固定小网格便于重复测试:5184 个六面体、6175 个共享节点。 + // 三轴范围为 [-120,120]、[-90,90]、[-60,60],初始截面经过原点。 + const int nXCells = 24; + const int nYCells = 18; + const int nZCells = 12; + const double dSpacing = 10.0; + const vtkIdType nRowStride = nXCells + 1; + const vtkIdType nPlaneStride = nRowStride * (nYCells + 1); + const vtkIdType nPointCount = nPlaneStride * (nZCells + 1); + const vtkIdType nCellCount = nXCells * nYCells * nZCells; + vtkSmartPointer pPoints = vtkSmartPointer::New(); + pPoints->SetDataTypeToDouble(); + pPoints->SetNumberOfPoints(nPointCount); + vtkSmartPointer pGradient = vtkSmartPointer::New(); + pGradient->SetName(volumeText("Test Gradient").toUtf8().constData()); + pGradient->SetNumberOfComponents(1); + pGradient->SetNumberOfTuples(nPointCount); + for(int nZ = 0; nZ <= nZCells; ++nZ) { + if(canceled(pFeedback)) break; + for(int nY = 0; nY <= nYCells; ++nY) { + for(int nX = 0; nX <= nXCells; ++nX) { + const vtkIdType nPoint = nZ * nPlaneStride + nY * nRowStride + nX; + pPoints->SetPoint(nPoint, (nX - nXCells / 2) * dSpacing, + (nY - nYCells / 2) * dSpacing, (nZ - nZCells / 2) * dSpacing); + // 三个方向权重不同,斜切时也能辨认方向;范围 0~100,原点值为 50。 + const double dGradient = 100.0 * (double(nX) / nXCells + + 2.0 * nY / nYCells + 3.0 * nZ / nZCells) / 6.0; + pGradient->SetValue(nPoint, dGradient); + } + } + if(pFeedback != nullptr) pFeedback->reportProgress(25 * (nZ + 1) / (nZCells + 1)); + } + if(canceled(pFeedback)) break; + + vtkSmartPointer pGrid = vtkSmartPointer::New(); + pGrid->SetPoints(pPoints); + pGrid->Allocate(nCellCount); + vtkSmartPointer pLayers = vtkSmartPointer::New(); + pLayers->SetName(volumeText("Test Layers").toUtf8().constData()); + pLayers->SetNumberOfComponents(1); + pLayers->SetNumberOfTuples(nCellCount); + for(int nZ = 0; nZ < nZCells; ++nZ) { + if(canceled(pFeedback)) break; + for(int nY = 0; nY < nYCells; ++nY) { + for(int nX = 0; nX < nXCells; ++nX) { + const vtkIdType nBase = nZ * nPlaneStride + nY * nRowStride + nX; + // 按 VTK_HEXAHEDRON 的底面、顶面顺序连接;相邻单元共享节点。 + vtkIdType aPoints[8] = { + nBase, nBase + 1, nBase + nRowStride + 1, nBase + nRowStride, + nBase + nPlaneStride, nBase + nPlaneStride + 1, + nBase + nPlaneStride + nRowStride + 1, nBase + nPlaneStride + nRowStride + }; + const vtkIdType nCell = pGrid->InsertNextCell(VTK_HEXAHEDRON, 8, aPoints); + // 自下而上分为 1、2、3 层,界面位于 Z=-20、Z=20;仅供显示测试。 + pLayers->SetValue(nCell, 1 + nZ / (nZCells / 3)); + } + } + if(pFeedback != nullptr) pFeedback->reportProgress(25 + 30 * (nZ + 1) / nZCells); + } + if(canceled(pFeedback)) break; + // 默认按单元分层着色;用户可在现有属性下拉框中改选连续的节点渐变。 + pGrid->GetCellData()->SetScalars(pLayers); + pGrid->GetPointData()->SetScalars(pGradient); + return buildFromGrid(pGrid, volumeText("Slice Test Model"), pError, pFeedback); + } while(false); + } catch(const std::bad_alloc&) { + sError = volumeText("Not enough memory to create the slice test model."); + } + if(pError != nullptr) { + *pError = canceled(pFeedback) ? volumeText("Volume import canceled.") : sError; + } + return QSharedPointer(); +} + QSharedPointer nmVolumeDataBuilder::buildFromGrid( vtkUnstructuredGrid* pGrid, const QString& sSourceName, QString* pError, nmVolumeImportFeedback* pFeedback) diff --git a/Src/nmNum/nmSubWxs/nmVolumeImportTask.cpp b/Src/nmNum/nmSubWxs/nmVolumeImportTask.cpp index 7aeb5477..7c27c2ac 100644 --- a/Src/nmNum/nmSubWxs/nmVolumeImportTask.cpp +++ b/Src/nmNum/nmSubWxs/nmVolumeImportTask.cpp @@ -1,8 +1,10 @@ #include "nmVolumeImportTask.h" #include "nmVolumeDataImporter.h" +#include "nmVolumeDataBuilder.h" -nmVolumeImportTask::nmVolumeImportTask(const QString& sFilePath, QObject* pParent) - : QThread(pParent), m_sFilePath(sFilePath), m_nCancelRequested(0), m_nLastProgress(-1) +nmVolumeImportTask::nmVolumeImportTask(SourceType eSourceType, const QString& sFilePath, QObject* pParent) + : QThread(pParent), m_eSourceType(eSourceType), m_sFilePath(sFilePath), + m_nCancelRequested(0), m_nLastProgress(-1) { } nmVolumeImportTask::~nmVolumeImportTask() @@ -24,11 +26,16 @@ void nmVolumeImportTask::reportProgress(int nPercent) void nmVolumeImportTask::run() { try { - m_pResult = nmVolumeDataImporter::loadFile(m_sFilePath, &m_sError, this); + // 两种来源都只发布只读候选,场景切换仍由 GUI 在线程结束后统一处理。 + if(m_eSourceType == SliceTestModelSource) { + m_pResult = nmVolumeDataBuilder::buildSliceTestModel(&m_sError, this); + } else { + m_pResult = nmVolumeDataImporter::loadFile(m_sFilePath, &m_sError, this); + } } catch(...) { - // C++ 异常不得越过 QThread::run 边界,否则一次导入可能终止整个进程。 + // C++ 异常不得越过 QThread::run 边界,否则一次加载可能终止整个进程。 m_pResult.clear(); - m_sError = tr("An unexpected error occurred while importing the volume mesh."); + m_sError = tr("An unexpected error occurred while loading the volume mesh."); } if(isCanceled()) m_pResult.clear(); } diff --git a/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp b/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp index ea25750f..e112205d 100644 --- a/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp @@ -1104,22 +1104,23 @@ void nmWxPebiRegionPressureStatisticsDlg::refreshValues() } } -/** @brief 外部三维模式的窗口私有状态,所有成员仅由 GUI 线程管理。 */ +/** @brief 独立三维模型(文件或内置测试模型)的窗口私有状态,仅由 GUI 线程管理。 */ class nmWxPebiVolumeState { public: /** @brief 初始化为空模式;控制器在通用渲染容器创建后绑定。 */ nmWxPebiVolumeState() : m_pController(nullptr), m_pTask(nullptr), m_pProgress(nullptr), - m_pImportAction(nullptr), m_pReturnAction(nullptr), m_pButton(nullptr), + m_pImportAction(nullptr), m_pTestModelAction(nullptr), m_pReturnAction(nullptr), m_pButton(nullptr), m_pSliceAction(nullptr), m_pSliceSettingsAction(nullptr), m_pSliceDialog(nullptr), m_pSliceInteraction(nullptr), m_bImported(false), m_bPendingSync(false), m_bRegionVisible(false), m_bRegionDialogVisible(false) {} nmVolumeSceneController* m_pController; ///< 窗口独占,必须在渲染容器之前析构。 - nmVolumeImportTask* m_pTask; ///< 当前唯一导入线程,结束后才允许读取结果。 + nmVolumeImportTask* m_pTask; ///< 当前唯一模型加载线程,结束后才允许读取结果。 QProgressDialog* m_pProgress; ///< 临时进度框,窗口对象树拥有。 QAction* m_pImportAction; ///< 切片按钮菜单中的三维模型导入动作。 + QAction* m_pTestModelAction; ///< 直接加载内置切片测试模型,复用现有三维显示流程。 QAction* m_pReturnAction; ///< 仅外部模型模式启用的返回动作。 QToolButton* m_pButton; ///< 唯一新增的常驻切片工具按钮。 QAction* m_pSliceAction; ///< 切片按钮菜单中的切片显隐动作。 @@ -1128,7 +1129,7 @@ public: nmVolumeSliceInteraction* m_pSliceInteraction; ///< 窗口独占,负责辅助平面及安全事件转发。 nmVTKViewState m_oSavedView; ///< 第一次进入外部模式前捕获的计算结果视图。 nmVTKViewCommandController::ViewCommands m_eSavedCommands; ///< 原结果提供的视图命令能力。 - bool m_bImported; ///< 当前画面是否为外部三维模型。 + bool m_bImported; ///< 当前是否显示独立三维模型,包含文件导入和内置测试模型。 bool m_bPendingSync; ///< 外部模式期间发生 Manager 变化,返回时重新读取。 bool m_bRegionVisible; ///< 原区域轮廓的实际可见状态。 bool m_bRegionDialogVisible; ///< 原区域统计面板是否可见。 @@ -1988,6 +1989,8 @@ void nmWxPebiResultViewWidget::createUi() QMenu* pSliceMenu = new QMenu(m_pVolumeState->m_pButton); m_pVolumeState->m_pImportAction = new QAction(tr("Import 3D Model..."), this); m_pVolumeState->m_pImportAction->setObjectName(QLatin1String("importVolumeAction")); + m_pVolumeState->m_pTestModelAction = new QAction(tr("Load Slice Test Model"), this); + m_pVolumeState->m_pTestModelAction->setObjectName(QLatin1String("loadSliceTestModelAction")); m_pVolumeState->m_pReturnAction = new QAction(tr("Return to Calculation Result"), this); m_pVolumeState->m_pReturnAction->setObjectName(QLatin1String("returnCalculationAction")); m_pVolumeState->m_pSliceAction = new QAction(tr("Show Slice"), this); @@ -1996,6 +1999,7 @@ void nmWxPebiResultViewWidget::createUi() m_pVolumeState->m_pSliceSettingsAction = new QAction(tr("Slice Settings..."), this); m_pVolumeState->m_pSliceSettingsAction->setObjectName(QLatin1String("volumeSliceSettingsAction")); pSliceMenu->addAction(m_pVolumeState->m_pImportAction); + pSliceMenu->addAction(m_pVolumeState->m_pTestModelAction); pSliceMenu->addSeparator(); pSliceMenu->addAction(m_pVolumeState->m_pSliceAction); pSliceMenu->addAction(m_pVolumeState->m_pSliceSettingsAction); @@ -2004,6 +2008,7 @@ void nmWxPebiResultViewWidget::createUi() m_pVolumeState->m_pButton->setMenu(pSliceMenu); m_pToolBar->addWidget(m_pVolumeState->m_pButton); connect(m_pVolumeState->m_pImportAction, SIGNAL(triggered()), this, SLOT(onImportVolumeRequested())); + connect(m_pVolumeState->m_pTestModelAction, SIGNAL(triggered()), this, SLOT(onLoadSliceTestModelRequested())); connect(m_pVolumeState->m_pReturnAction, SIGNAL(triggered()), this, SLOT(onReturnToCalculationResult())); connect(m_pVolumeState->m_pSliceAction, SIGNAL(toggled(bool)), this, SLOT(onVolumeSliceToggled(bool))); connect(m_pVolumeState->m_pSliceSettingsAction, SIGNAL(triggered()), this, SLOT(onShowVolumeSliceSettings())); @@ -2649,7 +2654,9 @@ bool nmWxPebiResultViewWidget::canImportVolume() const void nmWxPebiResultViewWidget::synchronizeVolumeActions() { if(m_pVolumeState == nullptr || m_pVolumeState->m_pImportAction == nullptr) return; - m_pVolumeState->m_pImportAction->setEnabled(canImportVolume()); + const bool bCanLoad = canImportVolume(); + m_pVolumeState->m_pImportAction->setEnabled(bCanLoad); + m_pVolumeState->m_pTestModelAction->setEnabled(bCanLoad); m_pVolumeState->m_pImportAction->setText(isImportedVolumeMode() ? tr("Replace 3D Model...") : tr("Import 3D Model...")); m_pVolumeState->m_pReturnAction->setEnabled(isImportedVolumeMode() && m_pVolumeState->m_pTask == nullptr); @@ -2685,7 +2692,20 @@ void nmWxPebiResultViewWidget::onImportVolumeRequested() bool nmWxPebiResultViewWidget::importVolumeFile(const QString& sFilePath) { if(!isResultViewGuiThread() || sFilePath.isEmpty() || !canImportVolume()) return false; - m_pVolumeState->m_pTask = new nmVolumeImportTask(sFilePath, this); + startVolumeLoad(new nmVolumeImportTask(nmVolumeImportTask::FileSource, sFilePath, this)); + return true; +} + +void nmWxPebiResultViewWidget::onLoadSliceTestModelRequested() +{ + if(!isResultViewGuiThread() || !canImportVolume()) return; + // 与文件导入共享取消和提交路径,生成失败时保留原模型及其切片。 + startVolumeLoad(new nmVolumeImportTask(nmVolumeImportTask::SliceTestModelSource, QString(), this)); +} + +void nmWxPebiResultViewWidget::startVolumeLoad(nmVolumeImportTask* pTask) +{ + m_pVolumeState->m_pTask = pTask; m_pVolumeState->m_pProgress = new QProgressDialog(tr("Loading 3D model..."), tr("Cancel"), 0, 100, this); m_pVolumeState->m_pProgress->setObjectName(QLatin1String("volumeImportProgress")); m_pVolumeState->m_pProgress->setWindowModality(Qt::WindowModal); @@ -2700,7 +2720,6 @@ bool nmWxPebiResultViewWidget::importVolumeFile(const QString& sFilePath) m_pVolumeState->m_pProgress->show(); synchronizeBusinessActions(); m_pVolumeState->m_pTask->start(); - return true; } void nmWxPebiResultViewWidget::onCancelVolumeImport() diff --git a/Src/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.cpp index ca09c452..7ea41dd8 100644 --- a/Src/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxVolumeSliceSettingsDlg.cpp @@ -1,5 +1,4 @@ #include "nmWxVolumeSliceSettingsDlg.h" -#include "nmParameterField.h" #include "nmNumericDisplayFormat.h" #include #include @@ -21,7 +20,8 @@ nmWxVolumeSliceSettingsDlg::nmWxVolumeSliceSettingsDlg(QWidget* pParent) { createUi(); writeSettings(m_oApplied); - resize(minimumWidth(), sizeHint().height()); + // 与测量工具一致,由字体、主题和布局计算初始大小,后续仍允许用户调整窗口。 + adjustSize(); } void nmWxVolumeSliceSettingsDlg::createUi() @@ -36,8 +36,6 @@ void nmWxVolumeSliceSettingsDlg::createUi() setIgnoreEsc(false); // 六个分量各占一行,共用标签列和输入列;原点区与法向区分别放置对应快捷操作。 - const int nEditorHeight = nmParameterField::editorHeight(); - const int nEditorMinimumWidth = nmParameterField::editorMinimumWidth(); QGroupBox* pPlaneGroup = new QGroupBox(tr("Plane Parameters"), this); pPlaneGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QGridLayout* pPlaneLayout = new QGridLayout(pPlaneGroup); @@ -45,15 +43,15 @@ void nmWxVolumeSliceSettingsDlg::createUi() pPlaneLayout->setHorizontalSpacing(6); pPlaneLayout->setVerticalSpacing(6); pPlaneLayout->setColumnStretch(1, 1); - int nFieldLabelWidth = 0; const char* pAxes[3] = { "X", "Y", "Z" }; for(int nAxis = 0; nAxis < 3; ++nAxis) { QLabel* pOriginLabel = new QLabel(tr("Origin %1").arg(QLatin1String(pAxes[nAxis])), pPlaneGroup); QLabel* pNormalLabel = new QLabel(tr("Normal %1").arg(QLatin1String(pAxes[nAxis])), pPlaneGroup); pOriginLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); pNormalLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - nFieldLabelWidth = qMax(nFieldLabelWidth, - qMax(pOriginLabel->sizeHint().width(), pNormalLabel->sizeHint().width())); + // 标签列由布局按文字自然取宽;不缓存像素尺寸,便于适应字体和主题变化。 + pOriginLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + pNormalLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); pPlaneLayout->addWidget(pOriginLabel, nAxis, 0); pPlaneLayout->addWidget(pNormalLabel, nAxis + 5, 0); m_pOriginEdits[nAxis] = new QLineEdit(pPlaneGroup); @@ -62,10 +60,7 @@ void nmWxVolumeSliceSettingsDlg::createUi() m_pNormalEdits[nAxis]->setObjectName(QString::fromLatin1("sliceNormal") + QLatin1String(pAxes[nAxis])); m_pOriginEdits[nAxis]->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_pNormalEdits[nAxis]->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - m_pOriginEdits[nAxis]->setMinimumWidth(nEditorMinimumWidth); - m_pNormalEdits[nAxis]->setMinimumWidth(nEditorMinimumWidth); - m_pOriginEdits[nAxis]->setFixedHeight(nEditorHeight); - m_pNormalEdits[nAxis]->setFixedHeight(nEditorHeight); + // 横向随输入列伸展;纵向 Fixed 使用主题推荐高度,不指定固定像素高度。 m_pOriginEdits[nAxis]->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_pNormalEdits[nAxis]->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); pPlaneLayout->addWidget(m_pOriginEdits[nAxis], nAxis, 1); @@ -77,9 +72,9 @@ void nmWxVolumeSliceSettingsDlg::createUi() // 模型中心仅调整原点,放在原点 Z 下方,保持按钮紧凑并与输入框右边界对齐。 QToolButton* pCenterButton = new QToolButton(pPlaneGroup); pCenterButton->setText(tr("Model Center")); + pCenterButton->setToolTip(tr("Move the plane origin to the model center without changing its normal.")); pCenterButton->setAutoRaise(true); - pCenterButton->setMinimumWidth(72); - pCenterButton->setFixedHeight(nEditorHeight); + // 工具按钮按文字与主题计算尺寸,保持紧凑且不裁剪翻译后的标题。 pCenterButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); pPlaneLayout->addWidget(pCenterButton, 3, 1, Qt::AlignRight); pPlaneLayout->setRowMinimumHeight(4, 6); @@ -102,10 +97,10 @@ void nmWxVolumeSliceSettingsDlg::createUi() for(int nPlane = 0; nPlane < 3; ++nPlane) { QToolButton* pButton = new QToolButton(pPlaneGroup); pButton->setText(QString::fromLatin1(pPlanes[nPlane])); + pButton->setToolTip(tr("Set the plane parallel to %1 without changing its origin.") + .arg(QString::fromLatin1(pPlanes[nPlane]))); pButton->setProperty("normalAxis", 2 - nPlane); pButton->setAutoRaise(true); - pButton->setMinimumWidth(44); - pButton->setFixedHeight(nEditorHeight); pButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); pShortcutLayout->addWidget(pButton, 1); setTabOrder(pPreviousShortcutWidget, pButton); @@ -117,26 +112,19 @@ void nmWxVolumeSliceSettingsDlg::createUi() // 着色属性及渲染模式统一使用旧底栏;浮动窗口只保留平面相关的显示选项。 QGroupBox* pDisplayGroup = new QGroupBox(tr("Display Options"), this); pDisplayGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - QGridLayout* pDisplayLayout = new QGridLayout(pDisplayGroup); + // 显示选项没有标签列,直接从分组左边距排列,避免沿用参数区的空列缩进。 + QHBoxLayout* pDisplayLayout = new QHBoxLayout(pDisplayGroup); pDisplayLayout->setContentsMargins(8, 15, 8, 10); - pDisplayLayout->setHorizontalSpacing(6); - pDisplayLayout->setVerticalSpacing(6); - pPlaneLayout->setColumnMinimumWidth(0, nFieldLabelWidth); - pDisplayLayout->setColumnMinimumWidth(0, nFieldLabelWidth); - pDisplayLayout->setColumnStretch(1, 1); + pDisplayLayout->setSpacing(12); m_pShowPlaneCheck = new QCheckBox(tr("Show Plane"), pDisplayGroup); m_pShowSourceCheck = new QCheckBox(tr("Show Original Model"), pDisplayGroup); m_pShowPlaneCheck->setObjectName(QLatin1String("sliceShowPlane")); m_pShowSourceCheck->setObjectName(QLatin1String("sliceShowSource")); // 拖动说明放在显示平面的悬停提示中,减少常驻文字对参数布局的干扰。 m_pShowPlaneCheck->setToolTip(tr("Drag the center or outline to move the plane; drag arrows to rotate.")); - QHBoxLayout* pDisplayOptionsLayout = new QHBoxLayout; - pDisplayOptionsLayout->setContentsMargins(0, 0, 0, 0); - pDisplayOptionsLayout->setSpacing(12); - pDisplayOptionsLayout->addWidget(m_pShowPlaneCheck); - pDisplayOptionsLayout->addWidget(m_pShowSourceCheck); - pDisplayOptionsLayout->addStretch(); - pDisplayLayout->addLayout(pDisplayOptionsLayout, 0, 1); + pDisplayLayout->addWidget(m_pShowPlaneCheck); + pDisplayLayout->addWidget(m_pShowSourceCheck); + pDisplayLayout->addStretch(); setTabOrder(pPreviousShortcutWidget, m_pShowPlaneCheck); setTabOrder(m_pShowPlaneCheck, m_pShowSourceCheck); connect(m_pShowPlaneCheck, SIGNAL(toggled(bool)), this, SLOT(onDisplayOptionsChanged())); @@ -154,24 +142,25 @@ void nmWxVolumeSliceSettingsDlg::createUi() pFooterLayout->setContentsMargins(4, 5, 4, 5); pFooterLayout->setSpacing(8); pFooterLayout->addStretch(); - QPushButton* pResetButton = new QPushButton(tr("Reset"), this); + QPushButton* pRestoreButton = new QPushButton(tr("Restore"), this); + // 还原仅撤销未应用的平面编辑,恢复最近一次成功应用的参数,不恢复初始截面。 + pRestoreButton->setToolTip(tr("Restore the last applied plane parameters.")); m_pApplyButton = new QPushButton(tr("Apply"), this); QPushButton* pCloseButton = new QPushButton(tr("Close"), this); m_pApplyButton->setObjectName(QLatin1String("sliceApplyButton")); m_pApplyButton->setDefault(true); - pResetButton->setAutoDefault(false); + pRestoreButton->setAutoDefault(false); pCloseButton->setAutoDefault(false); - pResetButton->setMinimumWidth(72); - m_pApplyButton->setMinimumWidth(72); - pCloseButton->setMinimumWidth(72); pCloseButton->setIcon(zxLoadIcon("Cancel")); - pCloseButton->setIconSize(QSize(16, 16)); - pFooterLayout->addWidget(pResetButton); + pFooterLayout->addWidget(pRestoreButton); pFooterLayout->addWidget(m_pApplyButton); pFooterLayout->addWidget(pCloseButton); connect(m_pApplyButton, SIGNAL(clicked()), this, SLOT(onApplyRequested())); - connect(pResetButton, SIGNAL(clicked()), this, SLOT(onResetRequested())); + connect(pRestoreButton, SIGNAL(clicked()), this, SLOT(onRestoreRequested())); connect(pCloseButton, SIGNAL(clicked()), this, SLOT(close())); + setTabOrder(m_pShowSourceCheck, pRestoreButton); + setTabOrder(pRestoreButton, m_pApplyButton); + setTabOrder(m_pApplyButton, pCloseButton); QVBoxLayout* pMainLayout = new QVBoxLayout(this); pMainLayout->setContentsMargins(12, 10, 12, 0); @@ -179,9 +168,9 @@ void nmWxVolumeSliceSettingsDlg::createUi() pMainLayout->addWidget(pPlaneGroup); pMainLayout->addWidget(pDisplayGroup); pMainLayout->addWidget(m_pErrorLabel); + // 初始高度按内容收紧;手动纵向拉伸的余量留在底部,不拉长输入框或分组行距。 pMainLayout->addStretch(); pMainLayout->addLayout(pFooterLayout); - setMinimumWidth(400); } void nmWxVolumeSliceSettingsDlg::setData(const QSharedPointer& pData, const nmVolumeSliceSettings& oApplied) @@ -198,7 +187,7 @@ void nmWxVolumeSliceSettingsDlg::setAppliedSettings(const nmVolumeSliceSettings& void nmWxVolumeSliceSettingsDlg::setAppliedProperty(const QString& sPropertyId) { - // 底栏属性立即生效;重置、关闭窗口及再次应用平面时也应继续使用此属性。 + // 底栏属性立即生效;还原、关闭窗口及再次应用平面时也应继续使用此属性。 m_oApplied.m_sPropertyId = sPropertyId; } @@ -313,7 +302,7 @@ void nmWxVolumeSliceSettingsDlg::onCenterRequested() onDraftChanged(); } -void nmWxVolumeSliceSettingsDlg::onResetRequested() +void nmWxVolumeSliceSettingsDlg::onRestoreRequested() { writeSettings(m_oApplied); emit previewChanged();