优化井删除时的井名获取方法
This commit is contained in:
parent
87d87d0332
commit
813cf49acf
|
|
@ -6306,13 +6306,21 @@ void MainWindowCurve::slotDeleteSelectWell()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column);
|
// QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column);
|
||||||
if (pItem)
|
// if (pItem)
|
||||||
{
|
// {
|
||||||
QString strWellName = pItem->text();
|
// QString strWellName = pItem->text();
|
||||||
m_listWell.removeOne(strWellName);
|
// m_listWell.removeOne(strWellName);
|
||||||
m_mapFWell.remove(strWellName);
|
// m_mapFWell.remove(strWellName);
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
WellHeader* pWheader = qobject_cast<WellHeader*>(ui->tableWidget_2->cellWidget(iCurrentRow, column));
|
||||||
|
if (pWheader)
|
||||||
|
{
|
||||||
|
QString strWellName = pWheader->m_strWellName;
|
||||||
|
m_listWell.removeOne(strWellName);
|
||||||
|
m_mapFWell.remove(strWellName);
|
||||||
|
}
|
||||||
//
|
//
|
||||||
ui->tableWidget_2->removeColumn(column+1);//空白列,注意先删除空白列,否则列号改变
|
ui->tableWidget_2->removeColumn(column+1);//空白列,注意先删除空白列,否则列号改变
|
||||||
ui->tableWidget_2->removeColumn(column);
|
ui->tableWidget_2->removeColumn(column);
|
||||||
|
|
@ -6320,13 +6328,20 @@ void MainWindowCurve::slotDeleteSelectWell()
|
||||||
}
|
}
|
||||||
else if (column > 1)
|
else if (column > 1)
|
||||||
{
|
{
|
||||||
QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column);
|
// QTableWidgetItem* pItem = ui->tableWidget_2->item(iCurrentRow, column);
|
||||||
if (pItem)
|
// if (pItem)
|
||||||
{
|
// {
|
||||||
QString strWellName = pItem->text();
|
// QString strWellName = pItem->text();
|
||||||
m_listWell.removeOne(strWellName);
|
// m_listWell.removeOne(strWellName);
|
||||||
m_mapFWell.remove(strWellName);
|
// m_mapFWell.remove(strWellName);
|
||||||
}
|
// }
|
||||||
|
WellHeader* pWheader = qobject_cast<WellHeader*>(ui->tableWidget_2->cellWidget(iCurrentRow, column));
|
||||||
|
if (pWheader)
|
||||||
|
{
|
||||||
|
QString strWellName = pWheader->m_strWellName;
|
||||||
|
m_listWell.removeOne(strWellName);
|
||||||
|
m_mapFWell.remove(strWellName);
|
||||||
|
}
|
||||||
//
|
//
|
||||||
ui->tableWidget_2->removeColumn(column);
|
ui->tableWidget_2->removeColumn(column);
|
||||||
ui->tableWidget_2->removeColumn(column-1);//空白列,注意先删除选中列,否则列号改变
|
ui->tableWidget_2->removeColumn(column-1);//空白列,注意先删除选中列,否则列号改变
|
||||||
|
|
@ -6685,6 +6700,11 @@ void MainWindowCurve::s_AddMultiWell(QString strUuid, QString strSlfName, QStrin
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
//
|
||||||
|
if(m_listWell.contains(strWellName))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
g_strSlfName = strSlfName;
|
g_strSlfName = strSlfName;
|
||||||
g_strWellName = strWellName;
|
g_strWellName = strWellName;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user