From 795e1c09f4049badd77c0b10c3822534c44020af Mon Sep 17 00:00:00 2001 From: zhaolei <353719554@qq.com> Date: Wed, 24 Jun 2026 13:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=B2=A1=E6=9C=89=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=9B=B2=E7=BA=BF=E6=97=B6=E4=B9=9F=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/qtprojectwidgets.cpp | 16 ++++++++-------- logPlus/qtprojectwidgets.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index c762693..d829f25 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -2268,10 +2268,10 @@ void QtProjectWidgets::onPasteSelObject() // 粘贴 { QTreeWidgetItem *parentItem = pItem/*->parent()*/; // 上一层目录是井次 if (parentItem && "wellItem" == parentItem->data(0, Qt::UserRole).toString() && m_strSlfName == parentItem->data(0, Qt::UserRole+1).toString()) - RefreshWellRoundTree(parentItem); + RefreshWellRoundTree(parentItem, m_strSlfName); parentItem = parentItem = pItem->parent(); if (parentItem && "wellItem" == parentItem->data(0, Qt::UserRole).toString() && m_strSlfName == parentItem->data(0, Qt::UserRole+1).toString()) - RefreshWellRoundTree(parentItem); + RefreshWellRoundTree(parentItem, m_strSlfName); break; } @@ -2365,15 +2365,15 @@ void QtProjectWidgets::onPasteWell() } //刷新井次树 -void QtProjectWidgets::RefreshWellRoundTree(QTreeWidgetItem *parentItem) +void QtProjectWidgets::RefreshWellRoundTree(QTreeWidgetItem *parentItem, QString strSlfName) { - if (parentItem && "wellItem" == parentItem->data(0, Qt::UserRole).toString() && m_strSlfName == parentItem->data(0, Qt::UserRole+1).toString()) + if (parentItem && "wellItem" == parentItem->data(0, Qt::UserRole).toString() && strSlfName == parentItem->data(0, Qt::UserRole+1).toString()) { // qDeleteAll(parentItem->takeChildren()); QTreeWidgetItem *pWellItem = parentItem->parent(); QString Wellname = parentItem->text(0); // parentItem->setExpanded(false); - loadWellTree(parentItem->parent(), m_strSlfName, Wellname); + loadWellTree(parentItem->parent(), strSlfName, Wellname); pWellItem->removeChild(parentItem); pWellItem->setExpanded(true); @@ -2381,7 +2381,7 @@ void QtProjectWidgets::RefreshWellRoundTree(QTreeWidgetItem *parentItem) for (int i = 0; i < WellCount; ++i) { QTreeWidgetItem *childItem = pWellItem->child(i); - if (childItem && m_strSlfName == childItem->data(0, Qt::UserRole+1).toString()) + if (childItem && strSlfName == childItem->data(0, Qt::UserRole+1).toString()) { childItem->setExpanded(true); int childCount = childItem->childCount(); @@ -3227,7 +3227,7 @@ void QtProjectWidgets::s_Notice_AddObject(QString strName, QString strSlfName, Q } } } - if (listExistObject.count()!=listObject.count()) - RefreshWellRoundTree(wellCurItem); + if (listExistObject.count()!=listObject.count() || 0==listObject.count()) + RefreshWellRoundTree(wellCurItem,strSlfName); } } diff --git a/logPlus/qtprojectwidgets.h b/logPlus/qtprojectwidgets.h index 59541cc..fd68b1d 100644 --- a/logPlus/qtprojectwidgets.h +++ b/logPlus/qtprojectwidgets.h @@ -94,7 +94,7 @@ public slots: void onPasteSelObject(); // 粘贴 void onReNameObject(); // 重命名 void onPasteWell(); // 粘贴井次 - void RefreshWellRoundTree(QTreeWidgetItem *parentItem); // 刷新井次树 + void RefreshWellRoundTree(QTreeWidgetItem *parentItem, QString strSlfName); // 刷新井次树 //向左侧树图,追加固井结论表格 void s_AddGujingToTree(QString strSlfName, QString strWellName, QString strLineName);