From 660ae14c57fe65fb5a1f2108291cbfd7ddc1b15f Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Wed, 27 May 2026 10:52:20 +0800 Subject: [PATCH] formimage --- logPlus/logPlus.pro | 3 +++ logPlus/mainwindowcurve.cpp | 24 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/logPlus/logPlus.pro b/logPlus/logPlus.pro index 22712bd..157511e 100644 --- a/logPlus/logPlus.pro +++ b/logPlus/logPlus.pro @@ -66,6 +66,7 @@ SOURCES += \ fileedit.cpp \ formdraw.cpp \ formhead.cpp \ + formimage.cpp \ forminfo.cpp \ formline.cpp \ formlogmud.cpp \ @@ -138,6 +139,7 @@ HEADERS += \ fileedit.h \ formdraw.h \ formhead.h \ + formimage.h \ forminfo.h \ formline.h \ formlogmud.h \ @@ -172,6 +174,7 @@ FORMS += \ InDefTable.ui \ formdraw.ui \ formhead.ui \ + formimage.ui \ forminfo.ui \ formline.ui \ formlogmud.ui \ diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 396264f..93ee770 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -5877,19 +5877,27 @@ void MainWindowCurve::slotDeleteSelectWell() } else { - QString strWellName = ui->tableWidget_2->item(iCurrentRow, column)->text(); - m_listWell.removeOne(strWellName); - m_mapFWell.remove(strWellName); + QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column); + if (pItem) + { + QString strWellName = pItem->text(); + m_listWell.removeOne(strWellName); + m_mapFWell.remove(strWellName); + } // ui->tableWidget_2->removeColumn(column+1);//空白列,注意先删除空白列,否则列号改变 ui->tableWidget_2->removeColumn(column); } } - else if(column>1) - { - QString strWellName = ui->tableWidget_2->item(iCurrentRow, column)->text(); - m_listWell.removeOne(strWellName); - m_mapFWell.remove(strWellName); + else if (column > 1) + { + QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column); + if (pItem) + { + QString strWellName = pItem->text(); + m_listWell.removeOne(strWellName); + m_mapFWell.remove(strWellName); + } // ui->tableWidget_2->removeColumn(column); ui->tableWidget_2->removeColumn(column-1);//空白列,注意先删除选中列,否则列号改变