From 1f32ff65c976755c66ca7a15eba984020e1be8e7 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Tue, 17 Nov 2026 17:27:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(Nm):=20=E7=BB=9F=E4=B8=80=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=95=E7=95=8C=E9=9D=A2=E5=B9=B6=E4=BC=98=E5=8C=96=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整双列自适应布局,统一标签、间距和按钮样式 - 移除固定行尺寸,支持长井名显示和横向滚动 - 修复行点击重复刷新及右键误勾选问题 - 保留原有选井、快捷键和确认取消流程 - 规范成员命名,补充中文注释并同步翻译 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 207039 -> 207132 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 18 +- Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h | 28 ++- .../nmNum/nmSubWxs/nmWxSelectWellsWidget.h | 101 ++++---- Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp | 80 ++++--- Src/nmNum/nmSubWxs/nmWxSelectWellsWidget.cpp | 215 ++++++++++-------- 6 files changed, 250 insertions(+), 192 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index c44c36e70ebf939df5788d8354f0a6e289f16add..af18f1e94c055f494eb138a109a4cb3677c59560 100644 GIT binary patch delta 2267 zcmYk8dsGxh7KiIzrpM`?VQ^H0QDFeZi3$TE!ys=&95ewEb>OH0)G!iVgq-XWq8lWM zg4yii<6K#ysAv#0MifCb*%hCR;sZo^L?z>MSs&5357BH4W=r~?^f_H$RabS_t@_=2 ztB+sSY`voKiuxwo^Zb*oo0^g0F+TlyIjA{p*0m3gpJ z=HUpLmxjyiDUo?iBeS=YTrmf(Pyw2x24Kv(i{bTkREI&Zot$XGrU~Tgk^_4i3tWr< zKhQQsnA8@-6sPhS_P#|<#dyC%DyDeEZIP;FmifqRCnlH=F#Ix{`~?fFrwpM=m(GN$ z90mymgTy`S$yJ#OcFIs%;02W{W5tt9xOA4`tweGvz426J6O? zk7G%NQyJDb$vpcrOZwA)8J6yqd2ugAi!s<5LPeq#GRPsON!7t@?)=XgRyUKsl!+}- zR3e%1!Ypc%f}oZ9q$+5j617D)mo49XkU?o3%YSDX!#&?po7#k@kOtK2;V6}9!m!>Nur*R{|=PSjN$m_6-NhFA3z z?G^-UX}Mb}ETv{QBe$^6Ep@_Iuqz%I)OSIR+J#R%1Zt`mGj?A)NGLiEy9b}YPWGV& z$fc5@Rya>>L#<)~LdZjgCo9NH=PjKGMD4r#8D6$fqV67-F>u(bVY>zVnH}`4c{j+Q?Yp34FTIpJ7k4%F>6bU;)|I_8E)^8`Sl{1_5YOF@R7_moy@M+WOjSXyn06F^){** zZP5Lq*uJiX!GLX$=-5Qvql?8IihTimUA=CUF=mP1)&Rw6@y`rD{8({X>%*|PTj7{F zli}D-MJpa+xFeGK##o_?0=*2pO!itYRw*7m2xVB8N_}2y#ePB9x`}^oBNcc*!_xt@ z+~C3EsKj9LT`8n~naLn~vM~D%6T=(Bgf#ky;jRlZ&%2V7k9|S?27~?w;oX6k49|Zi zERCDTP+KbVibR1vwbD1f!e93BIln`4`eb7Bc#8H-x^>PHOh^fPK{M zm#<%>H0I_prtOfK>#H=LFXU0^LK$N{L{bJOv@`bnDV2;}HSCzbGV9GQ25W9Av)=3C zgIdUaTrpHq`M67vNp}BZxZj)n$EU*yDjHt_>&V?03&~_N=EGHT7){cZm?3lW)-h~b zN(06)bS5^MUyA|kiJ^iCJ?H>Ro@j)7jRg}&!l;@_s)#Y`7>vB6ifBB>SVpcYfp|b2 zilCZFvG5`FO|rmk@(S>txXVZNR{9nOXQEWL(wz)u-d3gk^)AD&d{pVTe&HF)D6^gC zkpLsqHkJhx0(?S(DGZNCQM4%y4@6M8$;uO*(`12P$vr4t|5Ek*vu=h*@2H;tDDfP7 zf-`~P-hL_xGKwjpqGJuiYn9X#lnN_J2)5|wij)7nioX#qS|-h7Y_UeP9J$R^o&Wvp327+XONHjnxb<_K!2PXe%BxKtnBr?lGx20oxk*}ZSj#Z2NqYN_DGV;Jl(M?G?b~OOIn;!W z!DJ7$!h2K~>Y=ksh4XJP@P8<+*gb+_LkM+;=1G4KmDYcb47;l-+3dmPvYWHu7CFqj zp_G<~S-HMVVb7tK>MTZGje7Fa9~mzEKs_bCfni4}^;sIx=RJ|DR|J69PwviE|pEo z!;5Y-FfB-2rcJvQz|X@z0aVzktorc&P}3z=#GXC=7@W!$Uzp7)%rrEfAuJOBu0U2sTQnO@O2d z#zcH{JKCUtil|k<2ZGj!L<_+eAPPi9ge(>{F(S2p8ya5wExv6#^iI0i7`WP0$a$nwo<1w~I}CI`lIzGH-{wKm(b)&=JSGEEYxBlv5zDyJ zCP;bn8Q5IO0_w5hL7Qn*`vu!cE{a%?^e2H1e$RfA0i)O?l{+axD$f9n&KV^gi(+S4 z0=lwEX22RQl|}e$0I9tNsP9LR9{2+Ew2TsMELLs|8YNwRS}To>K=k1lxfWe`t-OB9 z@vk8+Hw5U^8Y^3>A#Urxfr^e>c{7z`6yek|$b||cI&!NbNqJ}he)I09Ko#rQPr01_ zKFq~R9bLC@gVG;A;2~u>nz-23;4~K2etsITs2Z|Y{SN3@CU@ED=yDxPsvVfkW>pZi zc5$mpiy!ldYBk;N=2W{axQPetvc-C${W+Agor6Zb1mjc2139|jTdqR0%1>}{)SrO9 zzR58T{us(R4hiVa%??`O;gCbZ%w>2u5&=(jVx{dEpraSCvSKB`xAvpNyhc1a`ur6h zHv>?~FKlwupoR+_jhM%+jz-1ngn^HNF2BJZPM*rfezIRv19a;#$2dI_QS}>_KkmqR z`uHcg@G6lu?G(qWDCLH6Ef~jz z}l4J+?% zwDSH(Ts=wSbke45dlR4~ag@|-ZIVM9|F1Wv+__O z7i$b5ep14r<$&okrNs+%K)uaU5(}%t`Bq;0Qc6B`2(YbDTH4zL^oM9^S@0FHUc(lR zMqMVYvAhDh9wz;EUJ8(Xk(C_{te<>Dd9G91RwexEuH(VU%jx1hj`2zmrDXOppqg8~ zH25J8d4&fa_>a_;bqC0{Q|g|h2YOI1bw61Sbaj<<|GlYz4sxmIqZfcTRZ@@TInccq zoH`{#y;J(RI2_QgN(O6%)yps$^sNVKNaNlq*^v`u+RQ8f`&(9Kddalcb4Bge%Y4Gi z0M++pK3l^98eL`67m3t8A1m{VZUcDnT&8nB1+*`M3#aCfYq%>*d#e+0bDu12T_;d~ zE<3+gfbnd8tsR}%%JJ@?#GOp*mX?rn}owX4NoT$yl&$wBuQ+7NXyCiEnP^&vz zv_bUX$6EdC;YeN2ILD`(n$Gf~=~^tQ&6z$C-3~vLhq`YEoY*c8t-S=0nkkQFQHQld zTsb2GXYk+*1MX%IU(e|kcjRv;mjHe>N1j-85OBda@}xZjqW15|lly-LQfjSib77OO z7E@}AeRC0Kv!n~6OT#=@mqax~Y}Oe?o9xvY@C-ZqC#z4(UwqO9bkQt-@l**^wO%k9 z==d=%^w%m-VRLJ0HyD?@^23m*$X!T-Q3EFGux=LfxQDoZE{Xv z0XpzV;7QT-D`)*GvSpT+%hGy#prktGvJc_`JN~Fl>l8khT6pek9i18AwX=;rQUej6@StV$l<&yp}SWE=1tY&r0qa< z_pI!g&Z%>zO?mi4wW?kC|1fiuv~9O4{jkue`p>G>F9(6j->9velYuy&?ZQ2&xsCk< zP7d&*@IH|aei0dHU~@zS&f~6#SUS+e9`jbyU$1iEykSM5U0=zF*kTXoMaI*q8{8V% zf@9enl|?tMuoUgD@UTzn_XRo>&vTKN4PFJ0;_o>I$4Bt(flH6w{X|| zVJzY17=Lw&L&^-1wm0++E9SWXZjz0Xnq_Pks}=2C9~*)DI48DTDDP}EU;r;Nx}ZIq z#C!vn8iS~9n7fQxtYC|A67|<@a*NyI7Ki8D;^=CLLLP5^fAdbo%J23X2Pn`>zH(lM zBHsLqn_T>nfJ|KWOH7%jRU0NJn=&)khfdzxF+duvD)nFa?Z3YDf2NLBQ&al?jL!+< HH)H+_td0%( diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index b1bd78ed..8e9c16d1 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -7397,18 +7397,26 @@ Average pressure in contour: %2 MPa nmWxSelectWellsDlg Select Wells - 井的选择 + 选择井 + + + OK + 确定 + + + Cancel + 取消 nmWxSelectWellsWidget - Select Wells: - 所有井: + All wells + 所有井 - Selected Wells: - 已经选择井: + Selected wells + 已选井 diff --git a/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h b/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h index 95360978..fa16bb20 100644 --- a/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h @@ -1,28 +1,32 @@ -#ifndef nmWxSelectWellsDlg_H -#define nmWxSelectWellsDlg_H +#ifndef NMWXSELECTWELLSDLG_H +#define NMWXSELECTWELLSDLG_H #include "iDlgBase.h" #include "nmSubWxs_global.h" class QVBoxLayout; +// 选择井对话框外壳:负责内容布局和确认、取消,不直接读写项目井或地图。 class NM_SUB_WXS_EXPORT nmWxSelectWellsDlg : public iDlgBase { Q_OBJECT + public: - nmWxSelectWellsDlg(QWidget* parent = NULL); - ~nmWxSelectWellsDlg(); + // 创建统一的窗口样式和底部按钮区,选井内容由调用方随后传入。 + explicit nmWxSelectWellsDlg(QWidget* parent = nullptr); + // 子控件由 Qt 父子关系管理,无需手动释放布局和按钮。 + virtual ~nmWxSelectWellsDlg(); + + // 放入选井内容并按其推荐尺寸调整初始窗口,两列内容占用可伸缩区域。 + // 沿用原有插入语义;调用方只在返回 Accepted 后读取选择结果。 + void setWidget(QWidget* pWidget); - void setWidget(QWidget*); -private: - QVBoxLayout* m_mainLayout; private: + // 创建布局与标准按钮,确认和取消分别使用 QDialog 的接受、拒绝流程。 void initUI(); -private slots: - void on_accepted(); - void on_rejected(); - +private: + QVBoxLayout* m_pMainLayout; // 主布局,选井内容在上方伸展,底部按钮保持主题高度。 }; -#endif // nmWxSelectWellsDlg_H +#endif // NMWXSELECTWELLSDLG_H diff --git a/Include/nmNum/nmSubWxs/nmWxSelectWellsWidget.h b/Include/nmNum/nmSubWxs/nmWxSelectWellsWidget.h index 22a14f4c..8238856e 100644 --- a/Include/nmNum/nmSubWxs/nmWxSelectWellsWidget.h +++ b/Include/nmNum/nmSubWxs/nmWxSelectWellsWidget.h @@ -1,79 +1,98 @@ #pragma once #include "nmSubWxs_global.h" -#include + #include +#include +#include +#include class QCheckBox; -class QVariant; class QListWidget; +class QMouseEvent; class QTextEdit; -class nmWxSelectWellItemWidget: public QWidget +// 单行井选项:原生复选框与整行点击共用一个选中状态,尺寸由字体和主题决定。 +class nmWxSelectWellItemWidget : public QWidget { Q_OBJECT -public: - nmWxSelectWellItemWidget(); - nmWxSelectWellItemWidget(QWidget* parent, QString name, QVariant value); - void setSelected(bool selected); - bool getSelected(); +public: + // 创建显示指定井名的选项;业务值由外层列表统一保存。 + nmWxSelectWellItemWidget(QWidget* parent, const QString& sName); + // 设置勾选状态,状态变化时通知外层列表。 + void setSelected(bool bSelected); + // 获取当前勾选状态。 + bool getSelected() const; + // 反转勾选状态,供整行左键点击使用。 void toggleSelected(); -private: - void initUI(); + protected: - void mousePressEvent(QMouseEvent *event) override; + // 点击行内空白处等同于点击复选框;其他鼠标按键不修改选择。 + virtual void mousePressEvent(QMouseEvent* pEvent) override; + signals: + // 勾选状态变化时发送一次,用于刷新摘要和处理 Shift 范围选择。 void sigItemClicked(); + private slots: - void onStateChanged(int); + // 将复选框状态变化统一转发给外层列表,避免整行点击重复通知。 + void onStateChanged(int nState); + +private: + // 创建带布局的原生复选框,保持完整井名和主题推荐高度。 + void initUI(); + private: - QCheckBox* m_pCBox; - QString m_sName; - QVariant m_iValue; + QCheckBox* m_pCheckBox; // 本行复选框,由行控件管理生命周期。 + QString m_sName; // 原始井显示名,用于显示完整文字和悬停提示。 }; +// 双列选井内容:左侧勾选候选井,右侧只读展示已选井,不修改项目数据。 class NM_SUB_WXS_EXPORT nmWxSelectWellsWidget : public QWidget { Q_OBJECT public: - nmWxSelectWellsWidget(QWidget* aParent = NULL); -public: - // 添加多项 + // 创建双列布局及原有的全选、清空快捷键。 + explicit nmWxSelectWellsWidget(QWidget* parent = nullptr); + // 根据字体和行高推荐初始大小,窗口仍允许用户继续缩放。 + virtual QSize sizeHint() const override; + // 批量添加井名及业务值;数量不一致时不添加,完成后刷新右侧摘要。 void addItems(QStringList items, QList values); - // 添加单项 + // 添加单行并应用预先设置的选中状态,业务值按列表顺序保存。 void addItem(QString name, QVariant value); - // 获取选中的items + // 返回右侧摘要中的已选井名,保留原有名称接口。 QStringList getItems(); - // 设置被选中的items + // 在填充列表前设置预选井名,兼容原有按名称恢复选择的调用方式。 void setSelectedItems(QStringList selectItems); - /** @brief 获取选中项的稳定业务值;井选择菜单中该值为 WellCode。 */ + // 按候选列表顺序返回已选业务值;地图选井使用 WellCode 识别井。 QList getSelectedValues() const; - /** @brief 按稳定业务值恢复选择,井显示名称允许重复或修改。 */ + // 在填充列表前设置预选业务值,井名显示不影响业务身份。 void setSelectedValues(const QList& selectedValues); + private: - QListWidget* m_pListWidget; - QTextEdit* m_pLineEdit; - QStringList m_items; - QList m_values; - // 已经被选中的items - QStringList m_selectItems; - QList m_selectedValues; ///< 已选业务值;井选择菜单中保存 WellCode。 - // 上次点击的井下标,用于Shift+点击范围选择 - int m_nLastClickedIndex; - // 获取指定井项在列表中的下标 - int indexOfItemWidget(nmWxSelectWellItemWidget* itemWidget) const; - // 批量设置所有井的选中状态 - void setAllItemsSelected(bool selected); - // 批量设置指定范围内井的选中状态 - void setRangeItemsSelected(int fromIndex, int toIndex, bool selected); + // 查找发出点击通知的井项下标,用于 Shift 范围选择。 + int indexOfItemWidget(nmWxSelectWellItemWidget* pItemWidget) const; + // 批量设置全部勾选状态,只在结束后刷新一次摘要。 + void setAllItemsSelected(bool bSelected); + // 批量设置闭区间内的勾选状态,支持正向和反向 Shift 选择。 + void setRangeItemsSelected(int nFromIndex, int nToIndex, bool bSelected); private slots: - // 刷新右侧已选择井文本 + // 处理单行或范围勾选,并同步右侧已选井名及内部选择缓存。 void onUpdateSelections(); - // 全选所有井 + // 响应 Ctrl+A,勾选全部候选井。 void onSelectAllItems(); - // 清空所有已选择井 + // 响应 Ctrl+Shift+A,清空全部勾选。 void onClearSelectedItems(); + +private: + QListWidget* m_pListWidget; // 候选井列表,长井名可横向滚动查看。 + QTextEdit* m_pSelectedWellsEdit; // 已选井摘要,只读且可复制,每口井占一行。 + QStringList m_listWellNames; // 按候选列表顺序保存的显示名称。 + QList m_listWellValues; // 与候选名称一一对应的业务值。 + QStringList m_listSelectedNames; // 预选及当前已选名称,兼容原名称接口。 + QList m_listSelectedValues; // 预选及当前已选业务值,地图入口保存 WellCode。 + int m_nLastClickedIndex; // 上次点击的行下标,作为 Shift 范围选择起点。 }; diff --git a/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp index 7a884b08..e3804bf2 100644 --- a/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp @@ -1,53 +1,63 @@ #include "nmWxSelectWellsDlg.h" +#include "ZxBaseUtil.h" + +#include +#include #include -#include #include -#include "nmData/nmDataLogFile.h" -#include "ZxResolutionHelper.h" - -nmWxSelectWellsDlg::nmWxSelectWellsDlg(QWidget* parent): iDlgBase(parent) +nmWxSelectWellsDlg::nmWxSelectWellsDlg(QWidget* parent) + : iDlgBase(parent), + m_pMainLayout(nullptr) { - m_mainLayout = NULL; - this->setWindowTitle(tr("Select Wells")); - this->initUI(); - this->setMinimumSize(QSize(_resoSizeW(400), _resoSizeW(200))); + setWindowTitle(tr("Select Wells")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + initUI(); } nmWxSelectWellsDlg::~nmWxSelectWellsDlg() { } -void nmWxSelectWellsDlg::setWidget(QWidget *widget) +void nmWxSelectWellsDlg::setWidget(QWidget* pWidget) { - m_mainLayout->insertWidget(0, widget); + if (pWidget == nullptr) + { + return; + } + + // 内容随窗口水平、垂直拉伸,初始尺寸交由字体、主题和子控件推荐值决定。 + m_pMainLayout->insertWidget(0, pWidget, 1); + adjustSize(); } void nmWxSelectWellsDlg::initUI() { - // 创建自定义视图 - QLabel *customView = new QLabel("This is a custom view."); - customView->setWordWrap(true); - // 创建布局 - m_mainLayout = new QVBoxLayout; - this->setLayout(m_mainLayout); - // 创建按钮框,并添加确定和取消按钮 - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - m_mainLayout->addWidget(buttonBox); - // 连接按钮的信号到对话框的槽 - connect(buttonBox, SIGNAL(accepted()), this, SLOT(on_accepted())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(on_rejected())); -} - -void nmWxSelectWellsDlg::on_accepted() -{ - this->accept(); + m_pMainLayout = new QVBoxLayout(this); + m_pMainLayout->setContentsMargins(12, 10, 12, 0); + m_pMainLayout->setSpacing(10); + + // 按钮组整体靠右,沿用已统一对话框的底部边距和框架图标。 + 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::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, pFooter); + QPushButton* pOkButton = pButtons->button(QDialogButtonBox::Ok); + pOkButton->setText(tr("OK")); + pOkButton->setIcon(zxLoadIcon("OK")); + pOkButton->setDefault(true); + QPushButton* pCancelButton = pButtons->button(QDialogButtonBox::Cancel); + pCancelButton->setText(tr("Cancel")); + pCancelButton->setIcon(zxLoadIcon("Cancel")); + pFooterLayout->addWidget(pButtons); + m_pMainLayout->addWidget(pFooter); + + // 对话框只返回操作结果;项目井的增删仍由调用方在确认后处理。 + connect(pButtons, SIGNAL(accepted()), this, SLOT(accept())); + connect(pButtons, SIGNAL(rejected()), this, SLOT(reject())); } - -void nmWxSelectWellsDlg::on_rejected() -{ - this->reject(); -} - - diff --git a/Src/nmNum/nmSubWxs/nmWxSelectWellsWidget.cpp b/Src/nmNum/nmSubWxs/nmWxSelectWellsWidget.cpp index 2b51872d..9617f373 100644 --- a/Src/nmNum/nmSubWxs/nmWxSelectWellsWidget.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSelectWellsWidget.cpp @@ -1,46 +1,64 @@ #include "nmWxSelectWellsWidget.h" -#include + +#include #include -#include -#include -#include -#include +#include #include -#include +#include +#include #include -#include #include -#include "nmData/nmDataLogFile.h" -#include +#include #include -#include -#include +#include + +nmWxSelectWellsWidget::nmWxSelectWellsWidget(QWidget* parent) + : QWidget(parent), + m_pListWidget(new QListWidget(this)), + m_pSelectedWellsEdit(new QTextEdit(this)), + m_nLastClickedIndex(-1) +{ + // 两列等比例伸展;窗口纵向拉高时,列表和摘要共同占满内容区。 + QGridLayout* pLayout = new QGridLayout(this); + pLayout->setContentsMargins(0, 0, 0, 0); + pLayout->setHorizontalSpacing(10); + pLayout->setVerticalSpacing(6); + pLayout->setColumnStretch(0, 1); + pLayout->setColumnStretch(1, 1); + pLayout->setRowStretch(1, 1); + pLayout->addWidget(new QLabel(tr("All wells"), this), 0, 0); + pLayout->addWidget(m_pListWidget, 1, 0); + pLayout->addWidget(new QLabel(tr("Selected wells"), this), 0, 1); + pLayout->addWidget(m_pSelectedWellsEdit, 1, 1); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + m_pListWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + m_pSelectedWellsEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + m_pListWidget->setResizeMode(QListView::Adjust); + m_pListWidget->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); + m_pListWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); + m_pSelectedWellsEdit->setReadOnly(true); + // 长名称保持一口井一行,缩窄窗口时通过水平滚动查看,摘要仍可选中复制。 + m_pSelectedWellsEdit->setLineWrapMode(QTextEdit::NoWrap); + + // 保留原快捷键及其作用范围,不增加额外的筛选或选择功能。 + QShortcut* pSelectAllShortcut = new QShortcut(QKeySequence::SelectAll, this); + pSelectAllShortcut->setContext(Qt::WidgetWithChildrenShortcut); + connect(pSelectAllShortcut, SIGNAL(activated()), this, SLOT(onSelectAllItems())); + QShortcut* pClearSelectionShortcut = new QShortcut( + QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A), this); + pClearSelectionShortcut->setContext(Qt::WidgetWithChildrenShortcut); + connect(pClearSelectionShortcut, SIGNAL(activated()), this, SLOT(onClearSelectedItems())); +} -nmWxSelectWellsWidget::nmWxSelectWellsWidget(QWidget* aParent) : - QWidget(aParent), - m_pListWidget(new QListWidget(this)), - m_pLineEdit(new QTextEdit(this)), - m_nLastClickedIndex(-1) +QSize nmWxSelectWellsWidget::sizeHint() const { - // 主布局 - QGridLayout* layout = new QGridLayout; - this->setLayout(layout); - layout->addWidget(new QLabel(tr("Select Wells: ")), 0, 0); - layout->addWidget(m_pListWidget, 1, 0); - layout->addWidget(new QLabel(tr("Selected Wells: ")), 0, 1); - layout->addWidget(m_pLineEdit, 1, 1); -// m_pLineEdit->setText(multiLineText); - m_pLineEdit->setReadOnly(true); - // 快捷键:Ctrl+A全选,Ctrl+Shift+A清空选择 - QShortcut* selectAllShortcut = new QShortcut(QKeySequence::SelectAll, this); - selectAllShortcut->setContext(Qt::WidgetWithChildrenShortcut); - connect(selectAllShortcut, SIGNAL(activated()), this, SLOT(onSelectAllItems())); - - QShortcut* clearSelectionShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A), this); - clearSelectionShortcut->setContext(Qt::WidgetWithChildrenShortcut); - connect(clearSelectionShortcut, SIGNAL(activated()), this, SLOT(onClearSelectedItems())); - - this->setMinimumWidth(200); + // 初始高度预留约十行井;只提供建议值,不限制用户缩放,也不随井数无限增高。 + const QFontMetrics metrics = fontMetrics(); + const int nRowHeight = m_pListWidget->count() > 0 + ? m_pListWidget->sizeHintForRow(0) : metrics.height() + 6; + const int nColumnWidth = metrics.height() * 14; + return QWidget::sizeHint().expandedTo(QSize( + nColumnWidth * 2 + 10, nRowHeight * 10 + metrics.height() + 6)); } void nmWxSelectWellsWidget::addItems(QStringList items, QList values) @@ -56,33 +74,36 @@ void nmWxSelectWellsWidget::addItems(QStringList items, QList values) void nmWxSelectWellsWidget::addItem(QString name, QVariant value) { - m_items.append(name); - m_values.append(value); - nmWxSelectWellItemWidget* itemWidget = new nmWxSelectWellItemWidget(NULL, name, value); - itemWidget->setFixedHeight(25); - itemWidget->setFixedWidth(200); - if(m_selectedValues.contains(value) || m_selectItems.contains(name)) { - itemWidget->setSelected(true); + m_listWellNames.append(name); + m_listWellValues.append(value); + nmWxSelectWellItemWidget* pItemWidget = + new nmWxSelectWellItemWidget(m_pListWidget->viewport(), name); + if (m_listSelectedValues.contains(value) || m_listSelectedNames.contains(name)) + { + pItemWidget->setSelected(true); } -// itemWidget->setMinimumWidth(m_pListWidget->viewport()->width()); // 设置widget的最小宽度为列表视图的宽度 - QListWidgetItem* item = new QListWidgetItem; - nmDataLogFile::getInstance()->writeLog(QString(" %1 ").arg(item->sizeHint().width())); - item->setSizeHint(QSize(200, 30)); - m_pListWidget->addItem(item); - m_pListWidget->setItemWidget(item, itemWidget); - connect(itemWidget, SIGNAL(sigItemClicked()), this, SLOT(onUpdateSelections())); + + // 按实际字体、复选框和布局边距计算行尺寸,不再固定为 200×25 像素。 + // 窗口更宽时行控件随列表伸展,内容超宽时由列表提供水平滚动条。 + pItemWidget->ensurePolished(); + QListWidgetItem* pItem = new QListWidgetItem; + pItem->setSizeHint(pItemWidget->sizeHint()); + pItem->setToolTip(name); + m_pListWidget->addItem(pItem); + m_pListWidget->setItemWidget(pItem, pItemWidget); + connect(pItemWidget, SIGNAL(sigItemClicked()), this, SLOT(onUpdateSelections())); } QStringList nmWxSelectWellsWidget::getItems() { - QStringList items = m_pLineEdit->toPlainText().split("\n"); + QStringList items = m_pSelectedWellsEdit->toPlainText().split("\n"); items.removeAll(QString()); return items; } void nmWxSelectWellsWidget::setSelectedItems(QStringList selectItems) { - m_selectItems = selectItems; + m_listSelectedNames = selectItems; } QList nmWxSelectWellsWidget::getSelectedValues() const @@ -91,14 +112,14 @@ QList nmWxSelectWellsWidget::getSelectedValues() const // 选择结果按左侧列表顺序返回,调用方只使用业务值,不再反查显示名称。 int nIndex = 0; - const int nItemCount = qMin(m_pListWidget->count(), m_values.count()); + const int nItemCount = qMin(m_pListWidget->count(), m_listWellValues.count()); while(nIndex < nItemCount) { QListWidgetItem* pListItem = m_pListWidget->item(nIndex); nmWxSelectWellItemWidget* pItemWidget = static_cast( m_pListWidget->itemWidget(pListItem)); if(pItemWidget != NULL && pItemWidget->getSelected()) { - listSelectedValues.append(m_values[nIndex]); + listSelectedValues.append(m_listWellValues[nIndex]); } ++nIndex; } @@ -109,7 +130,7 @@ QList nmWxSelectWellsWidget::getSelectedValues() const void nmWxSelectWellsWidget::setSelectedValues( const QList& selectedValues) { - m_selectedValues = selectedValues; + m_listSelectedValues = selectedValues; } void nmWxSelectWellsWidget::onUpdateSelections() @@ -138,14 +159,14 @@ void nmWxSelectWellsWidget::onUpdateSelections() static_cast( m_pListWidget->itemWidget(pListItem)); if(pItemWidget != NULL && pItemWidget->getSelected()) { - nameList.append(m_items[nIndex]); - listSelectedValues.append(m_values[nIndex]); + nameList.append(m_listWellNames[nIndex]); + listSelectedValues.append(m_listWellValues[nIndex]); } ++nIndex; } - m_selectItems = nameList; - m_selectedValues = listSelectedValues; - m_pLineEdit->setPlainText(nameList.join("\n")); + m_listSelectedNames = nameList; + m_listSelectedValues = listSelectedValues; + m_pSelectedWellsEdit->setPlainText(nameList.join("\n")); } // 查找井项在列表中的位置 @@ -214,66 +235,62 @@ void nmWxSelectWellsWidget::onClearSelectedItems() } -nmWxSelectWellItemWidget::nmWxSelectWellItemWidget() - : m_pCBox(NULL) -{ -} - -nmWxSelectWellItemWidget::nmWxSelectWellItemWidget(QWidget *parent, QString name, QVariant value) +nmWxSelectWellItemWidget::nmWxSelectWellItemWidget(QWidget* parent, const QString& sName) : QWidget(parent), - m_pCBox(NULL), - m_sName(name), - m_iValue(value) + m_pCheckBox(nullptr), + m_sName(sName) { - this->initUI(); + initUI(); } -void nmWxSelectWellItemWidget::setSelected(bool selected) +void nmWxSelectWellItemWidget::setSelected(bool bSelected) { - if (m_pCBox) { - m_pCBox->setChecked(selected); - } + m_pCheckBox->setChecked(bSelected); } -bool nmWxSelectWellItemWidget::getSelected() + +bool nmWxSelectWellItemWidget::getSelected() const { - if (m_pCBox) { - return m_pCBox->isChecked(); - } - return false; + return m_pCheckBox->isChecked(); } void nmWxSelectWellItemWidget::toggleSelected() { - this->setSelected(!this->getSelected()); + setSelected(!getSelected()); } + void nmWxSelectWellItemWidget::initUI() { - // 可以设置鼠标样式,表明这个部件可以被点击 setCursor(Qt::PointingHandCursor); - // 设置QCheckBox - QHBoxLayout* layout = new QHBoxLayout; - setLayout(layout); - m_pCBox = new QCheckBox(this); - m_pCBox->setText(m_sName); - layout->setAlignment(Qt::AlignVCenter); - layout->setContentsMargins(10, 0, 0, 0); - layout->setSpacing(0); - connect(m_pCBox, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int))); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + setToolTip(m_sName); + QHBoxLayout* pLayout = new QHBoxLayout(this); + pLayout->setContentsMargins(6, 3, 6, 3); + pLayout->setSpacing(0); + m_pCheckBox = new QCheckBox(this); + // 井名中的 & 是实际文字,不能被复选框解释为快捷键助记符。 + QString sDisplayName = m_sName; + m_pCheckBox->setText(sDisplayName.replace("&", "&&")); + m_pCheckBox->setToolTip(m_sName); + m_pCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + pLayout->addWidget(m_pCheckBox); + connect(m_pCheckBox, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int))); } -void nmWxSelectWellItemWidget::mousePressEvent(QMouseEvent *event) +void nmWxSelectWellItemWidget::mousePressEvent(QMouseEvent* pEvent) { - // 当鼠标左键被按下时,执行一些操作 - if (event->button() == Qt::LeftButton) { - // 处理点击事件,例如发出一个信号或者调用一个槽函数 - qDebug() << "ClickableWidget was clicked!"; + if (pEvent->button() != Qt::LeftButton) + { + QWidget::mousePressEvent(pEvent); + return; } - QWidget::mousePressEvent(event); // 调用基类的处理函数 - this->toggleSelected(); - emit this->sigItemClicked(); + + // 状态变化由复选框统一通知,避免行空白处点击后重复刷新和重复处理 Shift。 + toggleSelected(); + pEvent->accept(); } -void nmWxSelectWellItemWidget::onStateChanged(int) +void nmWxSelectWellItemWidget::onStateChanged(int nState) { - emit this->sigItemClicked(); + Q_UNUSED(nState); + emit sigItemClicked(); }