diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index e7a2d926..6ae21d33 100644 Binary files a/Bin/Config/Lang/cn/nmNum_cn.qm and b/Bin/Config/Lang/cn/nmNum_cn.qm differ diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index 9659e0c4..91067470 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -2886,7 +2886,6 @@ Reason: %1 nmWxPebiResultViewWidget No result data.暂无结果数据。 - Result Grid结果网格 Color Scale色标 Scale Grid比例网格 Cell Edges单元边线 diff --git a/Include/nmNum/nmSubWxs/nmPebiResultSceneController.h b/Include/nmNum/nmSubWxs/nmPebiResultSceneController.h index e5791842..508c2e1e 100644 --- a/Include/nmNum/nmSubWxs/nmPebiResultSceneController.h +++ b/Include/nmNum/nmSubWxs/nmPebiResultSceneController.h @@ -65,8 +65,6 @@ public: const nmPebiResultDisplaySettings& oSettings, QString* pError = nullptr); - /** @brief 设置结果网格显隐;偏好跨快照保留。 */ - void setMeshVisible(bool bVisible); /** @brief 设置色标显隐;默认显示,偏好跨快照保留。 */ void setScalarBarVisible(bool bVisible); /** @brief 设置平面比例网格显隐;偏好跨快照保留。 */ @@ -111,8 +109,6 @@ public: /** @brief 返回当前属性最后一次成功提交的规范化显示设置。 */ bool getCurrentDisplaySettings( nmPebiResultDisplaySettings& oSettings) const; - /** @brief 返回结果网格显示偏好,不要求当前存在快照。 */ - bool isMeshVisible() const; /** @brief 返回色标显示偏好,不要求当前存在快照。 */ bool isScalarBarVisible() const; /** @brief 返回比例网格显示偏好,不要求当前存在快照。 */ diff --git a/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h b/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h index cde79d00..e5f0c910 100644 --- a/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h +++ b/Include/nmNum/nmSubWxs/nmWxPebiResultViewWidget.h @@ -63,8 +63,6 @@ private slots: /** @brief 明确操作成功后清除旧普通错误,不影响绑定失败或过期状态。 */ void onControlOperationSucceeded(); - /** @brief 切换结果网格显隐。 */ - void onMeshToggled(bool bVisible); /** @brief 切换色标显隐。 */ void onScalarBarToggled(bool bVisible); /** @brief 切换比例网格显隐。 */ @@ -90,7 +88,7 @@ private: const QSharedPointer& pSnapshot, const QString& sSnapshotId, bool bCurrent); - /** @brief 从 SceneController 镜像六个业务 QAction 的勾选和可用状态。 */ + /** @brief 从 SceneController 镜像五个业务 QAction 的勾选和可用状态。 */ void synchronizeBusinessActions(); /** @brief 根据“绑定失败、过期、操作错误”的固定优先级刷新提示栏。 */ void refreshStatusBar(); @@ -104,7 +102,6 @@ private: QToolBar* m_pToolBar; ///< Qt 父对象拥有的右侧竖向工具栏。 QLabel* m_pStatusLabel; ///< 过期或错误的非阻塞提示栏。 - QAction* m_pMeshAction; ///< 结果网格显隐动作。 QAction* m_pScalarBarAction; ///< 色标显隐动作。 QAction* m_pScaleGridAction; ///< 比例网格显隐动作。 QAction* m_pCellEdgesAction; ///< 单元边线显隐动作。 diff --git a/Src/nmNum/nmSubWxs/nmPebiResultSceneController.cpp b/Src/nmNum/nmSubWxs/nmPebiResultSceneController.cpp index 14d84c70..2556cfce 100644 --- a/Src/nmNum/nmSubWxs/nmPebiResultSceneController.cpp +++ b/Src/nmNum/nmSubWxs/nmPebiResultSceneController.cpp @@ -401,7 +401,6 @@ public: m_nSnapshotBindingRevision(0), m_bHasPropertyRange(false), m_bHasBounds(false), - m_bMeshVisible(true), m_bScalarBarVisible(true), m_bScaleGridVisible(false), m_bCellEdgesVisible(false), @@ -713,7 +712,8 @@ public: ? nmVTKMeshLayer::DisplayMode_SurfaceWithEdges : nmVTKMeshLayer::DisplayMode_Surface); m_pMeshLayer->setScalarVisibility(bHasData); - m_pMeshLayer->setVisible(bHasData && m_bMeshVisible); + // 彩色结果网格是有效快照的主内容,不提供独立隐藏状态。 + m_pMeshLayer->setVisible(bHasData); } if(m_pScalarBarLayer != nullptr) { m_pScalarBarLayer->setVisible( @@ -730,7 +730,7 @@ public: } if(m_pContainer != nullptr) { m_pContainer->setRotationCenterPickTarget( - bHasData && m_bMeshVisible && m_pMeshLayer != nullptr + bHasData && m_pMeshLayer != nullptr ? m_pMeshLayer->getActor() : nullptr); } } @@ -882,7 +882,6 @@ public: double m_dBounds[6]; bool m_bHasPropertyRange; bool m_bHasBounds; - bool m_bMeshVisible; bool m_bScalarBarVisible; bool m_bScaleGridVisible; bool m_bCellEdgesVisible; @@ -1315,24 +1314,6 @@ bool nmPebiResultSceneController::applyCurrentDisplaySettings( return true; } -void nmPebiResultSceneController::setMeshVisible(bool bVisible) -{ - Q_ASSERT(isResultSceneGuiThread()); - if(!isResultSceneGuiThread() || m_pPrivate == nullptr) { - return; - } - m_pPrivate->discardActiveDataIfLayersLost(); - if(m_pPrivate->m_bMeshVisible == bVisible) { - return; - } - m_pPrivate->m_bMeshVisible = bVisible; - const bool bHasData = hasSnapshot(); - m_pPrivate->applyLayerVisibility(bHasData); - if(bHasData) { - m_pPrivate->m_pContainer->renderView(); - } -} - void nmPebiResultSceneController::setScalarBarVisible(bool bVisible) { Q_ASSERT(isResultSceneGuiThread()); @@ -1535,11 +1516,6 @@ bool nmPebiResultSceneController::getCurrentDisplaySettings( return true; } -bool nmPebiResultSceneController::isMeshVisible() const -{ - return m_pPrivate != nullptr && m_pPrivate->m_bMeshVisible; -} - bool nmPebiResultSceneController::isScalarBarVisible() const { return m_pPrivate != nullptr && m_pPrivate->m_bScalarBarVisible; diff --git a/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp b/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp index 59cbff22..e92e45b8 100644 --- a/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPebiResultViewWidget.cpp @@ -56,7 +56,6 @@ nmWxPebiResultViewWidget::nmWxPebiResultViewWidget( m_pControlBar(nullptr), m_pToolBar(nullptr), m_pStatusLabel(nullptr), - m_pMeshAction(nullptr), m_pScalarBarAction(nullptr), m_pScaleGridAction(nullptr), m_pCellEdgesAction(nullptr), @@ -173,7 +172,6 @@ void nmWxPebiResultViewWidget::appendContextMenuActions(QMenu* pMenu) if(pMenu == nullptr) { return; } - pMenu->addAction(m_pMeshAction); pMenu->addAction(m_pScalarBarAction); pMenu->addAction(m_pScaleGridAction); pMenu->addAction(m_pCellEdgesAction); @@ -203,13 +201,6 @@ void nmWxPebiResultViewWidget::onControlOperationSucceeded() refreshStatusBar(); } -void nmWxPebiResultViewWidget::onMeshToggled(bool bVisible) -{ - if(m_pSceneController != nullptr && m_pSceneController->hasSnapshot()) { - m_pSceneController->setMeshVisible(bVisible); - } -} - void nmWxPebiResultViewWidget::onScalarBarToggled(bool bVisible) { if(m_pSceneController != nullptr && m_pSceneController->hasSnapshot()) { @@ -281,8 +272,6 @@ void nmWxPebiResultViewWidget::createUi() m_pToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); m_pToolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); - m_pMeshAction = new QAction(QIcon(resultViewIconPath("NmGrid.png")), - tr("Result Grid"), this); m_pScalarBarAction = new QAction( QIcon(resultViewIconPath("NmColorScale.png")), tr("Color Scale"), this); @@ -300,10 +289,10 @@ void nmWxPebiResultViewWidget::createUi() tr("Well Names"), this); QAction* const pBusinessActions[] = { - m_pMeshAction, m_pScalarBarAction, m_pScaleGridAction, - m_pCellEdgesAction, m_pWellMarkersAction, m_pWellNamesAction + m_pScalarBarAction, m_pScaleGridAction, m_pCellEdgesAction, + m_pWellMarkersAction, m_pWellNamesAction }; - for(int nIndex = 0; nIndex < 6; ++nIndex) { + for(int nIndex = 0; nIndex < 5; ++nIndex) { pBusinessActions[nIndex]->setCheckable(true); pBusinessActions[nIndex]->setToolTip( pBusinessActions[nIndex]->text()); @@ -335,15 +324,13 @@ void nmWxPebiResultViewWidget::createUi() if(pFrontAction != nullptr) m_pToolBar->addAction(pFrontAction); if(pPickCenterAction != nullptr) m_pToolBar->addAction(pPickCenterAction); m_pToolBar->addSeparator(); - for(int nIndex = 0; nIndex < 6; ++nIndex) { + for(int nIndex = 0; nIndex < 5; ++nIndex) { m_pToolBar->addAction(pBusinessActions[nIndex]); } m_pToolBar->addSeparator(); if(pCopyAction != nullptr) m_pToolBar->addAction(pCopyAction); } - connect(m_pMeshAction, SIGNAL(toggled(bool)), - this, SLOT(onMeshToggled(bool))); connect(m_pScalarBarAction, SIGNAL(toggled(bool)), this, SLOT(onScalarBarToggled(bool))); connect(m_pScaleGridAction, SIGNAL(toggled(bool)), @@ -507,8 +494,6 @@ void nmWxPebiResultViewWidget::synchronizeBusinessActions() if(m_pSceneController == nullptr) { return; } - setActionCheckedWithoutSignal( - m_pMeshAction, m_pSceneController->isMeshVisible()); setActionCheckedWithoutSignal( m_pScalarBarAction, m_pSceneController->isScalarBarVisible()); setActionCheckedWithoutSignal( @@ -521,7 +506,6 @@ void nmWxPebiResultViewWidget::synchronizeBusinessActions() m_pWellNamesAction, m_pSceneController->areWellNamesVisible()); const bool bEnabled = m_pSceneController->hasSnapshot(); - m_pMeshAction->setEnabled(bEnabled); m_pScalarBarAction->setEnabled(bEnabled); m_pScaleGridAction->setEnabled(bEnabled); m_pCellEdgesAction->setEnabled(bEnabled);