OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1633 Removing option for selected and checked wells, now only option is selected wells if selecting well paths.

Browse Source
This commit is contained in:
astridkbjorke committed 2017-06-22 14:35:28 +02:00
1 parent 53917c6195
commit df8f45c649
3 files changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Commands/CompletionCommands/RicExportCompletionDataSettingsUi.cpp
-2
View File
@@ -35,7 +35,6 @@ namespace caf
addItem(RicExportCompletionDataSettingsUi::ALL_WELLS, "ALL_WELLS", "All Wells");
addItem(RicExportCompletionDataSettingsUi::CHECKED_WELLS, "CHECKED_WELLS", "Checked Wells");
addItem(RicExportCompletionDataSettingsUi::SELECTED_WELLS, "SELECTED_WELLS", "Selected Wells");
addItem(RicExportCompletionDataSettingsUi::CHECKED_AND_SELECTED_WELLS, "CHECKED_AND_SELECTED_WELLS", "Checked and Selected Wells");
setDefault(RicExportCompletionDataSettingsUi::ALL_WELLS);
}
@@ -109,7 +108,6 @@ QList<caf::PdmOptionItemInfo> RicExportCompletionDataSettingsUi::calculateValueO
else
{
options.push_back(caf::PdmOptionItemInfo("Selected Wells", SELECTED_WELLS));
options.push_back(caf::PdmOptionItemInfo("Selected and Checked Wells", CHECKED_AND_SELECTED_WELLS));
}
}
else
ApplicationCode/Commands/CompletionCommands/RicExportCompletionDataSettingsUi.h
-1
View File
@@ -42,7 +42,6 @@ public:
ALL_WELLS,
CHECKED_WELLS,
SELECTED_WELLS,
CHECKED_AND_SELECTED_WELLS
};
typedef caf::AppEnum<WellSelection> WellSelectionType;
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
+4 -2
View File
@@ -122,6 +122,8 @@ std::vector<RimWellPath*> RicWellPathExportCompletionDataFeature::selectedWellPa
std::vector<RimWellPath*> wellPaths;
caf::SelectionManager::instance()->objectsByType(&wellPaths);
if (wellPaths.empty())
{
std::vector<RimWellPathCollection*> wellPathCollections;
caf::SelectionManager::instance()->objectsByType(&wellPathCollections);
@@ -132,6 +134,7 @@ std::vector<RimWellPath*> RicWellPathExportCompletionDataFeature::selectedWellPa
wellPaths.push_back(wellPath);
}
}
}
std::set<RimWellPath*> uniqueWellPaths(wellPaths.begin(), wellPaths.end());
wellPaths.assign(uniqueWellPaths.begin(), uniqueWellPaths.end());
@@ -169,8 +172,7 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
{
usedWellPaths = wellPaths;
}
else if (exportSettings.wellSelection == RicExportCompletionDataSettingsUi::CHECKED_WELLS
|| exportSettings.wellSelection == RicExportCompletionDataSettingsUi::CHECKED_AND_SELECTED_WELLS)
else if (exportSettings.wellSelection == RicExportCompletionDataSettingsUi::CHECKED_WELLS)
{
for (auto wellPath : wellPaths)
{