OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include well name in summary page

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-13 15:09:43 +02:00
parent 2162a67b4a
commit 412c07ae33
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
View File

@@ -941,6 +941,7 @@ void WellSelectionPage::selectedWellPathEntries(std::vector<DownloadEntity>& dow
{
DownloadEntity urlToFile;
urlToFile.name = wellPathEntry->name;
urlToFile.requestUrl = wellPathEntry->requestUrl;
urlToFile.responseFilename = wellPathEntry->wellPathFilePath;
@@ -1021,10 +1022,12 @@ void WellSummaryPage::updateSummaryPage()
}
else
{
errorString += QString("Failed to get file '%1' from well '%2'\n").arg(downloadEntities[i].responseFilename).arg(downloadEntities[i].requestUrl);
errorString += QString("Failed to get file '%1' from well '%2'\n").arg(downloadEntities[i].responseFilename).arg(downloadEntities[i].name);
}
SummaryPageDownloadEntity* sumPageEntity = new SummaryPageDownloadEntity;
sumPageEntity->name = downloadEntities[i].name;
sumPageEntity->responseFilename = downloadEntities[i].responseFilename;
sumPageEntity->requestUrl = downloadEntities[i].requestUrl;
@@ -1084,7 +1087,8 @@ CAF_PDM_SOURCE_INIT(SummaryPageDownloadEntity, "SummaryPageDownloadEntity");
SummaryPageDownloadEntity::SummaryPageDownloadEntity()
{
CAF_PDM_InitObject("SummaryPageDownloadEntity", "", "", "");
CAF_PDM_InitFieldNoDefault(&name, "Name", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&requestUrl, "RequestUrl", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&responseFilename, "ResponseFilename", "", "", "", "");
}

2
ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.h
View File

@@ -100,6 +100,7 @@ public:
class DownloadEntity
{
public:
QString name;
QString requestUrl;
QString responseFilename;
};
@@ -114,6 +115,7 @@ class SummaryPageDownloadEntity : public caf::PdmObject
public:
SummaryPageDownloadEntity();
caf::PdmField<QString> name;
caf::PdmField<QString> requestUrl;
caf::PdmField<QString> responseFilename;
};