From 0bcf0b12193235efcfbb939380affc7af2d349c3 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Fri, 13 Nov 2026 11:37:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(Nm)=EF=BC=9A=E7=BB=9F=E4=B8=80=E6=B5=8B?= =?UTF-8?q?=E9=87=8F=E5=B7=A5=E5=85=B7=E6=A0=B7=E5=BC=8F=E5=B9=B6=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=BC=B8=E7=BC=A9=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一测量结果只读输入框、框架单位下拉框和底部按钮样式 - 参照储层参数调整测量与比例尺布局,输入框和单位框按 8:5 横向伸缩 - 控件高度随字体和主题确定,两个拟合按钮分行排列 - 修复切换分析后测量数据清理归属错误及拟合后画布未刷新问题 - 保留连续测量和拟合后的单位选择,补充中文注释和翻译 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 207712 -> 207835 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 8 + Include/nmNum/nmPlot/nmGuiPlot.h | 6 +- Include/nmNum/nmPlot/nmPlotGraphicBinder.h | 5 +- Include/nmNum/nmSubWxs/nmWxMeasureDlg.h | 77 ++-- .../nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h | 6 + Src/nmNum/nmPlot/nmGuiPlot.cpp | 23 +- Src/nmNum/nmPlot/nmPlotGraphicBinder.cpp | 48 ++- Src/nmNum/nmSubWnd/nmSubWndMain.cpp | 5 +- Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp | 403 +++++++++--------- Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp | 65 ++- 11 files changed, 400 insertions(+), 246 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index f016e465b233293b17651341bccdeaeea8fd8572..140921bd0b5ed5220924ec548aeb2a5650122884 100644 GIT binary patch delta 7752 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 LkNrN3wyOOf-xyuh diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index 3e419a77..a9bfb2f5 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -6431,6 +6431,14 @@ Please check your input coordinates. Measure 测量 + + Measurement results + 测量结果 + + + Length + 长度 + Fit start to nearest well 将起点拟合到最近的井 diff --git a/Include/nmNum/nmPlot/nmGuiPlot.h b/Include/nmNum/nmPlot/nmGuiPlot.h index 33b14b73..63d04a47 100644 --- a/Include/nmNum/nmPlot/nmGuiPlot.h +++ b/Include/nmNum/nmPlot/nmGuiPlot.h @@ -117,9 +117,9 @@ class NM_PLOT_EXPORT nmGuiPlot : public iGuiPlot { // 删除图元对象 void slotDeleteOneObj(QString sName, void* obj); - // 删除测量对象 + // 删除本 Map 的测量图元和数据,不访问全局当前分析。 void deleteMeasureObjects(); - // 清除当前测量对象 + // 开始新一次测量时清空本 Map 的线段,保留数据对象供对话框继续监听。 void clearPreviousMeasure(); // 结束测量 void finishMeasure(); @@ -218,6 +218,8 @@ class NM_PLOT_EXPORT nmGuiPlot : public iGuiPlot { // 获取 Binder nmPlotGraphicBinder* graphicBinder() const { return m_pGraphicBinder; } + /** @brief 返回本 Map 实际绑定的管理器;未绑定时返回空,不回退到当前分析。 */ + nmDataAnalyzeManager* boundDataManager() const; protected: diff --git a/Include/nmNum/nmPlot/nmPlotGraphicBinder.h b/Include/nmNum/nmPlot/nmPlotGraphicBinder.h index 1037b766..965e39d0 100644 --- a/Include/nmNum/nmPlot/nmPlotGraphicBinder.h +++ b/Include/nmNum/nmPlot/nmPlotGraphicBinder.h @@ -101,7 +101,7 @@ public: // 调用:删除测量线图元前 void removeMeasureBinding(nmObjLineMeasure* pGraphic); - // 坐标同步:从数据对象读取起点终点,写回图元(拟合功能修改数据后由 paintBack 调用) + // 坐标同步:数据变更时主动调用,paintBack 保留兜底;本函数不请求重绘。 void syncMeasurePoints(nmObjLineMeasure* pGraphic); // ==================== 区域标记图元 ==================== @@ -205,6 +205,9 @@ public slots: void onDataChanged(); private slots: + /** @brief 测量数据变更后同步所属线段并刷新视口,避免拟合结果等待鼠标移动才显示。 */ + void onMeasureDataChanged(); + // 断层图元信号 → 数据同步 void onGraphicFlowModelChanged(int model); void onGraphicLeakageChanged(double leakage); diff --git a/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h b/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h index 692eb859..8a9b5ef0 100644 --- a/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h @@ -2,47 +2,74 @@ #define NMWXMEASUREDLG_H #include "iDlgBase.h" -#include #include "nmSubWxs_global.h" -#include "nmDataMeasure.h" -class QVBoxLayout; +#include + +class QLineEdit; class QPushButton; -class nmGUIComponentBase; -class nmDataWellBase; +class nmDataAnalyzeManager; +class nmDataMeasure; +/** + * @brief 测量工具浮动对话框,显示测量长度,并支持将端点拟合到最近的井。 + * @note 长度使用可复制的只读输入框,显示单位与换算由框架单位绑定器管理。 + * 切换单位只改变显示,测量数据始终保留米制长度;关闭窗口时通知绘图区结束测量。 + * 初始尺寸随字体和主题计算,控件采用推荐高度,窗口纵向拉伸时内容保持紧凑。 + * 输入列与单位列沿用储层参数常规字段的 8:5 横向伸展比例。 + */ class NM_SUB_WXS_EXPORT nmWxMeasureDlg : public iDlgBase { Q_OBJECT + public: + /** @brief 绑定父级 nmGuiPlot 所属的分析数据;parent 负责管理对话框生命周期。 */ explicit nmWxMeasureDlg(QWidget* parent = nullptr); - void initUI(); - void initComponents(); - void initPara(); - - void closeEvent(QCloseEvent* event); signals: - void needDeleteMeasureObj(); - void sigonFitStartClicked(); - void sigonFitEndClicked(); + /** @brief 对话框结束时通知所属绘图区移除测量工具和线段。 */ + void needDeleteMeasureObj(); + +public slots: + /** @brief 将测量起点拟合到最近的井,并重新计算米制长度。 */ + void onFitStartClicked(); + + /** @brief 将测量终点拟合到最近的井,并重新计算米制长度。 */ + void onFitEndClicked(); + + /** @brief 从测量模型刷新只读长度,保留用户当前选择的显示单位。 */ + void updateDisplay(); + + /** @brief 响应底部关闭按钮,结束对话框。 */ + void onCloseClicked(); + + /** @brief 开始新一次测量时,恢复两个端点的拟合操作。 */ + void resetButtons(); + +protected: + /** @brief 响应标题栏关闭,通知绘图区清理后交给基类处理关闭事件。 */ + void closeEvent(QCloseEvent* event) override; + +private: + /** @brief 创建统一的长度字段、端点操作区和底部按钮区。 */ + void initUI() override; + + /** @brief 共用的端点拟合逻辑;bFitStart 为 true 时处理起点,否则处理终点。 */ + void fitToNearestWell(bool bFitStart); + private: + // 借用父级 Map 的分析管理器及测量数据,不负责释放;对象删除后自动置空。 + // 拟合始终从同一分析读取井,避免切换分析后将其他分析的井坐标写入本次测量。 + QPointer m_pDataManager; + QPointer m_pData; - QVBoxLayout* m_pMainLayout; - QVector m_vecWellList; + // 长度及拟合按钮均由 Qt 父子对象机制释放,不使用旧的业务单位控件。 + QLineEdit* m_pLengthEdit; QPushButton* m_pFitStartButton; QPushButton* m_pFitEndButton; - double* m_pLength; - nmDataMeasure* m_pData; - nmGUIComponentBase* m_pLengthCom; - -public slots: - void onFitStartClicked(); - void onFitEndClicked(); - void updateDisplay(); - void onCloseClicked(); - void resetButtons(); + // 框架单位对是否绑定成功;失败时不显示未经换算的长度。 + bool m_bUnitBound; }; #endif // NMWXMEASUREDLG_H diff --git a/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h b/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h index 9ab2276e..9de4c6b5 100644 --- a/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h @@ -5,6 +5,7 @@ #include "nmSubWxs_global.h" #include +#include #include class QLineEdit; @@ -14,6 +15,8 @@ class QLineEdit; * @note 起始点、终点使用可复制的只读输入框;实际长度的显示单位和换算由框架单位绑定器管理。 * 确认后仅向调用方返回米制长度,由所属绘图窗口在标定成功后保存分析数据。 * 取消或关闭窗口不提交编辑内容。 + * 字段初始尺寸由字体和主题决定,坐标内容影响推荐宽度;控件采用推荐高度,纵向保持紧凑。 + * 输入列与单位列沿用储层参数常规字段的 8:5 横向伸展比例。 */ class NM_SUB_WXS_EXPORT nmWxMeasuringScaleDlg : public iDlgBase { @@ -30,6 +33,9 @@ public: */ nmWxMeasuringScaleDlg(QPointF startPoint, QPointF endPoint, double* pLength); + /** @brief 按布局、当前字体及坐标文字给出推荐尺寸,不设置固定尺寸或内容最小宽度。 */ + QSize sizeHint() const override; + protected: /** * @brief 校验当前单位下的长度,返回米制长度并以 Accepted 状态关闭窗口。 diff --git a/Src/nmNum/nmPlot/nmGuiPlot.cpp b/Src/nmNum/nmPlot/nmGuiPlot.cpp index 698cb77e..2de001ad 100644 --- a/Src/nmNum/nmPlot/nmGuiPlot.cpp +++ b/Src/nmNum/nmPlot/nmGuiPlot.cpp @@ -1313,6 +1313,10 @@ void nmGuiPlot::applyMeasuringScale(const QPointF& pStart, const QPointF& pEnd) void nmGuiPlot::deleteMeasureObjects() { + if(m_pPlot == nullptr) { + return; + } + QVector measureObjs = getObjsByTag("nObjLineMeasure"); for(int i = 0; i < measureObjs.count(); i++) { @@ -1325,8 +1329,11 @@ void nmGuiPlot::deleteMeasureObjects() } } - // 清空数据对象 - nmDataAnalyzeManager::getCurrentInstance()->removeMeasureData(); + // 先解除本 Map 的图元绑定,再删除所属分析的测量数据。 + // 非模态对话框关闭时,当前页签可能已切换,不能使用全局当前分析。 + if(m_pDataManager != nullptr) { + m_pDataManager->removeMeasureData(); + } // 恢复画布可编辑状态 setAllPlotObjectsEditable(true); @@ -1334,6 +1341,10 @@ void nmGuiPlot::deleteMeasureObjects() void nmGuiPlot::clearPreviousMeasure() { + if(m_pPlot == nullptr) { + return; + } + QVector measureObjs = getObjsByTag("nObjLineMeasure"); for(int i = 0; i < measureObjs.count(); i++) { @@ -1346,7 +1357,8 @@ void nmGuiPlot::clearPreviousMeasure() } } - nmDataMeasure* data = nmDataAnalyzeManager::getCurrentInstance()->getMeasureData(); + // 连续测量复用同一数据对象,保证对话框的刷新连接仍然有效。 + nmDataMeasure* data = m_pDataManager != nullptr ? m_pDataManager->getMeasureData() : nullptr; if(data) { data->setStartPoint(QPointF(0, 0)); @@ -1505,6 +1517,11 @@ void nmGuiPlot::deleteAllDFNPlots() } } +nmDataAnalyzeManager* nmGuiPlot::boundDataManager() const +{ + return m_pDataManager; +} + nmDataAnalyzeManager* nmGuiPlot::dataManager() const { return m_pDataManager != nullptr diff --git a/Src/nmNum/nmPlot/nmPlotGraphicBinder.cpp b/Src/nmNum/nmPlot/nmPlotGraphicBinder.cpp index faa9c41b..669b0c34 100644 --- a/Src/nmNum/nmPlot/nmPlotGraphicBinder.cpp +++ b/Src/nmNum/nmPlot/nmPlotGraphicBinder.cpp @@ -27,6 +27,7 @@ #include "ZxDataGaugeP.h" #include "ZxDataGaugeF.h" #include "ZxBaseUtil.h" +#include "ZxRenderView.h" #include "Defines.h" #include "iDataTypes.h" #include "zxSysUtils.h" @@ -150,9 +151,14 @@ void nmPlotGraphicBinder::syncFaultName(nmObjLineFault* pGraphic) } // 切换分析时更新绑定的 DataManager -// 旧图元已由 deleteAllPlotObjs 清除,清理残留映射避免悬空指针 +// Map 重建时先解除测量刷新连接并清理映射,供调用方安全移除旧图元。 void nmPlotGraphicBinder::updateDataMgr(nmDataAnalyzeManager* pDataMgr) { + // 重建或切换 Map 时先断开旧测量数据的刷新连接,再清空图元映射。 + foreach(nmDataMeasure* pMeasureData, m_mapMeasureData.values()) { + QObject::disconnect(pMeasureData, SIGNAL(sigMeasureDataChanged()), + this, SLOT(onMeasureDataChanged())); + } m_mapFaultData.clear(); m_setBoundGraphics.clear(); m_mapCrackData.clear(); @@ -967,6 +973,8 @@ void nmPlotGraphicBinder::createMeasureForGraphic(nmObjLineMeasure* pGraphic) // 获取测量数据单例 nmDataMeasure* pData = m_pDataMgr->getMeasureData(); + // 同一图元再次绑定时先清除旧连接,避免初始化端点期间反向覆盖新线段。 + removeMeasureBinding(pGraphic); // 将图元坐标推入数据 QVector pts = pGraphic->getAllValues(); @@ -986,6 +994,9 @@ void nmPlotGraphicBinder::createMeasureForGraphic(nmObjLineMeasure* pGraphic) // 建立映射 m_mapMeasureData[pGraphic] = pData; pGraphic->setGraphicBinder(this); + // 对话框只修改模型;由绑定器负责把变更送回所属画布,不依赖偶然重绘。 + QObject::connect(pData, SIGNAL(sigMeasureDataChanged()), + this, SLOT(onMeasureDataChanged()), Qt::UniqueConnection); m_pDataMgr->notifyDataChanged(); } @@ -997,10 +1008,37 @@ void nmPlotGraphicBinder::removeMeasureBinding(nmObjLineMeasure* pGraphic) return; } - m_mapMeasureData.remove(pGraphic); + nmDataMeasure* pData = m_mapMeasureData.take(pGraphic); + // 一个数据对象可能关联多个图元,仅在最后一个绑定移除后断开刷新。 + if(pData != nullptr && !m_mapMeasureData.values().contains(pData)) { + QObject::disconnect(pData, SIGNAL(sigMeasureDataChanged()), + this, SLOT(onMeasureDataChanged())); + } +} + +void nmPlotGraphicBinder::onMeasureDataChanged() +{ + nmDataMeasure* pData = qobject_cast(sender()); + if(pData == nullptr) { + return; + } + + QMap::const_iterator it = m_mapMeasureData.constBegin(); + for(; it != m_mapMeasureData.constEnd(); ++it) { + if(it.key() == nullptr || it.value() != pData) { + continue; + } + nmObjLineMeasure* pGraphic = it.key(); + syncMeasurePoints(pGraphic); + ZxRenderView* pView = pGraphic->getView(); + if(pView != nullptr) { + // 更新整个视口,覆盖拟合前后的线段区域,避免旧位置留下残影。 + pView->viewport()->update(); + } + } } -// 坐标同步:从数据对象读取起点终点,写回图元(拟合功能修改数据后由 paintBack 调用) +// 同步端点但不触发重绘,避免 paintBack 中的兜底调用形成循环刷新。 void nmPlotGraphicBinder::syncMeasurePoints(nmObjLineMeasure* pGraphic) { if (!pGraphic || !m_pDataMgr) return; @@ -1018,11 +1056,11 @@ void nmPlotGraphicBinder::syncMeasurePoints(nmObjLineMeasure* pGraphic) return; } - pGraphic->blockSignals(true); + const bool bOldSignalsBlocked = pGraphic->blockSignals(true); QVector pts; pts << startPt << endPt; pGraphic->setAllValues(pts); - pGraphic->blockSignals(false); + pGraphic->blockSignals(bOldSignalsBlocked); } // ==================== 区域标记图元 ==================== diff --git a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp index bd355dd5..ee94e63a 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp @@ -1723,7 +1723,7 @@ QWidget* nmSubWndMain::showMeasureDialog() { nmGuiPlot* plot = dynamic_cast(m_pWxPlot); - if(plot == nullptr) { + if(plot == nullptr || plot->boundDataManager() == nullptr) { return nullptr; } @@ -1743,7 +1743,8 @@ QWidget* nmSubWndMain::showMeasureDialog() measureDlg->setObjectName("nmMeasureDialog"); measureDlg->setAttribute(Qt::WA_DeleteOnClose, true); bindDialogCmdDestroyed(measureDlg, 5129); - nmDataMeasure* measureData = nmDataAnalyzeManager::getCurrentInstance()->getMeasureData(); + // 与对话框及图元绑定器共用本 Map 的测量数据,避免连接到其他分析。 + nmDataMeasure* measureData = plot->boundDataManager()->getMeasureData(); if(measureData != nullptr) { connect(measureData, SIGNAL(sigMeasureDataChanged()), measureDlg, SLOT(updateDisplay())); } diff --git a/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp b/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp index 7a4a4779..96cb9084 100644 --- a/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp @@ -1,247 +1,254 @@ #include "nmWxMeasureDlg.h" -#include -#include -#include -#include -#include -#include - +#include "iUnitWxBinder.h" #include "nmDataAnalyzeManager.h" -#include "nmGUIComponentLineEdit.h" +#include "nmDataMeasure.h" #include "nmDataWellBase.h" +#include "nmGuiPlot.h" +#include "ZxBaseUtil.h" -Q_DECLARE_METATYPE(double *) -Q_DECLARE_METATYPE(QString *) +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include nmWxMeasureDlg::nmWxMeasureDlg(QWidget* parent) : iDlgBase(parent), - m_pMainLayout(NULL), - m_pFitStartButton(NULL), - m_pFitEndButton(NULL), - m_pLength(NULL), - m_pData(NULL), - m_pLengthCom(NULL) + m_pLengthEdit(nullptr), + m_pFitStartButton(nullptr), + m_pFitEndButton(nullptr), + m_bUnitBound(false) { + // 浮动窗口必须绑定父级画布的分析,不能随全局当前页签变化而串用数据。 + nmGuiPlot* pOwnerPlot = qobject_cast(parent); + if (pOwnerPlot != nullptr) + { + m_pDataManager = pOwnerPlot->boundDataManager(); + } + if (!m_pDataManager.isNull()) + { + m_pData = m_pDataManager->getMeasureData(); + } - this->initUI(); - this->resize(400, 150); - this->setWindowTitle(tr("Measure")); - m_pFitStartButton->setEnabled(false); - m_pFitEndButton->setEnabled(false); + initUI(); + updateDisplay(); + setWindowTitle(tr("Measure")); + // 保留浮动置顶行为,便于在绘图区连续测量,同时移除无帮助内容的问号按钮。 + setWindowFlags((windowFlags() | Qt::WindowStaysOnTopHint) & + ~Qt::WindowContextHelpButtonHint); + // 初始大小由字体、主题及布局推荐尺寸决定;adjustSize 同时考虑屏幕尺寸。 + // 这里只设置初始大小,不限制用户之后调整窗口。 + adjustSize(); } void nmWxMeasureDlg::initUI() { - m_pMainLayout = new QVBoxLayout; - this->setLayout(m_pMainLayout); - // 构建组件 - this->initPara(); - this->initComponents(); - - // 按钮部分 - m_pFitStartButton = new QPushButton(tr("Fit start to nearest well")); - m_pFitEndButton = new QPushButton(tr("Fit end to nearest well")); - - QString qss = "QPushButton:disabled { color: #888888; }"; - m_pFitStartButton->setStyleSheet(qss); - m_pFitEndButton->setStyleSheet(qss); - + // 与比例尺设置保持相同的外边距和分组间距,控件尺寸交给字体与主题计算。 + QVBoxLayout* pMainLayout = new QVBoxLayout(this); + pMainLayout->setContentsMargins(12, 10, 12, 0); + pMainLayout->setSpacing(10); + + QGroupBox* pGroup = new QGroupBox(tr("Measurement results"), this); + // 分组只横向伸展,内容高度由字体和主题的推荐尺寸决定,避免纵向拉长控件或行间距。 + pGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + QGridLayout* pGrid = new QGridLayout(pGroup); + pGrid->setContentsMargins(8, 15, 8, 10); + pGrid->setHorizontalSpacing(6); + pGrid->setVerticalSpacing(6); + // 沿用储层参数常规字段的三列规则:标签按内容,输入框与单位下拉框按 8:5 伸展。 + pGrid->setColumnStretch(0, 0); + pGrid->setColumnStretch(1, 8); + pGrid->setColumnStretch(2, 5); + + QLabel* pLengthLabel = new QLabel(tr("Length"), pGroup); + pLengthLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + pLengthLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + pGrid->addWidget(pLengthLabel, 0, 0); + + // 长度只能由测量和端点拟合产生;只读而非禁用,允许用户选中、复制结果。 + m_pLengthEdit = new QLineEdit(pGroup); + m_pLengthEdit->setObjectName("measureLength"); + m_pLengthEdit->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + m_pLengthEdit->setReadOnly(true); + // 纵向 Fixed 使用当前字体和主题的推荐高度,不设置固定像素高度。 + m_pLengthEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + pGrid->addWidget(m_pLengthEdit, 0, 1); + + QComboBox* pLengthUnit = new QComboBox(pGroup); + pLengthUnit->setObjectName("measureLengthUnit"); + // 推荐及最小宽度按完整单位列表和主题箭头计算,窗口拉宽时与输入框一起伸展。 + pLengthUnit->setSizeAdjustPolicy(QComboBox::AdjustToContents); + pLengthUnit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + pGrid->addWidget(pLengthUnit, 0, 2); + + // 由米识别框架长度单位组,不借用井参数及其范围,也不读取模型的旧手写单位列表。 + // 单位切换和显示精度交给绑定器处理,不将显示单位或显示数值写回测量模型。 + pLengthUnit->addItem("m"); + m_bUnitBound = bindUnitPairWxs(m_pLengthEdit, pLengthUnit, QString(), false); + m_bUnitBound = m_bUnitBound && m_pUnitBinder != nullptr; + m_pLengthEdit->setEnabled(m_bUnitBound); + pLengthUnit->setEnabled(m_bUnitBound); + + m_pFitStartButton = new QPushButton(tr("Fit start to nearest well"), pGroup); + m_pFitEndButton = new QPushButton(tr("Fit end to nearest well"), pGroup); + // 拟合属于显式操作,不设为默认按钮,避免复制长度时按回车触发端点变化。 + m_pFitStartButton->setAutoDefault(false); + m_pFitEndButton->setAutoDefault(false); + m_pFitStartButton->setEnabled(false); + m_pFitEndButton->setEnabled(false); + m_pFitStartButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_pFitEndButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + // 两个端点操作各占一行,横跨字段区,沿用分组的统一行间距。 + pGrid->addWidget(m_pFitStartButton, 1, 0, 1, 3); + pGrid->addWidget(m_pFitEndButton, 2, 0, 1, 3); connect(m_pFitStartButton, SIGNAL(clicked()), this, SLOT(onFitStartClicked())); connect(m_pFitEndButton, SIGNAL(clicked()), this, SLOT(onFitEndClicked())); - - // 底部按钮 - QHBoxLayout *bottomLayout = new QHBoxLayout(); - bottomLayout->addStretch(1); - QPushButton *closeButton = new QPushButton(tr("Close")); - connect(closeButton, SIGNAL(clicked()), this, SLOT(onCloseClicked())); - bottomLayout->addWidget(closeButton); - - // 将所有部件添加到主布局 - m_pMainLayout->addSpacing(10); - m_pMainLayout->addSpacing(10); - m_pMainLayout->addWidget(m_pFitStartButton); - m_pMainLayout->addWidget(m_pFitEndButton); - m_pMainLayout->addStretch(1); - m_pMainLayout->addLayout(bottomLayout); - - setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); + pMainLayout->addWidget(pGroup); + // 纵向余量由分组与底部按钮之间的布局空间吸收,内容保持紧凑排列。 + pMainLayout->addStretch(1); + + // 底部沿用标准按钮框、框架图标及统一留白。 + QWidget* pFooter = new QWidget(this); + pFooter->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + QHBoxLayout* pFooterLayout = new QHBoxLayout(pFooter); + pFooterLayout->setContentsMargins(4, 5, 4, 5); + pFooterLayout->setSpacing(8); + pFooterLayout->addStretch(); + QDialogButtonBox* pButtons = new QDialogButtonBox( + QDialogButtonBox::Close, Qt::Horizontal, pFooter); + QPushButton* pClose = pButtons->button(QDialogButtonBox::Close); + pClose->setText(tr("Close")); + pClose->setIcon(zxLoadIcon("Cancel")); + pClose->setAutoDefault(false); + pFooterLayout->addWidget(pButtons); + pMainLayout->addWidget(pFooter); + connect(pButtons, SIGNAL(rejected()), this, SLOT(onCloseClicked())); } -void nmWxMeasureDlg::initPara() { - - m_pData = nmDataAnalyzeManager::getCurrentInstance()->getMeasureData(); - m_pData->getLength().setName(tr("Length :")); - m_vecWellList = nmDataAnalyzeManager::getCurrentInstance()->getWellDataList(); +void nmWxMeasureDlg::onFitStartClicked() +{ + fitToNearestWell(true); } -void nmWxMeasureDlg::initComponents() { - - m_pLengthCom = new nmGUIComponentLineEdit(&m_pData->getLength(), false); - m_pMainLayout->addWidget(m_pLengthCom); +void nmWxMeasureDlg::onFitEndClicked() +{ + fitToNearestWell(false); } -void nmWxMeasureDlg::onFitStartClicked() +void nmWxMeasureDlg::fitToNearestWell(bool bFitStart) { - // 使用当前井列表;没有可拟合的井时保留测量点,避免写入默认原点。 - m_vecWellList = nmDataAnalyzeManager::getCurrentInstance()->getWellDataList(); - if (m_vecWellList.isEmpty()) { + if (m_pDataManager.isNull() || m_pData.isNull()) + { return; } - m_pFitStartButton->setEnabled(false); + // 每次读取所属分析的最新井列表;无井时保留测量点和按钮状态。 + const QVector vecWells = m_pDataManager->getWellDataList(); + const QPointF current = m_pData->getCurrentPoint(); + // 沿用测量模型约定:(0, 0) 表示没有待处理的单点,按已有线段端点拟合。 + const bool bSinglePoint = !(qFuzzyCompare(current.x(), 0.0) && + qFuzzyCompare(current.y(), 0.0)); + const QPointF reference = bSinglePoint ? current : + (bFitStart ? m_pData->getStartPoint() : m_pData->getEndPoint()); + + double dMinDistance = std::numeric_limits::max(); + QPointF nearest; + bool bFound = false; + for (int nIndex = 0; nIndex < vecWells.size(); ++nIndex) + { + nmDataWellBase* pWell = vecWells[nIndex]; + if (pWell == nullptr) + { + continue; + } + + const QPointF wellPoint(pWell->getX().getValue().toDouble(), + pWell->getY().getValue().toDouble()); + const double dDistance = QLineF(reference, wellPoint).length(); + if (dDistance < dMinDistance) + { + dMinDistance = dDistance; + nearest = wellPoint; + bFound = true; + } + } + if (!bFound) + { + return; + } - // 先取出当前点 - QPointF current = m_pData->getCurrentPoint(); - // 判断 current 是否为 (0,0) - if (qFuzzyCompare(current.x(), 0.0) && qFuzzyCompare(current.y(), 0.0)) { - QPointF ref = m_pData->getStartPoint(); - - double minDist = std::numeric_limits::max(); - QPointF nearest; - for (int i = 0; i < m_vecWellList.size(); ++i) { - nmDataWellBase* pWell = m_vecWellList[i]; - double x = pWell->getX().getValue().toDouble(); - double y = pWell->getY().getValue().toDouble(); - QPointF pt(x, y); - double dist = QLineF(ref, pt).length(); - if (dist < minDist) { - minDist = dist; - nearest = pt; - } - } + // 单点测量中,未拟合的一端保留点击位置;普通线段只移动指定端点。 + if (bFitStart) + { + m_pFitStartButton->setEnabled(false); m_pData->setStartPoint(nearest); + if (bSinglePoint) + { + m_pData->setEndPoint(current); + } + } + else + { + m_pFitEndButton->setEnabled(false); + if (bSinglePoint) + { + m_pData->setStartPoint(current); + } + m_pData->setEndPoint(nearest); + } - // 重新计算长度 - QPointF endPt = m_pData->getEndPoint(); - double newLen = QLineF(nearest, endPt).length(); - nmDataAttribute lenAttr = m_pData->getLength(); - lenAttr.setValue(newLen); - m_pData->setLength(lenAttr); - } - else { - - QPointF startPt = current; - - // 找 nearest well - double minDist = std::numeric_limits::max(); - QPointF nearest; - for (int i = 0; i < m_vecWellList.size(); ++i) { - nmDataWellBase* pWell = m_vecWellList[i]; - double x = pWell->getX().getValue().toDouble(); - double y = pWell->getY().getValue().toDouble(); - QPointF pt(x, y); - double dist = QLineF(startPt, pt).length(); - if (dist < minDist) { - minDist = dist; - nearest = pt; - } - } - // 单点测量先拟合起点时,将起点移到井上,终点保留在点击位置。 - m_pData->setStartPoint(nearest); - m_pData->setEndPoint(startPt); - - // 重新计算长度 - double newLen = QLineF(startPt, nearest).length(); - nmDataAttribute lenAttr = m_pData->getLength(); - lenAttr.setValue(newLen); - m_pData->setLength(lenAttr); - } + // 几何计算使用模型中的米制坐标,不读取可能已切为英尺等单位的界面文本。 + const double dLength = QLineF(m_pData->getStartPoint(), m_pData->getEndPoint()).length(); + nmDataAttribute length = m_pData->getLength(); + length.setValue(dLength); + m_pData->setLength(length); m_pData->setCurrentPoint(QPointF(0, 0)); - // 刷新界面显示 - updateDisplay(); + updateDisplay(); } -void nmWxMeasureDlg::onFitEndClicked() +void nmWxMeasureDlg::updateDisplay() { - // 使用当前井列表;没有可拟合的井时保留测量点,避免写入默认原点。 - m_vecWellList = nmDataAnalyzeManager::getCurrentInstance()->getWellDataList(); - if (m_vecWellList.isEmpty()) { + if (m_pData.isNull()) + { + m_pLengthEdit->clear(); + m_pFitStartButton->setEnabled(false); + m_pFitEndButton->setEnabled(false); return; } - m_pFitEndButton->setEnabled(false); - - // 先取出当前点 - QPointF current = m_pData->getCurrentPoint(); - // 判断 current 是否为 (0,0) - if (qFuzzyCompare(current.x(), 0.0) && qFuzzyCompare(current.y(), 0.0)) { - - QPointF ref = m_pData->getEndPoint(); - - double minDist = std::numeric_limits::max(); - QPointF nearest; - for (int i = 0; i < m_vecWellList.size(); ++i) { - nmDataWellBase* pWell = m_vecWellList[i]; - double x = pWell->getX().getValue().toDouble(); - double y = pWell->getY().getValue().toDouble(); - QPointF pt(x, y); - double dist = QLineF(ref, pt).length(); - if (dist < minDist) { - minDist = dist; - nearest = pt; - } - } - m_pData->setEndPoint(nearest); - - // 重新计算长度 - QPointF startPt = m_pData->getStartPoint(); - double newLen = QLineF(startPt, nearest).length(); - nmDataAttribute lenAttr = m_pData->getLength(); - lenAttr.setValue(newLen); - m_pData->setLength(lenAttr); - } - else { - - QPointF startPt = current; - - // 找 nearest well - double minDist = std::numeric_limits::max(); - QPointF nearest; - for (int i = 0; i < m_vecWellList.size(); ++i) { - nmDataWellBase* pWell = m_vecWellList[i]; - double x = pWell->getX().getValue().toDouble(); - double y = pWell->getY().getValue().toDouble(); - QPointF pt(x, y); - double dist = QLineF(startPt, pt).length(); - if (dist < minDist) { - minDist = dist; - nearest = pt; - } - } - // 更新起点和终点 - m_pData->setStartPoint(startPt); - m_pData->setEndPoint(nearest); - - // 重新计算长度 - double newLen = QLineF(startPt, nearest).length(); - nmDataAttribute lenAttr = m_pData->getLength(); - lenAttr.setValue(newLen); - m_pData->setLength(lenAttr); - } - m_pData->setCurrentPoint(QPointF(0, 0)); - // 刷新界面显示 - updateDisplay(); -} - -void nmWxMeasureDlg::updateDisplay() { - m_pLengthCom->updateValueFromOrigin(); + if (m_bUnitBound) + { + // 更新基准值而不重建单位列表,连续测量和拟合后仍保留当前显示单位。 + m_pUnitBinder->setBaseValue(m_pLengthEdit, m_pData->getLength().getValue().toDouble()); + } + else + { + m_pLengthEdit->clear(); + } } void nmWxMeasureDlg::closeEvent(QCloseEvent* event) { - emit needDeleteMeasureObj(); - iDlgBase::closeEvent(event); + emit needDeleteMeasureObj(); + iDlgBase::closeEvent(event); } void nmWxMeasureDlg::onCloseClicked() { - emit needDeleteMeasureObj(); - accept(); + emit needDeleteMeasureObj(); + accept(); } void nmWxMeasureDlg::resetButtons() { - m_pFitStartButton->setEnabled(true); - m_pFitEndButton ->setEnabled(true); + const bool bCanFit = !m_pDataManager.isNull() && !m_pData.isNull(); + m_pFitStartButton->setEnabled(bCanFit); + m_pFitEndButton->setEnabled(bCanFit); } diff --git a/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp b/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp index a7c25089..18fcec9a 100644 --- a/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp @@ -1,11 +1,11 @@ #include "nmWxMeasuringScaleDlg.h" #include "iUnitWxBinder.h" -#include "nmParameterField.h" #include "ZxBaseUtil.h" #include #include +#include #include #include #include @@ -15,6 +15,13 @@ #include #include +namespace +{ + // 与储层参数常规字段一致;初始尺寸计算和实际布局使用同一比例。 + const int s_nValueStretch = 8; + const int s_nUnitStretch = 5; +} + nmWxMeasuringScaleDlg::nmWxMeasuringScaleDlg( QPointF startPoint, QPointF endPoint, double* pLength) : m_startPoint(startPoint), @@ -30,7 +37,39 @@ nmWxMeasuringScaleDlg::nmWxMeasuringScaleDlg( initUI(); setWindowTitle(tr("MeasuringScale setting")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - resize(460, 200); + // 按字体、主题及坐标内容选择初始大小,由 Qt 结合屏幕尺寸限制初始展开范围。 + // 不固定窗口大小,长坐标仍可通过拉宽窗口或在只读框内移动光标查看。 + adjustSize(); +} + +QSize nmWxMeasuringScaleDlg::sizeHint() const +{ + QSize preferredSize = iDlgBase::sizeHint(); + const QComboBox* pLengthUnit = findChild("scaleLengthUnit"); + if (m_pLengthEdit == nullptr || pLengthUnit == nullptr || !preferredSize.isValid()) + { + return preferredSize; + } + + // 三个输入框共用一列;在布局推荐宽度上,为较长的坐标文本补足空间。 + // 最小推荐宽度包含主题边框和内边距,扣除其字符宽度后可估算文本之外的留白。 + const QFontMetrics metrics = m_pLengthEdit->fontMetrics(); + const int nTextPadding = qMax(0, m_pLengthEdit->minimumSizeHint().width() - metrics.maxWidth()) + + metrics.width(QLatin1String("00")); + const int nCoordinateWidth = qMax(metrics.width(m_sStartPoint), metrics.width(m_sEndPoint)) + + nTextPadding; + // 输入列变宽时单位列也会按 8:5 伸展,初始推荐宽度需同时预留两列的空间。 + const int nEditorHintWidth = m_pLengthEdit->sizeHint().width(); + const int nUnitHintWidth = pLengthUnit->sizeHint().width(); + const int nTotalStretch = s_nValueStretch + s_nUnitStretch; + const int nWidthForCoordinates = + (qMax(nCoordinateWidth, nEditorHintWidth) * nTotalStretch + s_nValueStretch - 1) + / s_nValueStretch; + const int nWidthForUnits = + (nUnitHintWidth * nTotalStretch + s_nUnitStretch - 1) / s_nUnitStretch; + preferredSize.rwidth() += qMax(0, + qMax(nWidthForCoordinates, nWidthForUnits) - nEditorHintWidth - nUnitHintWidth); + return preferredSize; } void nmWxMeasuringScaleDlg::initUI() @@ -41,13 +80,16 @@ void nmWxMeasuringScaleDlg::initUI() pMainLayout->setSpacing(10); QGroupBox* pGroup = new QGroupBox(tr("Scale parameters"), this); + // 与测量工具一致:分组只横向伸展,纵向使用字体和主题计算的内容高度。 + pGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QGridLayout* pGrid = new QGridLayout(pGroup); pGrid->setContentsMargins(8, 15, 8, 10); pGrid->setHorizontalSpacing(6); pGrid->setVerticalSpacing(6); - pGrid->setColumnStretch(1, 1); - pGrid->setColumnMinimumWidth(1, nmParameterField::editorMinimumWidth()); - pGrid->setColumnMinimumWidth(2, nmParameterField::unitMinimumWidth()); + // 标签由文字决定宽度;输入框与单位下拉框沿用储层参数的 8:5 横向伸展比例。 + pGrid->setColumnStretch(0, 0); + pGrid->setColumnStretch(1, s_nValueStretch); + pGrid->setColumnStretch(2, s_nUnitStretch); // 三行共用相同尺寸的输入框,标签不带冒号;坐标行保留空单位列以保证对齐。 const QStringList listLabels = QStringList() @@ -57,12 +99,12 @@ void nmWxMeasuringScaleDlg::initUI() { QLabel* pLabel = new QLabel(listLabels[nRow], pGroup); pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); pGrid->addWidget(pLabel, nRow, 0); pEditors[nRow] = new QLineEdit(pGroup); pEditors[nRow]->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - pEditors[nRow]->setFixedHeight(nmParameterField::editorHeight()); - pEditors[nRow]->setMinimumWidth(nmParameterField::editorMinimumWidth()); + // 输入列随窗口加宽;纵向 Fixed 采用主题推荐高度,不固定像素值。 pEditors[nRow]->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); pGrid->addWidget(pEditors[nRow], nRow, 1); } @@ -79,8 +121,9 @@ void nmWxMeasuringScaleDlg::initUI() QComboBox* pLengthUnit = new QComboBox(pGroup); pLengthUnit->setObjectName("scaleLengthUnit"); - pLengthUnit->setFixedHeight(nmParameterField::editorHeight()); - pLengthUnit->setMinimumWidth(nmParameterField::unitMinimumWidth()); + // 随完整单位列表和字体计算宽度,窗口缩小时仍保留单位文字及下拉箭头。 + pLengthUnit->setSizeAdjustPolicy(QComboBox::AdjustToContents); + pLengthUnit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); pGrid->addWidget(pLengthUnit, 2, 2); // 以米作为单位组识别入口;参数标识为空时,框架按下拉框已有单位查找单位组。 @@ -97,10 +140,12 @@ void nmWxMeasuringScaleDlg::initUI() m_pLengthEdit->setEnabled(m_bUnitBound); pLengthUnit->setEnabled(m_bUnitBound); pMainLayout->addWidget(pGroup); - pMainLayout->addStretch(); + // 纵向余量由分组与底部按钮之间的布局空间吸收,不拉长输入框或行间距。 + pMainLayout->addStretch(1); // 使用标准按钮框和框架图标,与其他已统一的参数对话框保持相同的底部布局。 QWidget* pFooter = new QWidget(this); + pFooter->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); QHBoxLayout* pFooterLayout = new QHBoxLayout(pFooter); pFooterLayout->setContentsMargins(4, 5, 4, 5); pFooterLayout->setSpacing(8);