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

#2632 Export Completions : Remove support for export of all well path completions

Browse Source
This commit is contained in:
Magne Sjaastad 2018-04-06 13:20:21 +02:00
parent a40c4df6b3
commit e50e34feb4
7 changed files with 7 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.cpp
View File

@ -60,7 +60,6 @@ void RicfExportSimWellCompletions::execute()
RimProject* project = RiaApplication::instance()->project();
RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData(false);
exportSettings->timeStep = m_timeStep;
exportSettings->wellSelection = m_wellSelection;
exportSettings->fileSplit = m_fileSplit;
exportSettings->compdatExport = m_compdatExport;

1
ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp
View File

@ -59,7 +59,6 @@ void RicfExportWellPathCompletions::execute()
RimProject* project = RiaApplication::instance()->project();
RicExportCompletionDataSettingsUi* exportSettings = project->dialogData()->exportCompletionData(false);
exportSettings->timeStep = m_timeStep;
exportSettings->wellSelection = m_wellSelection;
exportSettings->fileSplit = m_fileSplit;
exportSettings->compdatExport = m_compdatExport;
exportSettings->includePerforations = m_includePerforations;

36
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -58,8 +58,6 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
CAF_PDM_InitObject("RimExportCompletionDataSettings", "", "", "");
CAF_PDM_InitFieldNoDefault(&fileSplit, "FileSplit", "File Split", "", "", "");
CAF_PDM_InitFieldNoDefault(&wellSelection, "WellSelection", "Well Selection", "", "", "");
wellSelection.uiCapability()->setAutoAddingOptionFromValue(false);
CAF_PDM_InitFieldNoDefault(&compdatExport, "compdatExport", "Export", "", " ", "");
@ -72,18 +70,9 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
CAF_PDM_InitField(&includeFractures, "IncludeFractures", true, "Fractures", "", "", "");
CAF_PDM_InitField(&excludeMainBoreForFishbones, "ExcludeMainBoreForFishbones", false, " Exclude Main Bore Transmissibility", "", "", "");
m_onlyWellPathCollectionSelected = false;
m_displayForSimWell = true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCompletionDataSettingsUi::setOnlyWellPathCollectionSelected(bool onlyWellPathCollectionSelected)
{
m_onlyWellPathCollectionSelected = onlyWellPathCollectionSelected;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -140,18 +129,6 @@ QList<caf::PdmOptionItemInfo> RicExportCompletionDataSettingsUi::calculateValueO
options.push_back(caf::PdmOptionItemInfo(timeStepNames[i], i));
}
}
else if (fieldNeedingOptions == &wellSelection)
{
if (m_onlyWellPathCollectionSelected)
{
options.push_back(caf::PdmOptionItemInfo("All Wells", ALL_WELLS));
options.push_back(caf::PdmOptionItemInfo("Checked Wells", CHECKED_WELLS));
}
else
{
options.push_back(caf::PdmOptionItemInfo("Selected Wells", SELECTED_WELLS));
}
}
else
{
options = RicCaseAndFileExportSettingsUi::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
@ -170,19 +147,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
generalExportSettings->add(&compdatExport);
generalExportSettings->add(&useLateralNTG);
generalExportSettings->add(&wellSelection);
if (!m_onlyWellPathCollectionSelected)
{
wellSelection.setValue(SELECTED_WELLS);
}
else
{
if (wellSelection() != ALL_WELLS && wellSelection() != CHECKED_WELLS)
{
wellSelection.setValue(CHECKED_WELLS);
}
}
generalExportSettings->add(&fileSplit);
if (!m_displayForSimWell)

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h
View File

@ -55,7 +55,6 @@ public:
RicExportCompletionDataSettingsUi();
caf::PdmField<ExportSplitType> fileSplit;
caf::PdmField<WellSelectionType> wellSelection;
caf::PdmField<CompdatExportType> compdatExport;
caf::PdmField<bool> useLateralNTG;
@ -68,8 +67,6 @@ public:
caf::PdmField<int> timeStep;
void setOnlyWellPathCollectionSelected(bool onlyWellPathCollectionSelected);
void showForSimWells();
void showForWellPath();
@ -80,6 +77,5 @@ protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
bool m_onlyWellPathCollectionSelected;
bool m_displayForSimWell;
};

5
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -154,7 +154,10 @@ std::vector<RimWellPath*> RicWellPathExportCompletionDataFeature::selectedWellPa
{
for (auto wellPath : wellPathCollection->wellPaths())
{
wellPaths.push_back(wellPath);
if (wellPath->showWellPath())
{
wellPaths.push_back(wellPath);
}
}
}
}

14
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -74,19 +74,11 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
}
std::vector<RimWellPath*> usedWellPaths;
if (exportSettings.wellSelection == RicExportCompletionDataSettingsUi::ALL_WELLS ||
exportSettings.wellSelection == RicExportCompletionDataSettingsUi::SELECTED_WELLS)
for (auto wellPath : wellPaths)
{
usedWellPaths = wellPaths;
}
else if (exportSettings.wellSelection == RicExportCompletionDataSettingsUi::CHECKED_WELLS)
{
for (auto wellPath : wellPaths)
if (wellPath->showWellPath)
{
if (wellPath->showWellPath)
{
usedWellPaths.push_back(wellPath);
}
usedWellPaths.push_back(wellPath);
}
}

2
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@ -35,7 +35,6 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault(&m_exportCompletionData, "ExportCompletionData", "Export Completion Data", "", "", "");
m_exportCompletionData = new RicExportCompletionDataSettingsUi();
m_exportCompletionData->setOnlyWellPathCollectionSelected(false);
}
//--------------------------------------------------------------------------------------------------
@ -68,7 +67,6 @@ void RimDialogData::setExportCarfinDataFromString(const QString& data)
//--------------------------------------------------------------------------------------------------
RicExportCompletionDataSettingsUi* RimDialogData::exportCompletionData(bool onlyWellPathCollectionSelected) const
{
m_exportCompletionData->setOnlyWellPathCollectionSelected(onlyWellPathCollectionSelected);
return m_exportCompletionData;
}