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

#2223 Well Formations: Rename to Well Picks where sensible

Browse Source
This commit is contained in:
Rebecca Cox
2017-12-05 14:10:30 +01:00
parent e344fcd47a
commit 5145d3f8a5
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
View File

@@ -49,8 +49,8 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("WELLPATHFORMATIONS_DIR");
QStringList wellPathFormationsFilePaths =
QFileDialog::getOpenFileNames(RiuMainWindow::instance(), "Import Well Path Formations", defaultDir,
"Well Path Formations (*.csv);;All Files (*.*)");
QFileDialog::getOpenFileNames(RiuMainWindow::instance(), "Import Well Picks", defaultDir,
"Well Picks (*.csv);;All Files (*.*)");
if (wellPathFormationsFilePaths.size() < 1)
return;
@@ -85,6 +85,6 @@ void RicWellPathFormationsImportFileFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicWellPathFormationsImportFileFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Import &Well Path Formation Names");
actionToSetup->setText("Import Well Picks");
actionToSetup->setIcon(QIcon(":/Formations16x16.png"));
}

2
ApplicationCode/FileInterface/RifWellPathFormationReader.cpp
View File

@@ -36,7 +36,7 @@ std::map<QString, cvf::ref<RigWellPathFormations>>
readFileIntoMap(filePath, &formations);
if (formations.empty())
{
RiaLogging::error(QString("Failed to parse %1 as well path formations").arg(filePath));
RiaLogging::error(QString("Failed to parse %1 as well picks").arg(filePath));
}
std::map<QString, std::vector<std::pair<double, QString>>>::iterator it;

12
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -79,7 +79,7 @@ namespace caf
void AppEnum< RimWellLogTrack::FormationSource >::setUp()
{
addItem(RimWellLogTrack::CASE, "CASE", "Case");
addItem(RimWellLogTrack::WELL, "WELL", "Well");
addItem(RimWellLogTrack::WELL_PICK, "WELLPICK", "Well Pick");
setDefault(RimWellLogTrack::CASE);
}
}
@@ -327,7 +327,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogTrack::calculateValueOptions(const caf::
{
RimTools::wellPathOptionItems(&options);
}
else
else if(m_formationSource == WELL_PICK)
{
RimTools::wellPathWithFormationsOptionItems(&options);
}
@@ -788,7 +788,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
{
uiOrdering.add(&m_userName);
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names");
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Zonation/Formation Names");
formationGroup->add(&m_showFormations);
@@ -814,7 +814,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
}
}
}
else
else if (m_formationSource() == WELL_PICK)
{
formationGroup->add(&m_formationWellPath);
}
@@ -948,7 +948,7 @@ std::vector<RimWellLogCurve* > RimWellLogTrack::curvesVector()
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names");
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Zonation/Formation Names");
formationGroup->setCollapsedByDefault(true);
formationGroup->add(&m_showFormations);
formationGroup->add(&m_formationSource);
@@ -1237,7 +1237,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
m_annotationTool->attachFormationNames(this->viewer(), formationNamesToPlot, yValues);
}
else
else if (m_formationSource() == WELL_PICK)
{
if (m_formationWellPath == nullptr) return;
if (plot->depthType() != RimWellLogPlot::MEASURED_DEPTH) return;

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@@ -68,7 +68,7 @@ public:
virtual ~RimWellLogTrack();
enum TrajectoryType { WELL_PATH, SIMULATION_WELL };
enum FormationSource { CASE, WELL };
enum FormationSource { CASE, WELL_PICK };
void setDescription(const QString& description);
bool isVisible();

2
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -495,7 +495,7 @@ void RimWellPath::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
m_datumElevation.uiCapability()->setUiHidden(true);
}
caf::PdmUiGroup* formationFileInfoGroup = uiOrdering.addNewGroup("Formation Names");
caf::PdmUiGroup* formationFileInfoGroup = uiOrdering.addNewGroup("Well Picks");
formationFileInfoGroup->add(&m_wellPathFormationFilePath);
formationFileInfoGroup->add(&m_formationKeyInFile);

2
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -349,7 +349,7 @@ void RimWellPathCollection::addWellPathFormations(const QStringList& filePaths)
}
wellPath->setFormationsGeometry(it->second);
m_newestAddedWellPath = wellPath;
RiaLogging::info(QString("Well path formations set for well %1").arg(wellPath->name()));
RiaLogging::info(QString("Well picks set for well %1").arg(wellPath->name()));
}
}