diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index 965ce55..a176eb6 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -216,6 +216,7 @@ void QtProjectWidgets::s_loadTreeWidget(QString fileFull) //展开树图 ui->treeWidget->expandItem(parent); + itemIndex->setExpanded(true); } void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFull, QString prjname) @@ -1286,21 +1287,37 @@ void QtProjectWidgets::onImportSingleWellLogData() QTreeWidgetItem *wellItem = *ui->treeWidget->selectedItems().begin(); 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); QString tempWellName=temDir.completeBaseName(); tempWellName.replace(" ","");//whp add 2020.3.3 删除井名中的空格 //m_WellLogRoundInfo->SetName(tempWellName.toStdString()); wellname = tempWellName; + wellroundname = wellname; } - QString wellroundname = wellname; + else if (strTreeTag == "wellname") //井名 + { + + } + else if (strTreeTag == "wellItem") //井次 + { + wellname = wellItem->parent()->text(0); + } ImportDataDialog *pDialog = new ImportDataDialog(NULL,wellname,wellroundname); QTreeWidgetItem rootItem = *ui->treeWidget->topLevelItem(0); pDialog->SetProjectname(rootItem.text(0)); pDialog->DisplayFileInformationAreaData(vConvertor,listFiles[0]); if ( pDialog->exec() == QDialog::Accepted ) + { + QString strProjectFolder = GetProjectFolder(); + QString strProjectFile = strProjectFolder + g_prjname; + strProjectFile += ".wwl"; + s_OpenProject(strProjectFile); return ; + } } }