jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
crqiqi77 2026-03-30 15:20:49 +08:00
commit 8e3062931c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
logPlus/qtprojectwidgets.cpp
View File

@ -216,6 +216,7 @@ void QtProjectWidgets::s_loadTreeWidget(QString fileFull)
//展开树图 //展开树图
ui->treeWidget->expandItem(parent); ui->treeWidget->expandItem(parent);
itemIndex->setExpanded(true);
} }
void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFull, QString prjname) void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFull, QString prjname)
@ -1286,23 +1287,39 @@ void QtProjectWidgets::onImportSingleWellLogData()
QTreeWidgetItem *wellItem = *ui->treeWidget->selectedItems().begin(); QTreeWidgetItem *wellItem = *ui->treeWidget->selectedItems().begin();
QString wellname = wellItem->text(0); QString wellname = wellItem->text(0);
if (wellname == "井组") QString wellroundname = wellname;
QString strTreeTag = wellItem->data(0, Qt::UserRole).toString();
if (strTreeTag == "wells") //井组
{ {
QFileInfo temDir(file_name); QFileInfo temDir(file_name);
QString tempWellName=temDir.completeBaseName(); QString tempWellName=temDir.completeBaseName();
tempWellName.replace(" ","");//whp add 2020.3.3 删除井名中的空格 tempWellName.replace(" ","");//whp add 2020.3.3 删除井名中的空格
//m_WellLogRoundInfo->SetName(tempWellName.toStdString()); //m_WellLogRoundInfo->SetName(tempWellName.toStdString());
wellname = tempWellName; wellname = tempWellName;
wellroundname = wellname;
}
else if (strTreeTag == "wellname") //井名
{
}
else if (strTreeTag == "wellItem") //井次
{
wellname = wellItem->parent()->text(0);
} }
QString wellroundname = wellname;
ImportDataDialog *pDialog = new ImportDataDialog(NULL,wellname,wellroundname); ImportDataDialog *pDialog = new ImportDataDialog(NULL,wellname,wellroundname);
QTreeWidgetItem rootItem = *ui->treeWidget->topLevelItem(0); QTreeWidgetItem rootItem = *ui->treeWidget->topLevelItem(0);
pDialog->SetProjectname(rootItem.text(0)); pDialog->SetProjectname(rootItem.text(0));
pDialog->DisplayFileInformationAreaData(vConvertor,listFiles[0]); pDialog->DisplayFileInformationAreaData(vConvertor,listFiles[0]);
if ( pDialog->exec() == QDialog::Accepted ) if ( pDialog->exec() == QDialog::Accepted )
{
QString strProjectFolder = GetProjectFolder();
QString strProjectFile = strProjectFolder + g_prjname;
strProjectFile += ".wwl";
s_OpenProject(strProjectFile);
return ; return ;
} }
} }
}
void QtProjectWidgets::onImportSlfTable() void QtProjectWidgets::onImportSlfTable()
{ {